ICU-12023 merge from http://bugs.icu-project.org/trac/attachment/ticket/12023/libcxx_...

X-SVN-Rev: 39507

diff --git a/icu4c/source/common/unicode/std_string.h b/icu4c/source/common/unicode/std_string.h
index 104ef0c83e8cfea2ba17b44ccbbf6690c75a2243..10e49ff72b7d9b627a89db75a0be30f37cda1431 100644 (file)
--- a/icu4c/source/common/unicode/std_string.h
+++ b/icu4c/source/common/unicode/std_string.h
@@ -29,7 +29,7 @@
 
 #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>

diff --git a/icu4c/source/common/utypeinfo.h b/icu4c/source/common/utypeinfo.h
index b39aa0d6053344d2a594ec188c874845e7adc38e..651049c2be9c517906c917544102fa0dd4cf1d14 100644 (file)
--- a/icu4c/source/common/utypeinfo.h
+++ b/icu4c/source/common/utypeinfo.h
@@ -24,7 +24,7 @@
 #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

diff --git a/icu4c/source/io/unicode/ustream.h b/icu4c/source/io/unicode/ustream.h
index ab52f6a28a072866edcd525b2575cb1c1c8137fb..0eb13b5486d428b8b138d0366c455c470a255277 100644 (file)
--- a/icu4c/source/io/unicode/ustream.h
+++ b/icu4c/source/io/unicode/ustream.h
@@ -30,7 +30,7 @@
  * 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
 

diff --git a/icu4c/source/test/intltest/dcfmtest.cpp b/icu4c/source/test/intltest/dcfmtest.cpp
index 6e2279b6542d384810df7786dc31694dfe7952b8..5fe286a735354e9517d3618bb12db580ead5d480 100644 (file)
--- a/icu4c/source/test/intltest/dcfmtest.cpp
+++ b/icu4c/source/test/intltest/dcfmtest.cpp
@@ -31,7 +31,7 @@
 #include <string.h>
 #include <stdio.h>
 
-#if !defined(_MSC_VER)
+#if defined(__GLIBCXX__)
 namespace std { class type_info; } // WORKAROUND: http://llvm.org/bugs/show_bug.cgi?id=13364
 #endif