1 files changed, 6 insertions, 5 deletions
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();
 }