summaryrefslogtreecommitdiff
path: root/src/buildtool/build_engine/target_map/target_map.cpp
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/target_map/target_map.cpp
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/target_map/target_map.cpp')
-rw-r--r--src/buildtool/build_engine/target_map/target_map.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/buildtool/build_engine/target_map/target_map.cpp b/src/buildtool/build_engine/target_map/target_map.cpp
index e441b705..2e788f7b 100644
--- a/src/buildtool/build_engine/target_map/target_map.cpp
+++ b/src/buildtool/build_engine/target_map/target_map.cpp
@@ -23,7 +23,7 @@
#include <fnmatch.h>
#include "fmt/format.h"
-#include "gsl-lite/gsl-lite.hpp"
+#include "gsl/gsl"
#include "nlohmann/json.hpp"
#include "src/buildtool/build_engine/base_maps/field_reader.hpp"
#include "src/buildtool/build_engine/expression/configuration.hpp"
@@ -33,6 +33,7 @@
#include "src/buildtool/build_engine/target_map/utils.hpp"
#include "src/buildtool/common/statistics.hpp"
#include "src/buildtool/logging/logger.hpp"
+#include "src/utils/cpp/gsl.hpp"
#include "src/utils/cpp/path.hpp"
#include "src/utils/cpp/vector.hpp"
@@ -249,8 +250,8 @@ void withDependencies(
std::vector<BuildMaps::Target::ConfiguredTargetPtr> declared_deps{};
std::vector<BuildMaps::Target::ConfiguredTargetPtr> implicit_deps{};
std::vector<BuildMaps::Target::ConfiguredTargetPtr> anonymous_deps{};
- gsl_ExpectsAudit(declared_count <= declared_and_implicit_count);
- gsl_ExpectsAudit(declared_and_implicit_count <= dependency_values.size());
+ ExpectsAudit(declared_count <= declared_and_implicit_count);
+ ExpectsAudit(declared_and_implicit_count <= dependency_values.size());
auto fill_target_graph = [&dependency_values](
size_t const a, size_t const b, auto* deps) {
std::transform(