ICU-10272 the clang workaround was only *mostly* harmless. Disable it under Windows...

X-SVN-Rev: 35375

diff --git a/icu4c/source/common/unicode/std_string.h b/icu4c/source/common/unicode/std_string.h
index e39ad41ebb16ae06e09fbcb003bb72dbef7053ef..626ab06042c0482693b09783a313da5665c065f2 100644 (file)
--- a/icu4c/source/common/unicode/std_string.h
+++ b/icu4c/source/common/unicode/std_string.h
@@ -27,7 +27,10 @@
 
 #if U_HAVE_STD_STRING
 
+#if defined(_MSC_VER) && _HAS_EXCEPTIONS == 0
+#else
 namespace std { class type_info; } // WORKAROUND: http://llvm.org/bugs/show_bug.cgi?id=13364
+#endif
 #include <string>
 
 #endif  // U_HAVE_STD_STRING

diff --git a/icu4c/source/common/utypeinfo.h b/icu4c/source/common/utypeinfo.h
index 8031ee5b0364eb74f28526b4dbad01e7ca88fe3a..e35f125a3975b1bcc15947d1a7139ac9b831ba2d 100644 (file)
--- a/icu4c/source/common/utypeinfo.h
+++ b/icu4c/source/common/utypeinfo.h
@@ -21,8 +21,9 @@
 #if defined(_MSC_VER) && _HAS_EXCEPTIONS == 0
 #include <exception>
 using std::exception;
+#else
+namespace std { class type_info; } // WORKAROUND: http://llvm.org/bugs/show_bug.cgi?id=13364
 #endif
-namespace std { class type_info; } // WORKAROUND: http://llvm.org/bugs/show_bug.cgi?id=13364 
 #include <typeinfo>  // for 'typeid' to work
 
 #endif

diff --git a/icu4c/source/io/unicode/ustream.h b/icu4c/source/io/unicode/ustream.h
index 502fcc052f9e4f218b73a810ce3ffa331df96a4f..dfa199db7dc425cb6499ff024863a46269d90eca 100644 (file)
--- a/icu4c/source/io/unicode/ustream.h
+++ b/icu4c/source/io/unicode/ustream.h
@@ -26,7 +26,10 @@
  * C++ I/O stream API.
  */
 
-namespace std { class type_info; } // WORKAROUND: http://llvm.org/bugs/show_bug.cgi?id=13364 
+#if defined(_MSC_VER) && _HAS_EXCEPTIONS == 0
+#else
+namespace std { class type_info; } // WORKAROUND: http://llvm.org/bugs/show_bug.cgi?id=13364
+#endif
 
 #if U_IOSTREAM_SOURCE >= 199711
 #if (__GNUC__ == 2)

diff --git a/icu4c/source/test/intltest/dcfmtest.cpp b/icu4c/source/test/intltest/dcfmtest.cpp
index 197f5424b6017e3a49a2814606123f264afc15bd..84f31c3e429e76c7323862a9e17c9f82a81e51ae 100644 (file)
--- a/icu4c/source/test/intltest/dcfmtest.cpp
+++ b/icu4c/source/test/intltest/dcfmtest.cpp
@@ -29,7 +29,10 @@
 #include <string.h>
 #include <stdio.h>
 
+#if defined(_MSC_VER) && _HAS_EXCEPTIONS == 0
+#else
 namespace std { class type_info; } // WORKAROUND: http://llvm.org/bugs/show_bug.cgi?id=13364
+#endif
 
 #include <string>
 #include <iostream>