Remove workaround for old libstdc++ problem, which now causes problems with GCC 12...

Gbp-Pq: Topic debian-hacks
Gbp-Pq: Name Remove-workaround-for-old-libstdc-problem-which-now-.patch

diff --git a/intl/icu/source/common/unicode/std_string.h b/intl/icu/source/common/unicode/std_string.h
index bf87230167ecf25ce98aef43a05302c165497c67..c8388ef9fdf4b7eafed8cb6f8bf4fd3b99807a1a 100644 (file)
--- 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 <string>
 
 #endif /* U_SHOW_CPLUSPLUS_API */

diff --git a/intl/icu/source/common/utypeinfo.h b/intl/icu/source/common/utypeinfo.h
index c6663734fc3dc4f2714b7dfcede2a1109784ed9b..5d9724059b95dbb69d2940902a3cb8d8f6d6d2e0 100644 (file)
--- a/intl/icu/source/common/utypeinfo.h
+++ b/intl/icu/source/common/utypeinfo.h
@@ -24,9 +24,6 @@
 #include <exception>
 using std::exception;
 #endif
-#if defined(__GLIBCXX__)
-namespace std { class type_info; } // WORKAROUND: http://llvm.org/bugs/show_bug.cgi?id=13364
-#endif
 #include <typeinfo>  // for 'typeid' to work
 
 #endif

diff --git a/intl/icu/source/io/unicode/ustream.h b/intl/icu/source/io/unicode/ustream.h
index 927342cb0313a429fe49d3a658fbd010f3460ad8..93ef51c3ec9ea6ef895fb44e334969f8e04b9970 100644 (file)
--- 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 <iostream>
 
 U_NAMESPACE_BEGIN