Merge branch 'fix/forward_declare_dram' into 'develop'

Fix the forward declaration of the Dram class

See merge request ems/astdm/modeling.dram/dram.sys.5!111

src/libdramsys/DRAMSys/simulation/DRAMSys.cpp

@@ -43,6 +43,9 @@
 #include "DRAMSys/common/DebugManager.h"
 #include "DRAMSys/common/utils.h"
 
+#include "DRAMSys/simulation/Dram.h"
+#include "DRAMSys/simulation/DramRecordable.h"
+
 #include "DRAMSys/configuration/memspec/MemSpecDDR3.h"
 #include "DRAMSys/configuration/memspec/MemSpecDDR4.h"
 #include "DRAMSys/configuration/memspec/MemSpecGDDR5.h"
@@ -158,6 +161,8 @@ DRAMSys::DRAMSys(const sc_core::sc_module_name& name, const Config::Configuratio
     report();
 }
 
+DRAMSys::~DRAMSys() = default;
+
 void DRAMSys::setupTlmRecorders(const std::string& traceName, const Config::Configuration& config)
 {
     // Create TLM Recorders, one per channel.

src/libdramsys/DRAMSys/simulation/DRAMSys.h

@@ -49,8 +49,6 @@
 #include "DRAMSys/controller/McConfig.h"
 #include "DRAMSys/simulation/AddressDecoder.h"
 #include "DRAMSys/simulation/Arbiter.h"
-#include "DRAMSys/simulation/Dram.h"
-#include "DRAMSys/simulation/DramRecordable.h"
 #include "DRAMSys/simulation/SimConfig.h"
 
 #include <list>
@@ -64,6 +62,8 @@
 namespace DRAMSys
 {
 
+class Dram;
+
 class DRAMSys : public sc_core::sc_module
 {
 public:
@@ -71,6 +71,7 @@ public:
 
     SC_HAS_PROCESS(DRAMSys);
     DRAMSys(const sc_core::sc_module_name& name, const Config::Configuration& config);
+    ~DRAMSys();
 
     const auto& getSimConfig() const { return simConfig; }
     const auto& getMcConfig() const { return mcConfig; }

tests/tests_dramsys/b_transport/b_transport.cpp

@@ -36,6 +36,7 @@
 #include <gtest/gtest.h>
 
 #include <DRAMSys/simulation/DRAMSys.h>
+#include <DRAMSys/simulation/Dram.h>
 
 class SystemCTest : public testing::Test
 {