#1667 move preConfigRef() forward decleration back to debug_colorize.h

DARMA-tasking · Feb 9, 2022 · ffc9800 · ffc9800
1 parent 67a9e57
commit ffc9800
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 31 deletions.
diff --git a/src/vt/configs/debug/debug_colorize.h b/src/vt/configs/debug/debug_colorize.h
@@ -50,8 +50,11 @@
 #include <string>
 
 namespace vt { namespace debug {
-
+arguments::AppConfig * preConfigRef();
 arguments::AppConfig const* preConfig();
+}} /* end namespace vt::debug */
+
+namespace vt { namespace debug {
 
 inline bool colorizeOutput() {
   return vt::debug::preConfig()->colorize_output;

diff --git a/src/vt/runtime/runtime.cc b/src/vt/runtime/runtime.cc
@@ -94,13 +94,7 @@
 #include <unistd.h>
 #include <csignal>
 
-namespace vt {
-
-namespace debug {
-arguments::AppConfig * preConfigRef();
-} // namespace debug
-
-namespace runtime {
+namespace vt { namespace runtime {
 
 /*static*/ bool volatile Runtime::sig_user_1_ = false;
 
@@ -1236,6 +1230,4 @@ arguments::AppConfig const* Runtime::getAppConfig() const {
   return app_config_;
 }
 
-} // namespace runtime
-
-} // namespace vt
+}} //end namespace vt::runtime
diff --git a/tests/perf/common/test_harness.cc b/tests/perf/common/test_harness.cc
@@ -52,13 +52,7 @@
 #include <numeric>
 #include <fstream>
 
-namespace vt {
-
-namespace debug {
-arguments::AppConfig *preConfigRef();
-} // namespace debug
-
-namespace tests { namespace perf { namespace common {
+namespace vt { namespace tests { namespace perf { namespace common {
 
 /////////////////////////////////////////////////
 ///////////////      HELPERS      ///////////////
@@ -451,6 +445,4 @@ void PerfTestHarness::GetMemoryUsage() {
   memory_use_[current_run_].push_back(mem_tracker_.getUsage());
 }
 
-}}} // namespace tests::perf::common
-
-} // namespace vt
+}}}} // namespace vt::tests::perf::common
diff --git a/tests/unit/test_harness.h b/tests/unit/test_harness.h
@@ -52,13 +52,7 @@
 #include "test_config.h"
 #include "data_message.h"
 
-namespace vt {
-
-namespace debug {
-arguments::AppConfig *preConfigRef();
-} // namespace debug
-
-namespace tests { namespace unit {
+namespace vt { namespace tests { namespace unit {
 
 template <typename TestBase>
 struct TestHarnessAny : TestBase {
@@ -79,8 +73,6 @@ using TestHarness = TestHarnessAny<testing::Test>;
 template <typename ParamT>
 using TestHarnessParam = TestHarnessAny<testing::TestWithParam<ParamT>>;
 
-}} // end namespace tests::unit
-
-} // namespace vt
+}}} // end namespace vt::tests::unit
 
 #endif /* INCLUDED_UNIT_TEST_HARNESS_H */