From d762bfa1953933dfac0a29a74523c25719396b8c Mon Sep 17 00:00:00 2001 From: Oliver Reiche Date: Sat, 15 Apr 2023 16:28:33 +0200 Subject: 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. --- src/buildtool/build_engine/expression/configuration.hpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/buildtool/build_engine/expression/configuration.hpp') 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 #include -#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; } -- cgit v1.2.3