Changes needed to get branch to compile

Using `--preset ninja-debug`. Build will fail on initially on GCC 11+ due to a use of undefined error from googletest; lower version is needed to avoid hundreds of instances of an ambiguous print overload, but that version doesn't have googletest PR 3024 included yet. This change needs to be made manually in the googletest build tree as downloaded by cmake.
jvanstraten · Jan 11, 2022 · 9255fb6 · 9255fb6
1 parent 33f5c9e
commit 9255fb6
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/cpp/src/arrow/engine/substrait/extension_types.cc b/cpp/src/arrow/engine/substrait/extension_types.cc
@@ -47,7 +47,7 @@ struct FixedCharExtensionParams {
 std::shared_ptr<DataType> FixedCharGetStorage(const FixedCharExtensionParams& params) {
   return fixed_size_binary(params.length);
 }
-static auto kFixedCharExtensionParamsProperties = internal::MakeProperties(
+static constexpr auto kFixedCharExtensionParamsProperties = internal::MakeProperties(
     internal::DataMember("length", &FixedCharExtensionParams::length));
 
 using FixedCharType =
@@ -62,7 +62,7 @@ struct VarCharExtensionParams {
 std::shared_ptr<DataType> VarCharGetStorage(const VarCharExtensionParams&) {
   return utf8();
 }
-static auto kVarCharExtensionParamsProperties = internal::MakeProperties(
+static constexpr auto kVarCharExtensionParamsProperties = internal::MakeProperties(
     internal::DataMember("length", &VarCharExtensionParams::length));
 
 using VarCharType =
@@ -109,7 +109,7 @@ std::shared_ptr<DataType> interval_year() { return IntervalYearType::Make({}); }
 std::shared_ptr<DataType> interval_day() { return IntervalDayType::Make({}); }
 
 bool UnwrapUuid(const DataType& t) {
-  if (auto params = UuidType::GetIf(t)) {
+  if (UuidType::GetIf(t)) {
     return true;
   }
   return false;
@@ -130,14 +130,14 @@ util::optional<int32_t> UnwrapVarChar(const DataType& t) {
 }
 
 bool UnwrapIntervalYear(const DataType& t) {
-  if (auto params = IntervalYearType::GetIf(t)) {
+  if (IntervalYearType::GetIf(t)) {
     return true;
   }
   return false;
 }
 
 bool UnwrapIntervalDay(const DataType& t) {
-  if (auto params = IntervalDayType::GetIf(t)) {
+  if (IntervalDayType::GetIf(t)) {
     return true;
   }
   return false;

diff --git a/cpp/src/arrow/util/hashing.h b/cpp/src/arrow/util/hashing.h
@@ -887,7 +887,7 @@ struct StringViewHash {
   // (the std::hash specialization provided by nonstd constructs std::string
   // temporaries then invokes std::hash<std::string> against those)
   hash_t operator()(const util::string_view& value) const {
-    return ComputeStringHash<>(value.data(), static_cast<int64_t>(value.size()));
+    return ComputeStringHash<0>(value.data(), static_cast<int64_t>(value.size()));
   }
 };
 

diff --git a/cpp/src/arrow/util/reflection_internal.h b/cpp/src/arrow/util/reflection_internal.h
@@ -109,7 +109,7 @@ struct PropertyTuple {
 };
 
 template <typename... Properties>
-PropertyTuple<Properties...> MakeProperties(Properties... props) {
+PropertyTuple<Properties...> constexpr MakeProperties(Properties... props) {
   return {std::make_tuple(props...)};
 }
 

diff --git a/cpp/thirdparty/versions.txt b/cpp/thirdparty/versions.txt
@@ -53,8 +53,8 @@ ARROW_GOOGLE_CLOUD_CPP_BUILD_VERSION=v1.31.1
 ARROW_GOOGLE_CLOUD_CPP_BUILD_SHA256_CHECKSUM=dc7cbf95b506a84b48cf71e0462985d262183edeaabdacaaee2109852394a609
 ARROW_GRPC_BUILD_VERSION=v1.35.0
 ARROW_GRPC_BUILD_SHA256_CHECKSUM=27dd2fc5c9809ddcde8eb6fa1fa278a3486566dfc28335fca13eb8df8bd3b958
-ARROW_GTEST_BUILD_VERSION=1.11.0
-ARROW_GTEST_BUILD_SHA256_CHECKSUM=b4870bf121ff7795ba20d20bcdd8627b8e088f2d1dab299a031c1034eddc93d5
+ARROW_GTEST_BUILD_VERSION=1.10.0
+ARROW_GTEST_BUILD_SHA256_CHECKSUM=9dc9157a9a1551ec7a7e43daea9a694a0bb5fb8bec81235d8a1e6ef64c716dcb
 ARROW_JEMALLOC_BUILD_VERSION=5.2.1
 ARROW_JEMALLOC_BUILD_SHA256_CHECKSUM=34330e5ce276099e2e8950d9335db5a875689a4c6a56751ef3b1d8c537f887f6
 # Include post-1.9.3 fixes for undefined behaviour