summaryrefslogtreecommitdiff
path: root/src/buildtool/build_engine/expression/configuration.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/buildtool/build_engine/expression/configuration.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/buildtool/build_engine/expression/configuration.hpp')
-rw-r--r--src/buildtool/build_engine/expression/configuration.hpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/buildtool/build_engine/expression/configuration.hpp b/src/buildtool/build_engine/expression/configuration.hpp
index 16afd81f..3e0328d8 100644
--- a/src/buildtool/build_engine/expression/configuration.hpp
+++ b/src/buildtool/build_engine/expression/configuration.hpp
@@ -19,16 +19,17 @@
#include <sstream>
#include <string>
-#include "gsl-lite/gsl-lite.hpp"
+#include "gsl/gsl"
#include "src/buildtool/build_engine/expression/expression.hpp"
#include "src/utils/cpp/concepts.hpp"
+#include "src/utils/cpp/gsl.hpp"
// Decorator for Expression containing a map. Adds Prune() and Update().
class Configuration {
public:
explicit Configuration(ExpressionPtr expr) noexcept
: expr_{std::move(expr)} {
- gsl_ExpectsAudit(expr_->IsMap());
+ ExpectsAudit(expr_->IsMap());
}
explicit Configuration(Expression::map_t&& map) noexcept
: expr_{ExpressionPtr{std::move(map)}} {}
@@ -140,7 +141,7 @@ class Configuration {
}
[[nodiscard]] auto Update(ExpressionPtr const& map) const -> Configuration {
- gsl_ExpectsAudit(map->IsMap());
+ ExpectsAudit(map->IsMap());
if (map->Map().empty()) {
return *this;
}