diff options
| author | Oliver Reiche <oliver.reiche@gmail.com> | 2023-04-15 16:28:33 +0200 |
|---|---|---|
| committer | Oliver Reiche <oliver.reiche@huawei.com> | 2023-04-26 18:29:44 +0200 |
| commit | d762bfa1953933dfac0a29a74523c25719396b8c (patch) | |
| tree | 1002b0aecc1af698f0349a4efb4bfc169886c60a /src/buildtool/execution_engine/executor | |
| parent | 03e1019aca5d08e53bfeb455071d91561fc33039 (diff) | |
| download | justbuild-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/executor')
| -rw-r--r-- | src/buildtool/execution_engine/executor/TARGETS | 2 | ||||
| -rw-r--r-- | src/buildtool/execution_engine/executor/executor.hpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/buildtool/execution_engine/executor/TARGETS b/src/buildtool/execution_engine/executor/TARGETS index 45f8a31c..c8c62b8d 100644 --- a/src/buildtool/execution_engine/executor/TARGETS +++ b/src/buildtool/execution_engine/executor/TARGETS @@ -12,7 +12,7 @@ , ["src/buildtool/execution_api/common", "common"] , ["src/buildtool/progress_reporting", "progress"] , ["src/utils/cpp", "hex_string"] - , ["@", "gsl-lite", "", "gsl-lite"] + , ["@", "gsl", "", "gsl"] , ["src/buildtool/common", "common"] ] , "stage": ["src", "buildtool", "execution_engine", "executor"] diff --git a/src/buildtool/execution_engine/executor/executor.hpp b/src/buildtool/execution_engine/executor/executor.hpp index baf0be12..64494715 100644 --- a/src/buildtool/execution_engine/executor/executor.hpp +++ b/src/buildtool/execution_engine/executor/executor.hpp @@ -24,7 +24,7 @@ #include <type_traits> #include <vector> -#include "gsl-lite/gsl-lite.hpp" +#include "gsl/gsl" #include "src/buildtool/common/repository_config.hpp" #include "src/buildtool/common/statistics.hpp" #include "src/buildtool/common/tree.hpp" |