67 lines
2.1 KiB
Diff
67 lines
2.1 KiB
Diff
Limit libstdc++ workaround to not upset libc++ with pragma visibility.
|
|
|
|
https://ssl.icu-project.org/trac/ticket/12023
|
|
|
|
diff --git a/intl/icu/source/common/unicode/std_string.h b/intl/icu/source/common/unicode/std_string.h
|
|
--- a/intl/icu/source/common/unicode/std_string.h
|
|
+++ b/intl/icu/source/common/unicode/std_string.h
|
|
@@ -24,16 +24,16 @@
|
|
* \brief C++ API: Central ICU header for including the C++ standard <string>
|
|
* header and for related definitions.
|
|
*/
|
|
|
|
#include "unicode/utypes.h"
|
|
|
|
#if U_HAVE_STD_STRING
|
|
|
|
-#if !defined(_MSC_VER)
|
|
+#if defined(__GLIBCXX__)
|
|
namespace std { class type_info; } // WORKAROUND: http://llvm.org/bugs/show_bug.cgi?id=13364
|
|
#endif
|
|
#include <string>
|
|
|
|
#endif // U_HAVE_STD_STRING
|
|
|
|
#endif // __STD_STRING_H__
|
|
diff --git a/intl/icu/source/common/utypeinfo.h b/intl/icu/source/common/utypeinfo.h
|
|
--- a/intl/icu/source/common/utypeinfo.h
|
|
+++ b/intl/icu/source/common/utypeinfo.h
|
|
@@ -19,14 +19,14 @@
|
|
// Whenever 'typeid' is used, this header has to be included
|
|
// instead of <typeinfo>.
|
|
// Visual Studio 10 emits warning 4275 with this change. If you compile
|
|
// with exception disabled, you have to suppress warning 4275.
|
|
#if defined(_MSC_VER) && _HAS_EXCEPTIONS == 0
|
|
#include <exception>
|
|
using std::exception;
|
|
#endif
|
|
-#if !defined(_MSC_VER)
|
|
+#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
|
|
--- a/intl/icu/source/io/unicode/ustream.h
|
|
+++ b/intl/icu/source/io/unicode/ustream.h
|
|
@@ -25,17 +25,17 @@
|
|
* \file
|
|
* \brief C++ API: Unicode iostream like API
|
|
*
|
|
* At this time, this API is very limited. It contains
|
|
* operator<< and operator>> for UnicodeString manipulation with the
|
|
* C++ I/O stream API.
|
|
*/
|
|
|
|
-#if !defined(_MSC_VER)
|
|
+#if defined(__GLIBCXX__)
|
|
namespace std { class type_info; } // WORKAROUND: http://llvm.org/bugs/show_bug.cgi?id=13364
|
|
#endif
|
|
|
|
#if U_IOSTREAM_SOURCE >= 199711
|
|
#if (__GNUC__ == 2)
|
|
#include <iostream>
|
|
#else
|
|
#include <istream>
|