From 2c0e6ece30b78d2f830ba1997f564d958139f168 Mon Sep 17 00:00:00 2001
From: "Eder F. Zulian" <zulian@eit.uni-kl.de>
Date: Fri, 18 May 2018 14:44:50 +0200
Subject: [PATCH] Changes to get build working again after merging pr190

See also:
Pull request #190
Issue #198
---
 DRAMSys/library/library.pro                       | 2 +-
 DRAMSys/library/src/common/jsonAddressDecoder.cpp | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/DRAMSys/library/library.pro b/DRAMSys/library/library.pro
index 23f56ddc..7a455f7f 100644
--- a/DRAMSys/library/library.pro
+++ b/DRAMSys/library/library.pro
@@ -126,7 +126,6 @@ SOURCES += \
 
 HEADERS += \
     src/common/third_party/tinyxml2/tinyxml2.h \
-    src/common/third_party/json/include/nlohmann/json.hpp \
     src/common/xmlAddressdecoder.h \
     src/common/Utils.h \
     src/common/TlmRecorder.h \
@@ -199,6 +198,7 @@ HEADERS += \
     src/simulation/SimpleArbiter.h \
     src/common/AddressDecoder.h \
     src/common/jsonAddressDecoder.h
+    #src/common/third_party/json/include/nlohmann/json.hpp \
 
 thermalsim = $$(THERMALSIM)
 isEmpty(thermalsim) {
diff --git a/DRAMSys/library/src/common/jsonAddressDecoder.cpp b/DRAMSys/library/src/common/jsonAddressDecoder.cpp
index 333c200d..9a867bc9 100644
--- a/DRAMSys/library/src/common/jsonAddressDecoder.cpp
+++ b/DRAMSys/library/src/common/jsonAddressDecoder.cpp
@@ -42,9 +42,11 @@ using std::ifstream;
 using std::cout;
 using std::endl;
 
+#if 0 // Problems with gcc version on KOA for more details refer to pull-request #190 and issue #198
 #include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
+#endif
 
 #include <set>
 
@@ -67,6 +69,7 @@ void JSONAddressDecoder::setConfiguration(std::string url)
         return;
     }
 
+#if 0 //XXX: Problems with gcc version on KOA for more details refer to pull-request #190 and issue #198
     // parse json file
     json data;
     file >> data;
@@ -135,6 +138,7 @@ void JSONAddressDecoder::setConfiguration(std::string url)
     amount["row"] = pow(2.0, m_vRowBits.size());
     amount["column"] = pow(2.0, m_vColumnBits.size());
     amount["bytes"] = pow(2.0, 3);
+#endif
 }
 
 DecodedAddress JSONAddressDecoder::decodeAddress(sc_dt::uint64 addr)