From 0087f8ce29c9fb1be70a57bee513bc2e900eee32 Mon Sep 17 00:00:00 2001 From: Mike Hommey Date: Mon, 15 Aug 2022 14:49:40 +0900 Subject: [PATCH] Remove workaround for old libstdc++ problem, which now causes problems with GCC 12 on arm Gbp-Pq: Topic debian-hacks Gbp-Pq: Name Remove-workaround-for-old-libstdc-problem-which-now-.patch --- intl/icu/source/common/unicode/std_string.h | 5 ----- intl/icu/source/common/utypeinfo.h | 3 --- intl/icu/source/io/unicode/ustream.h | 4 ---- 3 files changed, 12 deletions(-) diff --git a/intl/icu/source/common/unicode/std_string.h b/intl/icu/source/common/unicode/std_string.h index bf87230167e..c8388ef9fdf 100644 --- a/intl/icu/source/common/unicode/std_string.h +++ b/intl/icu/source/common/unicode/std_string.h @@ -29,11 +29,6 @@ #if U_SHOW_CPLUSPLUS_API -// Workaround for a libstdc++ bug before libstdc++4.6 (2011). -// https://bugs.llvm.org/show_bug.cgi?id=13364 -#if defined(__GLIBCXX__) -namespace std { class type_info; } -#endif #include #endif /* U_SHOW_CPLUSPLUS_API */ diff --git a/intl/icu/source/common/utypeinfo.h b/intl/icu/source/common/utypeinfo.h index c6663734fc3..5d9724059b9 100644 --- a/intl/icu/source/common/utypeinfo.h +++ b/intl/icu/source/common/utypeinfo.h @@ -24,9 +24,6 @@ #include using std::exception; #endif -#if defined(__GLIBCXX__) -namespace std { class type_info; } // WORKAROUND: http://llvm.org/bugs/show_bug.cgi?id=13364 -#endif #include // for 'typeid' to work #endif diff --git a/intl/icu/source/io/unicode/ustream.h b/intl/icu/source/io/unicode/ustream.h index 927342cb031..93ef51c3ec9 100644 --- a/intl/icu/source/io/unicode/ustream.h +++ b/intl/icu/source/io/unicode/ustream.h @@ -34,10 +34,6 @@ * C++ I/O stream API. */ -#if defined(__GLIBCXX__) -namespace std { class type_info; } // WORKAROUND: http://llvm.org/bugs/show_bug.cgi?id=13364 -#endif - #include U_NAMESPACE_BEGIN -- 2.30.2