diff options
Diffstat (limited to 'src/buildtool/execution_api/common')
5 files changed, 11 insertions, 9 deletions
diff --git a/src/buildtool/execution_api/common/TARGETS b/src/buildtool/execution_api/common/TARGETS index 2c7ca6cf..4e4bf796 100644 --- a/src/buildtool/execution_api/common/TARGETS +++ b/src/buildtool/execution_api/common/TARGETS @@ -8,12 +8,13 @@ , "execution_response.hpp" ] , "deps": - [ ["@", "gsl-lite", "", "gsl-lite"] + [ ["@", "gsl", "", "gsl"] , ["src/buildtool/common", "common"] , ["src/buildtool/crypto", "hash_function"] , ["src/buildtool/execution_api/bazel_msg", "bazel_msg"] , ["src/buildtool/execution_api/bazel_msg", "bazel_msg_factory"] , ["src/utils/cpp", "hex_string"] + , ["src/utils/cpp", "gsl"] , ["src/buildtool/logging", "logging"] ] , "stage": ["src", "buildtool", "execution_api", "common"] diff --git a/src/buildtool/execution_api/common/execution_action.hpp b/src/buildtool/execution_api/common/execution_action.hpp index d3089f81..649c634c 100644 --- a/src/buildtool/execution_api/common/execution_action.hpp +++ b/src/buildtool/execution_api/common/execution_action.hpp @@ -18,7 +18,7 @@ #include <chrono> #include <memory> -#include "gsl-lite/gsl-lite.hpp" +#include "gsl/gsl" #include "src/buildtool/execution_api/common/execution_response.hpp" class Logger; diff --git a/src/buildtool/execution_api/common/execution_api.hpp b/src/buildtool/execution_api/common/execution_api.hpp index ffa31483..7a301f71 100644 --- a/src/buildtool/execution_api/common/execution_api.hpp +++ b/src/buildtool/execution_api/common/execution_api.hpp @@ -21,7 +21,7 @@ #include <utility> #include <vector> -#include "gsl-lite/gsl-lite.hpp" +#include "gsl/gsl" #include "src/buildtool/common/artifact.hpp" // Artifact::ObjectInfo #include "src/buildtool/execution_api/bazel_msg/bazel_blob_container.hpp" #include "src/buildtool/execution_api/bazel_msg/bazel_msg_factory.hpp" diff --git a/src/buildtool/execution_api/common/execution_common.hpp b/src/buildtool/execution_api/common/execution_common.hpp index 51e62455..d9aea07f 100644 --- a/src/buildtool/execution_api/common/execution_common.hpp +++ b/src/buildtool/execution_api/common/execution_common.hpp @@ -30,9 +30,10 @@ #include <string> #include <thread> -#include "gsl-lite/gsl-lite.hpp" +#include "gsl/gsl" #include "src/buildtool/crypto/hash_function.hpp" #include "src/buildtool/logging/logger.hpp" +#include "src/utils/cpp/gsl.hpp" #include "src/utils/cpp/hex_string.hpp" /// \brief Create unique ID for current process and thread. @@ -80,7 +81,7 @@ static void EncodeUUIDVersion4(std::string* uuid) { constexpr auto kVersionByte = 6UL; constexpr auto kVersionBits = 0x40U; // version 4: 0100 xxxx constexpr auto kClearMask = 0x0fU; - gsl_Expects(uuid->size() >= kVersionByte); + Expects(uuid->size() >= kVersionByte); auto& byte = uuid->at(kVersionByte); byte = static_cast<char>(kVersionBits | (kClearMask & static_cast<std::uint8_t>(byte))); @@ -90,7 +91,7 @@ static void EncodeUUIDVariant1(std::string* uuid) { constexpr auto kVariantByte = 8UL; constexpr auto kVariantBits = 0x80U; // variant 1: 10xx xxxx constexpr auto kClearMask = 0x3fU; - gsl_Expects(uuid->size() >= kVariantByte); + Expects(uuid->size() >= kVariantByte); auto& byte = uuid->at(kVariantByte); byte = static_cast<char>(kVariantBits | (kClearMask & static_cast<std::uint8_t>(byte))); @@ -106,7 +107,7 @@ static void EncodeUUIDVariant1(std::string* uuid) { auto uuid = HashFunction::ComputeHash(value).Bytes(); EncodeUUIDVersion4(&uuid); EncodeUUIDVariant1(&uuid); - gsl_Expects(uuid.size() >= kRawLength); + Expects(uuid.size() >= kRawLength); std::size_t cur{}; std::ostringstream ss{}; @@ -116,7 +117,7 @@ static void EncodeUUIDVariant1(std::string* uuid) { cur = pos; } ss << uuid_hex.substr(cur); - gsl_EnsuresAudit(ss.str().size() == (2 * kRawLength) + kHexDashPos.size()); + EnsuresAudit(ss.str().size() == (2 * kRawLength) + kHexDashPos.size()); return ss.str(); } diff --git a/src/buildtool/execution_api/common/execution_response.hpp b/src/buildtool/execution_api/common/execution_response.hpp index deb8186f..a08134dd 100644 --- a/src/buildtool/execution_api/common/execution_response.hpp +++ b/src/buildtool/execution_api/common/execution_response.hpp @@ -20,7 +20,7 @@ #include <unordered_map> #include <vector> -#include "gsl-lite/gsl-lite.hpp" +#include "gsl/gsl" #include "src/buildtool/common/artifact.hpp" /// \brief Abstract response. |