ICU-10272 clang workaround

X-SVN-Rev: 35366

diff --git a/icu4c/source/common/unicode/std_string.h b/icu4c/source/common/unicode/std_string.h
index 67b1d6c5aad10a0b62837c2525477635b6b01f22..e39ad41ebb16ae06e09fbcb003bb72dbef7053ef 100644 (file)
--- a/icu4c/source/common/unicode/std_string.h
+++ b/icu4c/source/common/unicode/std_string.h
@@ -1,7 +1,7 @@
 /*
 *******************************************************************************
 *
-*   Copyright (C) 2009-2011, International Business Machines
+*   Copyright (C) 2009-2014, International Business Machines
 *   Corporation and others.  All Rights Reserved.
 *
 *******************************************************************************
@@ -18,7 +18,7 @@
 #define __STD_STRING_H__
 
 /**
- * \file 
+ * \file
  * \brief C++ API: Central ICU header for including the C++ standard <string>
  *                 header and for related definitions.
  */
@@ -27,6 +27,7 @@
 
 #if U_HAVE_STD_STRING
 
+namespace std { class type_info; } // WORKAROUND: http://llvm.org/bugs/show_bug.cgi?id=13364
 #include <string>
 
 #endif  // U_HAVE_STD_STRING

diff --git a/icu4c/source/common/utypeinfo.h b/icu4c/source/common/utypeinfo.h
index 4de16d6d790249ebbb2c6bc182d13093569a8fbf..8031ee5b0364eb74f28526b4dbad01e7ca88fe3a 100644 (file)
--- a/icu4c/source/common/utypeinfo.h
+++ b/icu4c/source/common/utypeinfo.h
@@ -1,7 +1,7 @@
 /*
 ******************************************************************************
 *
-*   Copyright (C) 2012, International Business Machines
+*   Copyright (C) 2012-2014, International Business Machines
 *   Corporation and others.  All Rights Reserved.
 *
 ******************************************************************************
@@ -22,6 +22,7 @@
 #include <exception>
 using std::exception;
 #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 abd24388697bcdb1361c663df65c9ec1771f05de..502fcc052f9e4f218b73a810ce3ffa331df96a4f 100644 (file)
--- a/icu4c/source/io/unicode/ustream.h
+++ b/icu4c/source/io/unicode/ustream.h
@@ -1,6 +1,6 @@
 /*
 **********************************************************************
-*   Copyright (C) 2001-2011 International Business Machines
+*   Copyright (C) 2001-2014 International Business Machines
 *   Corporation and others.  All Rights Reserved.
 **********************************************************************
 *  FILE NAME : ustream.h
@@ -26,6 +26,8 @@
  * C++ I/O stream API.
  */
 
+namespace std { class type_info; } // WORKAROUND: http://llvm.org/bugs/show_bug.cgi?id=13364 
+
 #if U_IOSTREAM_SOURCE >= 199711
 #if (__GNUC__ == 2)
 #include <iostream>

diff --git a/icu4c/source/test/intltest/dcfmtest.cpp b/icu4c/source/test/intltest/dcfmtest.cpp
index e36cf7b2709ecd7de8eafbce00268507e1435486..197f5424b6017e3a49a2814606123f264afc15bd 100644 (file)
--- a/icu4c/source/test/intltest/dcfmtest.cpp
+++ b/icu4c/source/test/intltest/dcfmtest.cpp
@@ -1,6 +1,6 @@
 /********************************************************************
  * COPYRIGHT:
- * Copyright (c) 2002-2013, International Business Machines Corporation and
+ * Copyright (c) 2002-2014, International Business Machines Corporation and
  * others. All Rights Reserved.
  ********************************************************************/
 
@@ -29,6 +29,8 @@
 #include <string.h>
 #include <stdio.h>
 
+namespace std { class type_info; } // WORKAROUND: http://llvm.org/bugs/show_bug.cgi?id=13364
+
 #include <string>
 #include <iostream>