ICU-62107.0.1.tar.gz

[apple/icu.git] / icuSources / io / unicode / ustream.h

diff --git a/icuSources/io/unicode/ustream.h b/icuSources/io/unicode/ustream.h
index dbb3098b49f126c78e0eb33b66347b55bb7bef5f..f185c453f8fa2cae8c1a9653b7adeddbc258c990 100644 (file)
--- a/icuSources/io/unicode/ustream.h
+++ b/icuSources/io/unicode/ustream.h
@@ -1,3 +1,5 @@
+// © 2016 and later: Unicode, Inc. and others.
+// License & terms of use: http://www.unicode.org/copyright.html

 /*
 **********************************************************************
 *   Copyright (C) 2001-2014 International Business Machines
 /*
 **********************************************************************
 *   Copyright (C) 2001-2014 International Business Machines


@@ -17,6 +19,8 @@
 
 #include "unicode/unistr.h"
 
 
 #include "unicode/unistr.h"
 

+#if !UCONFIG_NO_CONVERSION  // not available without conversion
+

 /**
  * \file
  * \brief C++ API: Unicode iostream like API
 /**
  * \file
  * \brief C++ API: Unicode iostream like API


@@ -26,18 +30,13 @@
  * C++ I/O stream API.
  */
 
  * 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
 
 namespace std { class type_info; } // WORKAROUND: http://llvm.org/bugs/show_bug.cgi?id=13364
 #endif
 

-#if U_IOSTREAM_SOURCE >= 199711
-#if (__GNUC__ == 2)

 #include <iostream>
 #include <iostream>

-#else
-#include <istream>
-#include <ostream>
-#endif

 
 

+#if U_SHOW_CPLUSPLUS_API

 U_NAMESPACE_BEGIN
 
 /**
 U_NAMESPACE_BEGIN
 
 /**


@@ -57,6 +56,7 @@ U_IO_API std::ostream & U_EXPORT2 operator<<(std::ostream& stream, const Unicode
  */
 U_IO_API std::istream & U_EXPORT2 operator>>(std::istream& stream, UnicodeString& s);
 U_NAMESPACE_END
  */
 U_IO_API std::istream & U_EXPORT2 operator>>(std::istream& stream, UnicodeString& s);
 U_NAMESPACE_END

+#endif // U_SHOW_CPLUSPLUS_API

 
 #endif
 
 
 #endif