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_api/bazel_msg/blob_tree.hpp | |
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_api/bazel_msg/blob_tree.hpp')
-rw-r--r-- | src/buildtool/execution_api/bazel_msg/blob_tree.hpp | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/buildtool/execution_api/bazel_msg/blob_tree.hpp b/src/buildtool/execution_api/bazel_msg/blob_tree.hpp index 786e3c55..781150da 100644 --- a/src/buildtool/execution_api/bazel_msg/blob_tree.hpp +++ b/src/buildtool/execution_api/bazel_msg/blob_tree.hpp @@ -21,7 +21,7 @@ #include <utility> #include <vector> -#include "gsl-lite/gsl-lite.hpp" +#include "gsl/gsl" #include "src/buildtool/compatibility/native_support.hpp" #include "src/buildtool/execution_api/bazel_msg/bazel_blob.hpp" #include "src/buildtool/execution_api/bazel_msg/directory_tree.hpp" @@ -34,12 +34,7 @@ using BlobTreePtr = gsl::not_null<std::shared_ptr<BlobTree>>; class BlobTree { public: BlobTree(BazelBlob blob, std::vector<BlobTreePtr> nodes) - : blob_{std::move(blob)} { - nodes_.reserve(nodes.size()); - for (auto& node : nodes) { - nodes_.emplace_back(std::move(node)); - } - } + : blob_{std::move(blob)}, nodes_{std::move(nodes)} {} [[nodiscard]] auto Blob() const noexcept -> BazelBlob { return blob_; } [[nodiscard]] auto IsTree() const noexcept -> bool { |