Update cstdint / cstddef includes

Update uses of std::-qualified integer types such as std::ptrdiff_t, etc. to non std::-qualified types. Update some BUILD rules. mingw headers export some types only in the std:: namespace, so be consistent. PiperOrigin-RevId: 695094623 Change-Id: I61318569c0564d108de7b1ac9970f3628f7cd19b
google · Nov 10, 2024 · 059955b · 059955b
1 parent 6ee275b
commit 059955b
Show file tree

Hide file tree

Showing 275 changed files with 1,023 additions and 832 deletions.
diff --git a/examples/compute_percentiles.cc b/examples/compute_percentiles.cc
@@ -13,9 +13,9 @@
 // limitations under the License.
 
 #include <math.h>
+#include <stddef.h>
 
 #include <algorithm>
-#include <cstddef>
 #include <iostream>
 #include <list>
 #include <string>

diff --git a/python/tensorstore/BUILD b/python/tensorstore/BUILD
@@ -1097,6 +1097,7 @@ pybind11_cc_library(
         "//tensorstore/util:future",
         "//tensorstore/util:str_cat",
         "//tensorstore/util/garbage_collection",
+        "@com_github_nlohmann_json//:json",
         "@com_github_pybind_pybind11//:pybind11",
         "@com_google_absl//absl/status",
         "@com_google_absl//absl/strings:cord",

diff --git a/python/tensorstore/array_type_caster.cc b/python/tensorstore/array_type_caster.cc
@@ -24,9 +24,10 @@
 #include "python/tensorstore/array_type_caster.h"
 
 // Other headers
+#include <stddef.h>
+
 #include <algorithm>
 #include <cassert>
-#include <cstddef>
 #include <exception>
 #include <memory>
 #include <optional>

diff --git a/python/tensorstore/data_type.cc b/python/tensorstore/data_type.cc
@@ -25,9 +25,10 @@
 #include "python/tensorstore/data_type.h"
 
 // Other headers
+#include <stddef.h>
+
 #include <array>
 #include <cassert>
-#include <cstddef>
 #include <string>
 #include <string_view>
 #include <utility>

diff --git a/python/tensorstore/data_type.h b/python/tensorstore/data_type.h
@@ -28,9 +28,10 @@
 // Other headers must be included after pybind11 to ensure header-order
 // inclusion constraints are satisfied.
 
+#include <stddef.h>
+
 #include <array>
 #include <complex>
-#include <cstddef>
 #include <string_view>
 
 #include "tensorstore/data_type.h"

diff --git a/python/tensorstore/dim_expression.cc b/python/tensorstore/dim_expression.cc
@@ -20,7 +20,8 @@
 #include "python/tensorstore/dim_expression.h"
 
 // Other headers
-#include <cstddef>
+#include <stddef.h>
+
 #include <iterator>
 #include <memory>
 #include <optional>

diff --git a/python/tensorstore/future.cc b/python/tensorstore/future.cc
@@ -25,7 +25,6 @@
 #include <algorithm>
 #include <cassert>
 #include <cerrno>
-#include <cstddef>
 #include <optional>
 #include <utility>
 

diff --git a/python/tensorstore/homogeneous_tuple.h b/python/tensorstore/homogeneous_tuple.h
@@ -19,7 +19,7 @@
 // Other headers must be included after pybind11 to ensure header-order
 // inclusion constraints are satisfied.
 
-#include <cstddef>
+#include <stddef.h>
 
 #include "python/tensorstore/type_name_override.h"
 #include "tensorstore/util/span.h"

diff --git a/python/tensorstore/index.cc b/python/tensorstore/index.cc
@@ -19,7 +19,8 @@
 #include "python/tensorstore/index.h"
 
 // Other headers
-#include <cstddef>
+#include <stddef.h>
+
 #include <string>
 #include <variant>
 #include <vector>

diff --git a/python/tensorstore/index_space.h b/python/tensorstore/index_space.h
@@ -27,8 +27,9 @@
 // Other headers must be included after pybind11 to ensure header-order
 // inclusion constraints are satisfied.
 
-#include <cstddef>
-#include <cstdint>
+#include <stddef.h>
+#include <stdint.h>
+
 #include <optional>
 #include <utility>
 

diff --git a/python/tensorstore/json_type_caster.cc b/python/tensorstore/json_type_caster.cc
@@ -20,7 +20,8 @@
 #include "python/tensorstore/json_type_caster.h"
 
 // Other headers
-#include <cstdint>
+#include <stdint.h>
+
 #include <string>
 #include <utility>
 #include <vector>
@@ -105,7 +106,7 @@ ::nlohmann::json PyObjectToJsonInteger(py::handle h) {
   PyErr_Clear();
   if (auto v = PyLong_AsLongLong(h.ptr());
       v != static_cast<decltype(v)>(-1) || !PyErr_Occurred()) {
-    return static_cast<std::int64_t>(v);
+    return static_cast<int64_t>(v);
   }
   throw py::error_already_set();
 }

diff --git a/python/tensorstore/kvstore.cc b/python/tensorstore/kvstore.cc
@@ -20,7 +20,8 @@
 #include "python/tensorstore/kvstore.h"
 
 // Other headers
-#include <cstddef>
+#include <stddef.h>
+
 #include <limits>
 #include <optional>
 #include <string>
@@ -31,6 +32,7 @@
 
 #include "absl/status/status.h"
 #include "absl/strings/cord.h"
+#include <nlohmann/json_fwd.hpp>
 #include "python/tensorstore/batch.h"
 #include "python/tensorstore/context.h"
 #include "python/tensorstore/define_heap_type.h"

diff --git a/python/tensorstore/numpy_indexing_spec.cc b/python/tensorstore/numpy_indexing_spec.cc
@@ -23,8 +23,9 @@
 #include "python/tensorstore/numpy_indexing_spec.h"
 
 // Other headers
+#include <stddef.h>
+
 #include <algorithm>
-#include <cstddef>
 #include <string>
 #include <string_view>
 #include <utility>

diff --git a/python/tensorstore/sequence_parameter.h b/python/tensorstore/sequence_parameter.h
@@ -19,11 +19,12 @@
 // Other headers must be included after pybind11 to ensure header-order
 // inclusion constraints are satisfied.
 
-#include <cstddef>
+#include <pybind11/stl.h>
+#include <stddef.h>
+
 #include <vector>
 
 #include "python/tensorstore/type_name_override.h"
-#include <pybind11/stl.h>
 
 namespace tensorstore {
 namespace internal_python {

diff --git a/python/tensorstore/serialization.cc b/python/tensorstore/serialization.cc
@@ -19,7 +19,8 @@
 #include "python/tensorstore/serialization.h"
 
 // Other headers
-#include <cstddef>
+#include <stddef.h>
+
 #include <memory>
 #include <string_view>
 #include <typeinfo>

diff --git a/python/tensorstore/spec.h b/python/tensorstore/spec.h
@@ -23,7 +23,8 @@
 // Other headers must be included after pybind11 to ensure header-order
 // inclusion constraints are satisfied.
 
-#include <cstddef>
+#include <stddef.h>
+
 #include <optional>
 #include <utility>
 #include <vector>

diff --git a/python/tensorstore/status.cc b/python/tensorstore/status.cc
@@ -19,8 +19,9 @@
 #include "python/tensorstore/status.h"
 
 // Other headers
+#include <stddef.h>
+
 #include <cassert>
-#include <cstddef>
 #include <string>
 #include <string_view>
 

diff --git a/tensorstore/BUILD b/tensorstore/BUILD
@@ -88,8 +88,6 @@ tensorstore_cc_test(
         "//tensorstore/util:span",
         "//tensorstore/util:status_testutil",
         "//tensorstore/util:str_cat",
-        "@com_github_nlohmann_json//:json",
-        "@com_google_absl//absl/random",
         "@com_google_absl//absl/random:bit_gen_ref",
         "@com_google_absl//absl/status",
         "@com_google_googletest//:gtest_main",

diff --git a/tensorstore/array_test.cc b/tensorstore/array_test.cc
@@ -14,12 +14,13 @@
 
 #include "tensorstore/array.h"
 
+#include <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
 #include <cmath>
 #include <complex>
-#include <cstddef>
+#include <cstddef>  // for std::byte
 #include <limits>
 #include <memory>
 #include <random>
@@ -31,9 +32,7 @@
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 #include "absl/random/bit_gen_ref.h"
-#include "absl/random/random.h"
 #include "absl/status/status.h"
-#include <nlohmann/json.hpp>
 #include "tensorstore/box.h"
 #include "tensorstore/container_kind.h"
 #include "tensorstore/contiguous_layout.h"

diff --git a/tensorstore/array_testutil.h b/tensorstore/array_testutil.h
@@ -18,7 +18,8 @@
 /// \file
 /// Define a GMock matcher for `tensorstore::Array`.
 
-#include <cstddef>
+#include <stddef.h>
+
 #include <ostream>
 #include <string>
 #include <vector>
@@ -209,7 +210,7 @@ ArrayMatcher MatchesArray(
 ///
 /// \param origin The expected origin vector of the array.
 /// \param element_matchers The matchers for each element of the array.
-template <typename Element, Index N0, std::ptrdiff_t OriginRank>
+template <typename Element, Index N0, ptrdiff_t OriginRank>
 ArrayMatcher MatchesArray(
     const Index (&origin)[OriginRank],
     const ::testing::Matcher<Element> (&element_matchers)[N0]) {

diff --git a/tensorstore/array_testutil_test.cc b/tensorstore/array_testutil_test.cc
@@ -31,7 +31,7 @@ using ::tensorstore::MatchesScalarArray;
 
 TEST(MatchesArrayTest, Describe) {
   std::ostringstream ss;
-  MatchesArray<std::int32_t>({1, 2}).DescribeTo(&ss);
+  MatchesArray<int32_t>({1, 2}).DescribeTo(&ss);
   EXPECT_EQ(
       R"(has a data type of int32 and a domain of {origin={0}, shape={2}} where
 element at {0} is equal to 1,
@@ -41,7 +41,7 @@ element at {1} is equal to 2)",
 
 TEST(MatchesArrayTest, DescribeNegation) {
   std::ostringstream ss;
-  MatchesArray<std::int32_t>({1, 2}).DescribeNegationTo(&ss);
+  MatchesArray<int32_t>({1, 2}).DescribeNegationTo(&ss);
   EXPECT_EQ(R"(doesn't have a data type of int32, or
 doesn't have a domain of {origin={0}, shape={2}}, or
 element at {0} isn't equal to 1, or
@@ -51,7 +51,7 @@ element at {1} isn't equal to 2)",
 
 TEST(MatchesArrayTest, ExplainDataTypeMismatch) {
   ::testing::StringMatchResultListener listener;
-  ::testing::ExplainMatchResult(MatchesArray<std::int32_t>({1, 2, 3}),
+  ::testing::ExplainMatchResult(MatchesArray<int32_t>({1, 2, 3}),
                                 MakeArray<float>({1, 2}), &listener);
   EXPECT_EQ("which has a data type of float32", listener.str());
 }

diff --git a/tensorstore/context.cc b/tensorstore/context.cc
@@ -14,9 +14,10 @@
 
 #include "tensorstore/context.h"
 
+#include <stddef.h>
+
 #include <algorithm>
 #include <cassert>
-#include <cstddef>
 #include <memory>
 #include <string>
 #include <string_view>

diff --git a/tensorstore/context_impl_base.h b/tensorstore/context_impl_base.h
@@ -22,7 +22,8 @@
 
 // IWYU pragma: private, include "third_party/tensorstore/context.h"
 
-#include <cstdint>
+#include <stdint.h>
+
 #include <memory>
 #include <string>
 #include <string_view>
@@ -390,7 +391,7 @@ class ResourceProviderImpl : public ResourceProviderImplBase {
                                  this->value_);
       } else {
         internal::EncodeCacheKey(out, ResourceSpecImplBase::kResource,
-                                 reinterpret_cast<std::uintptr_t>(this));
+                                 reinterpret_cast<uintptr_t>(this));
       }
     }
   };

diff --git a/tensorstore/context_test.cc b/tensorstore/context_test.cc
@@ -14,8 +14,9 @@
 
 #include "tensorstore/context.h"
 
-#include <cstddef>
-#include <cstdint>
+#include <stddef.h>
+#include <stdint.h>
+
 #include <optional>
 #include <string>
 #include <tuple>
@@ -72,12 +73,12 @@ using ::tensorstore::serialization::SerializationRoundTrip;
 
 struct IntResource : public ContextResourceTraits<IntResource> {
   struct Spec {
-    std::int64_t value;
+    int64_t value;
     constexpr static auto ApplyMembers = [](auto&& x, auto f) {
       return f(x.value);
     };
   };
-  using Resource = std::int64_t;
+  using Resource = int64_t;
   static constexpr char id[] = "int_resource";
   static Spec Default() { return {42}; }
   static constexpr auto JsonBinder() {
@@ -97,12 +98,12 @@ struct IntResource : public ContextResourceTraits<IntResource> {
 struct IntConfigResource : public ContextResourceTraits<IntConfigResource> {
   constexpr static bool config_only = true;
   struct Spec {
-    std::int64_t value;
+    int64_t value;
     constexpr static auto ApplyMembers = [](auto&& x, auto f) {
       return f(x.value);
     };
   };
-  using Resource = std::int64_t;
+  using Resource = int64_t;
   static constexpr char id[] = "int_config_resource";
   static Spec Default() { return {42}; }
   static constexpr auto JsonBinder() { return jb::Projection(&Spec::value); }
@@ -117,7 +118,7 @@ struct IntConfigResource : public ContextResourceTraits<IntConfigResource> {
 
 struct StrongRefResource : public ContextResourceTraits<StrongRefResource> {
   struct Spec {
-    std::int64_t value;
+    int64_t value;
     constexpr static auto ApplyMembers = [](auto&& x, auto f) {
       return f(x.value);
     };