Revert "Work around static assertion failures in tests with GCC 13"

This reverts commit 570816731a.

A fix for the underlying issue will be backported instead.
This commit is contained in:
Benjamin A. Beasley 2023-01-20 21:13:23 -05:00
commit 1197352945
2 changed files with 0 additions and 31 deletions

View file

@ -1,26 +0,0 @@
diff -Naur abseil-cpp-20220623.1-original/absl/memory/memory_test.cc abseil-cpp-20220623.1/absl/memory/memory_test.cc
--- abseil-cpp-20220623.1-original/absl/memory/memory_test.cc 2022-08-31 13:15:21.000000000 -0400
+++ abseil-cpp-20220623.1/absl/memory/memory_test.cc 2023-01-18 21:30:33.460050217 -0500
@@ -505,14 +505,14 @@
};
TEST(AllocatorTraits, Rebind) {
- EXPECT_TRUE(
- (std::is_same<Rebound<int>,
- typename absl::allocator_traits<
- AllocWithRebind>::template rebind_alloc<int>>::value));
- EXPECT_TRUE(
- (std::is_same<absl::allocator_traits<Rebound<int>>,
- typename absl::allocator_traits<
- AllocWithRebind>::template rebind_traits<int>>::value));
+ // EXPECT_TRUE(
+ // (std::is_same<Rebound<int>,
+ // typename absl::allocator_traits<
+ // AllocWithRebind>::template rebind_alloc<int>>::value));
+ //EXPECT_TRUE(
+ // (std::is_same<absl::allocator_traits<Rebound<int>>,
+ // typename absl::allocator_traits<
+ // AllocWithRebind>::template rebind_traits<int>>::value));
EXPECT_TRUE(
(std::is_same<AllocWithoutRebind<double, char>,

View file

@ -28,11 +28,6 @@ Source0: https://github.com/abseil/abseil-cpp/archive/%{version}/%{name}-
#
# Fixes RHBZ#2108658.
Patch: https://github.com/abseil/abseil-cpp/commit/09e96049995584c3489e4bd1467313e3e85af99c.patch
# Comment out two static assertions in the tests that fail with GCC 13.
# Reported upstream:
# Static assertion failures compiling AllocatorTraits.Rebind test (GCC 13)
# https://github.com/abseil/abseil-cpp/issues/1366
Patch: abseil-cpp-20220623.1-gcc13.patch
BuildRequires: cmake
# The default make backend would work just as well; ninja is observably faster