No nested namespaces

inc/Timer.h

@@ -21,7 +21,8 @@
 
 #include "BusCtrl.h"
 
-namespace riscv_tlm::peripherals {
+namespace riscv_tlm {
+    namespace peripherals {
 /**
  * @brief Simple timer peripheral
  *
@@ -67,5 +68,6 @@ namespace riscv_tlm::peripherals {
             sc_dt::sc_uint<64> m_mtimecmp; /**< mtimecmp register */
             sc_core::sc_event timer_event; /**< event */
         };
+    }
 }
 #endif

inc/Trace.h

@@ -19,8 +19,9 @@
 #include "tlm.h"
 #include "tlm_utils/simple_target_socket.h"
 
-namespace riscv_tlm::peripherals {
-/**
+namespace riscv_tlm {
+    namespace peripherals {
+        /**
         * @brief Simple trace peripheral
         *
         * This peripheral outputs to cout any character written to its unique register
@@ -60,5 +61,6 @@ namespace riscv_tlm::peripherals {
             int ptMaster{};
             int xtermPid{};
         };
+    }
 }
 #endif

src/Timer.cpp

@@ -9,7 +9,8 @@
 #include <cstdint>
 #include "Timer.h"
 
-namespace riscv_tlm::peripherals {
+namespace riscv_tlm {
+namespace peripherals {
     SC_HAS_PROCESS(Timer);
 
     Timer::Timer(sc_core::sc_module_name const &name) :
@@ -101,5 +102,5 @@ namespace riscv_tlm::peripherals {
 
         trans.set_response_status(tlm::TLM_OK_RESPONSE);
     }
-
+  }
 }

src/Trace.cpp

@@ -20,7 +20,8 @@
 
 #include "Trace.h"
 
-namespace riscv_tlm::peripherals {
+namespace riscv_tlm {
+    namespace peripherals {
 
         void Trace::xtermLaunch(char *slaveName) const {
             char *arg;
@@ -112,5 +113,5 @@ namespace riscv_tlm::peripherals {
 
             trans.set_response_status(tlm::TLM_OK_RESPONSE);
         }
-
+    }
 }