ICU-531.48.tar.gz

[apple/icu.git] / icuSources / common / unicode / std_string.h

diff --git a/icuSources/common/unicode/std_string.h b/icuSources/common/unicode/std_string.h
index dd43b745a00c5345ae981126fb292368ee72be35..05955c5d1e727f8e35bcaeb7d95f85a70d630ca1 100644 (file)
--- a/icuSources/common/unicode/std_string.h
+++ b/icuSources/common/unicode/std_string.h
@@ -1,7 +1,7 @@
 /*
 *******************************************************************************
 *
-*   Copyright (C) 2009-2010, International Business Machines
+*   Copyright (C) 2009-2014, International Business Machines
 *   Corporation and others.  All Rights Reserved.
 *
 *******************************************************************************
@@ -18,60 +18,19 @@
 #define __STD_STRING_H__
 
 /**
- * \file 
+ * \file
  * \brief C++ API: Central ICU header for including the C++ standard <string>
  *                 header and for related definitions.
  */
 
 #include "unicode/utypes.h"
 
-/**
- * \def U_HAVE_STD_STRING
- * Define whether the standard C++ (STL) <string> header is available.
- * @internal
- */
-#ifndef U_HAVE_STD_STRING
-#define U_HAVE_STD_STRING 1
-#endif
-
 #if U_HAVE_STD_STRING
 
-#include <string>
-
-/**
- * \def U_STD_NS
- * Define the namespace to use for standard C++ (STL) classes.
- * Either std or empty.
- * @draft ICU 4.2
- */
-
-/**
- * \def U_STD_NSQ
- * Define the namespace qualifier to use for standard C++ (STL) classes.
- * Either std:: or empty.
- * For example,
- *   U_STD_NSQ string StringFromUnicodeString(const UnicodeString &unistr);
- * @draft ICU 4.2
- */
-
-/**
- * \def U_STD_NS_USE
- * This is used to specify that the rest of the code uses the
- * standard (STL) namespace.
- * Either "using namespace std;" or empty.
- * @draft ICU 4.2
- */
-#ifndef U_STD_NSQ
-#   if U_HAVE_NAMESPACE
-#       define U_STD_NS std
-#       define U_STD_NSQ U_STD_NS::
-#       define U_STD_NS_USE using namespace U_STD_NS;
-#   else
-#       define U_STD_NS
-#       define U_STD_NSQ
-#       define U_STD_NS_USE
-#   endif
+#if !defined(_MSC_VER)
+namespace std { class type_info; } // WORKAROUND: http://llvm.org/bugs/show_bug.cgi?id=13364
 #endif
+#include <string>
 
 #endif  // U_HAVE_STD_STRING