From: Steven R. Loomis <srl@icu-project.org>
Date: Tue, 15 Nov 2016 21:02:48 +0000 (+0000)
Subject: ICU-12023 merge from http://bugs.icu-project.org/trac/attachment/ticket/12023/libcxx_... 
X-Git-Tag: milestone-59-0-1~50
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=725a6726d773d906dcd6c1be3cc3d423f5c683fe;p=icu

ICU-12023 merge from http://bugs.icu-project.org/trac/attachment/ticket/12023/libcxx_typeinfo.diff - CLA confirmed as @jbeich

X-SVN-Rev: 39507
---

diff --git a/icu4c/source/common/unicode/std_string.h b/icu4c/source/common/unicode/std_string.h
index 104ef0c83e8..10e49ff72b7 100644
--- 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 b39aa0d6053..651049c2be9 100644
--- 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 ab52f6a28a0..0eb13b5486d 100644
--- 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 6e2279b6542..5fe286a7353 100644
--- 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