summaryrefslogtreecommitdiff
path: root/src/buildtool/build_engine/base_maps/user_rule.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/base_maps/user_rule.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/base_maps/user_rule.hpp')
-rw-r--r--src/buildtool/build_engine/base_maps/user_rule.hpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/buildtool/build_engine/base_maps/user_rule.hpp b/src/buildtool/build_engine/base_maps/user_rule.hpp
index c1b6398c..58e5ca40 100644
--- a/src/buildtool/build_engine/base_maps/user_rule.hpp
+++ b/src/buildtool/build_engine/base_maps/user_rule.hpp
@@ -25,11 +25,12 @@
#include <vector>
#include "fmt/core.h"
-#include "gsl-lite/gsl-lite.hpp"
+#include "gsl/gsl"
#include "src/buildtool/build_engine/base_maps/entity_name.hpp"
#include "src/buildtool/build_engine/base_maps/expression_function.hpp"
#include "src/buildtool/build_engine/expression/expression.hpp"
#include "src/utils/cpp/concepts.hpp"
+#include "src/utils/cpp/gsl.hpp"
namespace BuildMaps::Base {
@@ -357,8 +358,8 @@ static auto inline FindDuplicates(gsl::not_null<T_Result*> const& dups,
T_First const& first,
T_Second const& second,
T_Rest const&... rest) -> void {
- gsl_ExpectsAudit(std::is_sorted(first.begin(), first.end()) and
- std::is_sorted(second.begin(), second.end()));
+ ExpectsAudit(std::is_sorted(first.begin(), first.end()) and
+ std::is_sorted(second.begin(), second.end()));
std::set_intersection(first.begin(),
first.end(),
second.begin(),