Changes to get build working again after merging pr190

See also:
Pull request #190
Issue #198
This commit is contained in:
Eder F. Zulian
2018-05-18 14:44:50 +02:00
parent 7038b9211b
commit 2c0e6ece30
2 changed files with 5 additions and 1 deletions

View File

@@ -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) {

View File

@@ -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)