summaryrefslogtreecommitdiff
path: root/src/utils/cpp/json.hpp
diff options
context:
space:
mode:
authorOliver Reiche <oliver.reiche@gmail.com>2023-04-15 16:28:33 +0200
committerOliver Reiche <oliver.reiche@huawei.com>2023-04-26 18:29:44 +0200
commitd762bfa1953933dfac0a29a74523c25719396b8c (patch)
tree1002b0aecc1af698f0349a4efb4bfc169886c60a /src/utils/cpp/json.hpp
parent03e1019aca5d08e53bfeb455071d91561fc33039 (diff)
downloadjustbuild-d762bfa1953933dfac0a29a74523c25719396b8c.tar.gz
imports: Switch to Microsoft GSL implementation
... with two minor code base changes compared to previous use of gsl-lite: - dag.hpp: ActionNode::Ptr and ArtifactNode::Ptr are not wrapped in gsl::not_null<> anymore, due to lack of support for wrapping std::unique_ptr<>. More specifically, the move constructor is missing, rendering it impossible to use std::vector<>::emplace_back(). - utils/cpp/gsl.hpp: New header file added to implement the macros ExpectsAudit() and EnsureAudit(), asserts running only in debug builds, which were available in gsl-lite but are missing in MS GSL.
Diffstat (limited to 'src/utils/cpp/json.hpp')
-rw-r--r--src/utils/cpp/json.hpp11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/utils/cpp/json.hpp b/src/utils/cpp/json.hpp
index 4921a39b..aed2f3f4 100644
--- a/src/utils/cpp/json.hpp
+++ b/src/utils/cpp/json.hpp
@@ -21,8 +21,9 @@
#include <string>
#include <unordered_map>
-#include "gsl-lite/gsl-lite.hpp"
+#include "gsl/gsl"
#include "nlohmann/json.hpp"
+#include "src/utils/cpp/gsl.hpp"
template <typename ValueT>
auto ExtractValueAs(
@@ -65,7 +66,7 @@ namespace detail {
}
std::fill_n(iterator{oss}, depth, indent);
oss << '}';
- gsl_EnsuresAudit(nlohmann::json::parse(oss.str()) == json);
+ EnsuresAudit(nlohmann::json::parse(oss.str()) == json);
return oss.str();
}
if (json.is_array() and depth < until) {
@@ -79,7 +80,7 @@ namespace detail {
}
std::fill_n(iterator{oss}, depth, indent);
oss << ']';
- gsl_EnsuresAudit(nlohmann::json::parse(oss.str()) == json);
+ EnsuresAudit(nlohmann::json::parse(oss.str()) == json);
return oss.str();
}
return json.dump();
@@ -116,7 +117,7 @@ namespace detail {
}
std::fill_n(iterator{oss}, depth, indent);
oss << '}';
- gsl_EnsuresAudit(nlohmann::json::parse(oss.str()) == json);
+ EnsuresAudit(nlohmann::json::parse(oss.str()) == json);
return oss.str();
}
if (json.is_array() and depth < until) {
@@ -131,7 +132,7 @@ namespace detail {
}
std::fill_n(iterator{oss}, depth, indent);
oss << ']';
- gsl_EnsuresAudit(nlohmann::json::parse(oss.str()) == json);
+ EnsuresAudit(nlohmann::json::parse(oss.str()) == json);
return oss.str();
}
return json.dump();