From 277be6dd08633dbebfda93afdfc6b5cb57e053e0 Mon Sep 17 00:00:00 2001
From: Paul Cristian Sarbu <paul.cristian.sarbu@huawei.com>
Date: Mon, 8 Apr 2024 13:18:22 +0200
Subject: Use properly included standard library types by default

---
 src/buildtool/build_engine/expression/expression.hpp | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'src/buildtool/build_engine/expression/expression.hpp')

diff --git a/src/buildtool/build_engine/expression/expression.hpp b/src/buildtool/build_engine/expression/expression.hpp
index eb0a3d5f..1da17dda 100644
--- a/src/buildtool/build_engine/expression/expression.hpp
+++ b/src/buildtool/build_engine/expression/expression.hpp
@@ -54,7 +54,7 @@ class Expression {
     using map_t = LinkedMap<std::string, ExpressionPtr, ExpressionPtr>;
     using name_t = BuildMaps::Base::EntityName;
 
-    template <class T, size_t kIndex = 0>
+    template <class T, std::size_t kIndex = 0>
     static consteval auto IsValidType() -> bool {
         if constexpr (kIndex < std::variant_size_v<decltype(data_)>) {
             return std::is_same_v<
@@ -219,8 +219,9 @@ class Expression {
     [[nodiscard]] auto operator[](
         ExpressionPtr const& key) const& -> ExpressionPtr const&;
     [[nodiscard]] auto operator[](ExpressionPtr const& key) && -> ExpressionPtr;
-    [[nodiscard]] auto operator[](size_t pos) const& -> ExpressionPtr const&;
-    [[nodiscard]] auto operator[](size_t pos) && -> ExpressionPtr;
+    [[nodiscard]] auto operator[](
+        std::size_t pos) const& -> ExpressionPtr const&;
+    [[nodiscard]] auto operator[](std::size_t pos) && -> ExpressionPtr;
 
     enum class JsonMode { SerializeAll, SerializeAllButNodes, NullForNonJson };
 
@@ -228,7 +229,7 @@ class Expression {
         -> nlohmann::json;
     [[nodiscard]] auto IsCacheable() const -> bool;
     [[nodiscard]] auto ToString() const -> std::string;
-    [[nodiscard]] auto ToAbbrevString(size_t len) const -> std::string;
+    [[nodiscard]] auto ToAbbrevString(std::size_t len) const -> std::string;
     [[nodiscard]] auto ToHash() const noexcept -> std::string;
     [[nodiscard]] auto ToIdentifier() const noexcept -> std::string {
         return ToHexString(ToHash());
@@ -343,7 +344,7 @@ class Expression {
         return "none";
     }
 
-    template <size_t kIndex = 0>
+    template <std::size_t kIndex = 0>
     [[nodiscard]] auto TypeStringForIndex() const noexcept -> std::string;
     [[nodiscard]] auto TypeString() const noexcept -> std::string;
     [[nodiscard]] auto ComputeHash() const noexcept -> std::string;
-- 
cgit v1.2.3