From d762bfa1953933dfac0a29a74523c25719396b8c Mon Sep 17 00:00:00 2001 From: Oliver Reiche Date: Sat, 15 Apr 2023 16:28:33 +0200 Subject: 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. --- src/buildtool/execution_api/bazel_msg/blob_tree.hpp | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'src/buildtool/execution_api/bazel_msg/blob_tree.hpp') 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 #include -#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>; class BlobTree { public: BlobTree(BazelBlob blob, std::vector 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 { -- cgit v1.2.3