#1667 clean up configs/debug

DARMA-tasking · Feb 8, 2022 · 26650ed · 26650ed
1 parent f8f74d1
commit 26650ed
Show file tree

Hide file tree

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

diff --git a/src/vt/configs/debug/debug_print.h b/src/vt/configs/debug/debug_print.h
@@ -44,7 +44,6 @@
 #if !defined INCLUDED_VT_CONFIGS_DEBUG_DEBUG_PRINT_H
 #define INCLUDED_VT_CONFIGS_DEBUG_DEBUG_PRINT_H
 
-#include "vt/configs/arguments/app_config.h"
 #include "vt/configs/types/types_headers.h"
 #include "vt/configs/debug/debug_config.h"
 #include "vt/configs/debug/debug_colorize.h"
@@ -273,7 +272,6 @@ extern runtime::Runtime* curRT;
 } /* end namespace vt */
 
 namespace vt { namespace debug {
-arguments::AppConfig const* preConfig();
 NodeType preNode();
 }} /* end namespace vt::debug */
 

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