ICU-10272 fix break on Windows

X-SVN-Rev: 35378

diff --git a/icu4c/source/common/unicode/std_string.h b/icu4c/source/common/unicode/std_string.h
index 626ab06042c0482693b09783a313da5665c065f2..05955c5d1e727f8e35bcaeb7d95f85a70d630ca1 100644 (file)
--- a/icu4c/source/common/unicode/std_string.h
+++ b/icu4c/source/common/unicode/std_string.h
@@ -27,8 +27,7 @@
 
 #if U_HAVE_STD_STRING
 
-#if defined(_MSC_VER) && _HAS_EXCEPTIONS == 0
-#else
+#if !defined(_MSC_VER)
 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 e35f125a3975b1bcc15947d1a7139ac9b831ba2d..6874c6bcfd7ee6a9d1bd20490c0cb80ab76be6f7 100644 (file)
--- a/icu4c/source/common/utypeinfo.h
+++ b/icu4c/source/common/utypeinfo.h
@@ -21,7 +21,8 @@
 #if defined(_MSC_VER) && _HAS_EXCEPTIONS == 0
 #include <exception>
 using std::exception;
-#else
+#endif
+#if !defined(_MSC_VER)
 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 dfa199db7dc425cb6499ff024863a46269d90eca..dbb3098b49f126c78e0eb33b66347b55bb7bef5f 100644 (file)
--- a/icu4c/source/io/unicode/ustream.h
+++ b/icu4c/source/io/unicode/ustream.h
@@ -26,8 +26,7 @@
  * C++ I/O stream API.
  */
 
-#if defined(_MSC_VER) && _HAS_EXCEPTIONS == 0
-#else
+#if !defined(_MSC_VER)
 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 84f31c3e429e76c7323862a9e17c9f82a81e51ae..d931fdd1288f844a26d3bf99590106103763aac7 100644 (file)
--- a/icu4c/source/test/intltest/dcfmtest.cpp
+++ b/icu4c/source/test/intltest/dcfmtest.cpp
@@ -29,8 +29,7 @@
 #include <string.h>
 #include <stdio.h>
 
-#if defined(_MSC_VER) && _HAS_EXCEPTIONS == 0
-#else
+#if !defined(_MSC_VER)
 namespace std { class type_info; } // WORKAROUND: http://llvm.org/bugs/show_bug.cgi?id=13364
 #endif