From bac50a32ab39a89f7d1dfada1dfa693cb06bea76 Mon Sep 17 00:00:00 2001 From: dehnert Date: Thu, 14 Sep 2017 13:35:46 +0200 Subject: [PATCH] warkaround for gcc 7.2.0: make modernjson compile again --- resources/3rdparty/modernjson/src/json.hpp | 3 ++- src/storm/storage/jani/JSONExporter.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/resources/3rdparty/modernjson/src/json.hpp b/resources/3rdparty/modernjson/src/json.hpp index 596095aff..1b279a804 100755 --- a/resources/3rdparty/modernjson/src/json.hpp +++ b/resources/3rdparty/modernjson/src/json.hpp @@ -5650,7 +5650,8 @@ Format](http://rfc7159.net/rfc7159) { case value_t::array: { - return *lhs.m_value.array < *rhs.m_value.array; + // Workaround for gcc 7.2.0, which parses array< as a template. + return (*lhs.m_value.array) < *rhs.m_value.array; } case value_t::object: { diff --git a/src/storm/storage/jani/JSONExporter.h b/src/storm/storage/jani/JSONExporter.h index e26cf287f..17fa97ad6 100644 --- a/src/storm/storage/jani/JSONExporter.h +++ b/src/storm/storage/jani/JSONExporter.h @@ -9,7 +9,7 @@ // JSON parser #include "json.hpp" namespace modernjson { - using json = nlohmann::basic_json; + using json = nlohmann::json; } namespace storm {