blob: 27017a8a3181bee1dbeecc1998ce04602bdd2a1b (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
|
From: Mike Hommey <mh@glandium.org>
Date: Mon, 15 Aug 2022 14:49:40 +0900
Subject: Remove workaround for old libstdc++ problem, which now causes
problems with GCC 12 on arm
---
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 bf87230..c8388ef 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 <string>
#endif /* U_SHOW_CPLUSPLUS_API */
diff --git a/intl/icu/source/common/utypeinfo.h b/intl/icu/source/common/utypeinfo.h
index c666373..5d97240 100644
--- 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 927342c..93ef51c 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 <iostream>
U_NAMESPACE_BEGIN
|
