summaryrefslogtreecommitdiff
path: root/src/buildtool/execution_engine/traverser/traverser.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/execution_engine/traverser/traverser.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/execution_engine/traverser/traverser.hpp')
-rw-r--r--src/buildtool/execution_engine/traverser/traverser.hpp9
1 files changed, 3 insertions, 6 deletions
diff --git a/src/buildtool/execution_engine/traverser/traverser.hpp b/src/buildtool/execution_engine/traverser/traverser.hpp
index 2567f3a4..bc09dc72 100644
--- a/src/buildtool/execution_engine/traverser/traverser.hpp
+++ b/src/buildtool/execution_engine/traverser/traverser.hpp
@@ -17,7 +17,7 @@
#include <atomic>
-#include "gsl-lite/gsl-lite.hpp"
+#include "gsl/gsl"
#include "src/buildtool/execution_engine/dag/dag.hpp"
#include "src/buildtool/logging/logger.hpp"
#include "src/buildtool/multithreading/task_system.hpp"
@@ -46,11 +46,8 @@ class Traverser {
Traverser(Executor const& r,
DependencyGraph const& graph,
std::size_t jobs,
- gsl::not_null<std::atomic<bool>*> fail_flag)
- : runner_{r},
- graph_{graph},
- failed_{std::move(fail_flag)},
- tasker_{jobs} {}
+ gsl::not_null<std::atomic<bool>*> const& fail_flag)
+ : runner_{r}, graph_{graph}, failed_{fail_flag}, tasker_{jobs} {}
Traverser() = delete;
Traverser(Traverser const&) = delete;
Traverser(Traverser&&) = delete;