Rename Configuration.h to DRAMSysConfiguration.h

2022-06-14 11:24:14 +02:00
parent 365ce1f62c
commit 0c8da93417
18 changed files with 20 additions and 20 deletions
--- a/DRAMSys/library/src/common/configuration/CMakeLists.txt
+++ b/DRAMSys/library/src/common/configuration/CMakeLists.txt
@@ -42,7 +42,7 @@ if (DRAMSYS_CONFIGURATION_TESTS)
 endif()

 add_library(DRAMSysConfiguration STATIC
-    Configuration.cpp
+    DRAMSysConfiguration.cpp
    AddressMapping.cpp
    McConfig.cpp
    SimConfig.cpp
--- a/DRAMSys/library/src/common/configuration/DRAMSysConfiguration.cpp
+++ b/DRAMSys/library/src/common/configuration/DRAMSysConfiguration.cpp
@@ -33,7 +33,7 @@
 *    Derek Christ
 */

-#include "Configuration.h"
+#include "DRAMSysConfiguration.h"

 #include <exception>
 #include <fstream>
--- a/DRAMSys/library/src/common/configuration/DRAMSysConfiguration.h
+++ b/DRAMSys/library/src/common/configuration/DRAMSysConfiguration.h
@@ -33,8 +33,8 @@
 *    Derek Christ
 */

-#ifndef DRAMSYSCONFIGURATION_CONFIGURATION_H
-#define DRAMSYSCONFIGURATION_CONFIGURATION_H
+#ifndef DRAMSYSCONFIGURATION_DRAMSYSCONFIGURATION_H
+#define DRAMSYSCONFIGURATION_DRAMSYSCONFIGURATION_H

 #include "AddressMapping.h"
 #include "McConfig.h"
@@ -85,4 +85,4 @@ Configuration from_path(const std::string &path, const std::string &resourceDire

 } // namespace DRAMSysConfiguration

-#endif // DRAMSYSCONFIGURATION_CONFIGURATION_H
+#endif // DRAMSYSCONFIGURATION_DRAMSYSCONFIGURATION_H
--- a/DRAMSys/library/src/common/configuration/McConfig.cpp
+++ b/DRAMSys/library/src/common/configuration/McConfig.cpp
@@ -34,7 +34,7 @@
 */

 #include "McConfig.h"
-#include <iostream>
+
 namespace DRAMSysConfiguration
 {

--- a/DRAMSys/library/src/common/configuration/tests/converter.cpp
+++ b/DRAMSys/library/src/common/configuration/tests/converter.cpp
@@ -36,7 +36,7 @@
 #include <nlohmann/json.hpp>
 #include <fstream>
 #include <iostream>
-#include <Configuration.h>
+#include <DRAMSysConfiguration.h>

 int main(int argc, char **argv)
 {
--- a/DRAMSys/library/src/common/configuration/tests/simpletest.cpp
+++ b/DRAMSys/library/src/common/configuration/tests/simpletest.cpp
@@ -33,7 +33,7 @@
 *    Derek Christ
 */

-#include <Configuration.h>
+#include <DRAMSysConfiguration.h>
 #include <fstream>
 #include <iostream>

--- a/DRAMSys/library/src/common/configuration/util.cpp
+++ b/DRAMSys/library/src/common/configuration/util.cpp
@@ -34,7 +34,7 @@
 */

 #include "util.h"
-#include "Configuration.h"
+#include "DRAMSysConfiguration.h"

 #include <fstream>
 #include <iostream>
--- a/DRAMSys/library/src/configuration/Configuration.h
+++ b/DRAMSys/library/src/configuration/Configuration.h
@@ -43,7 +43,7 @@
 #define CONFIGURATION_H

 #include <string>
-#include <Configuration.h>
+#include <DRAMSysConfiguration.h>
 #include <systemc>
 #include "memspec/MemSpec.h"
 #include "TemperatureSimConfig.h"
--- a/DRAMSys/library/src/configuration/TemperatureSimConfig.h
+++ b/DRAMSys/library/src/configuration/TemperatureSimConfig.h
@@ -41,7 +41,7 @@

 #include <string>
 #include <vector>
-#include <Configuration.h>
+#include <DRAMSysConfiguration.h>
 #include <systemc>
 #include <utility>
 #include "../common/DebugManager.h"
--- a/DRAMSys/library/src/configuration/memspec/MemSpec.h
+++ b/DRAMSys/library/src/configuration/memspec/MemSpec.h
@@ -41,7 +41,7 @@

 #include <vector>
 #include <string>
-#include <Configuration.h>
+#include <DRAMSysConfiguration.h>
 #include <systemc>
 #include <tlm>
 #include "../../common/utils.h"
--- a/DRAMSys/library/src/configuration/memspec/MemSpecDDR3.h
+++ b/DRAMSys/library/src/configuration/memspec/MemSpecDDR3.h
@@ -40,7 +40,7 @@
 #include "MemSpec.h"

 #include <systemc>
-#include <Configuration.h>
+#include <DRAMSysConfiguration.h>

 class MemSpecDDR3 final : public MemSpec
 {
--- a/DRAMSys/library/src/simulation/AddressDecoder.h
+++ b/DRAMSys/library/src/simulation/AddressDecoder.h
@@ -41,7 +41,7 @@

 #include <vector>
 #include <utility>
-#include <Configuration.h>
+#include <DRAMSysConfiguration.h>
 #include "../configuration/Configuration.h"

 struct DecodedAddress
--- a/DRAMSys/library/src/simulation/Arbiter.cpp
+++ b/DRAMSys/library/src/simulation/Arbiter.cpp
@@ -41,7 +41,7 @@
 #include "AddressDecoder.h"
 #include "../configuration/Configuration.h"

-#include <Configuration.h>
+#include <DRAMSysConfiguration.h>

 using namespace sc_core;
 using namespace tlm;
--- a/DRAMSys/library/src/simulation/DRAMSys.h
+++ b/DRAMSys/library/src/simulation/DRAMSys.h
@@ -49,7 +49,7 @@
 #include "../controller/ControllerIF.h"
 #include "TemperatureController.h"

-#include <Configuration.h>
+#include <DRAMSysConfiguration.h>
 #include <string>
 #include <systemc>
 #include <list>
--- a/DRAMSys/library/src/simulation/DRAMSysRecordable.h
+++ b/DRAMSys/library/src/simulation/DRAMSysRecordable.h
@@ -40,7 +40,7 @@
 #include "DRAMSys.h"
 #include "../common/TlmRecorder.h"

-#include <Configuration.h>
+#include <DRAMSysConfiguration.h>

 class DRAMSysRecordable : public DRAMSys
 {
--- a/DRAMSys/simulator/TraceSetup.h
+++ b/DRAMSys/simulator/TraceSetup.h
@@ -37,7 +37,7 @@
 #ifndef TRACESETUP_H
 #define TRACESETUP_H

-#include <Configuration.h>
+#include <DRAMSysConfiguration.h>
 #include <vector>
 #include <string>
 #include <memory>
--- a/DRAMSys/simulator/main.cpp
+++ b/DRAMSys/simulator/main.cpp
@@ -44,7 +44,7 @@
 #include <vector>
 #include <list>
 #include <chrono>
-#include <Configuration.h>
+#include <DRAMSysConfiguration.h>
 #include <memory>
 #include <systemc>

--- a/DRAMSys/traceAnalyzer/simulationdialog.h
+++ b/DRAMSys/traceAnalyzer/simulationdialog.h
@@ -38,7 +38,7 @@

 #include "ui_simulationdialog.h"

-#include <Configuration.h>
+#include <DRAMSysConfiguration.h>
 #include <QFileInfo>
 #include <QPointer>
 #include <QProcess>