From bfd4f05aed7fc7fbd746c7d56b01b15be60f0ae9 Mon Sep 17 00:00:00 2001 From: George Rhoten Date: Mon, 15 Mar 2004 05:50:27 +0000 Subject: [PATCH] ICU-3499 Port to .NET X-SVN-Rev: 14704 --- icu4c/source/extra/ustdio/unicode/ustream.h | 8 +- icu4c/source/extra/ustdio/ustream.cpp | 7 +- icu4c/source/test/iotest/iotest.vcproj | 172 ++++++++++++++++++++ 3 files changed, 181 insertions(+), 6 deletions(-) create mode 100644 icu4c/source/test/iotest/iotest.vcproj diff --git a/icu4c/source/extra/ustdio/unicode/ustream.h b/icu4c/source/extra/ustdio/unicode/ustream.h index 103f1c933f..33c06aa9c5 100644 --- a/icu4c/source/extra/ustdio/unicode/ustream.h +++ b/icu4c/source/extra/ustdio/unicode/ustream.h @@ -28,18 +28,18 @@ #include U_NAMESPACE_BEGIN -U_IO_API std::ostream &operator<<(std::ostream& stream, const UnicodeString& s); +U_IO_API std::ostream & U_EXPORT2 operator<<(std::ostream& stream, const UnicodeString& s); -U_IO_API std::istream &operator>>(std::istream& stream, UnicodeString& s); +U_IO_API std::istream & U_EXPORT2 operator>>(std::istream& stream, UnicodeString& s); U_NAMESPACE_END #elif U_IOSTREAM_SOURCE >= 198506 #include U_NAMESPACE_BEGIN -U_IO_API ostream &operator<<(ostream& stream, const UnicodeString& s); +U_IO_API ostream & U_EXPORT2 operator<<(ostream& stream, const UnicodeString& s); -U_IO_API istream &operator>>(istream& stream, UnicodeString& s); +U_IO_API istream & U_EXPORT2 operator>>(istream& stream, UnicodeString& s); U_NAMESPACE_END #endif diff --git a/icu4c/source/extra/ustdio/ustream.cpp b/icu4c/source/extra/ustdio/ustream.cpp index 6f7319a7eb..b3c3ffe8a7 100644 --- a/icu4c/source/extra/ustdio/ustream.cpp +++ b/icu4c/source/extra/ustdio/ustream.cpp @@ -34,7 +34,9 @@ #define STD_OSTREAM STD_NAMESPACE ostream #define STD_ISTREAM STD_NAMESPACE istream -U_IO_API STD_OSTREAM & +U_NAMESPACE_BEGIN + +U_IO_API STD_OSTREAM & U_EXPORT2 operator<<(STD_OSTREAM& stream, const UnicodeString& str) { if(str.length() > 0) { @@ -66,7 +68,7 @@ operator<<(STD_OSTREAM& stream, const UnicodeString& str) return stream; } -U_IO_API STD_ISTREAM & +U_IO_API STD_ISTREAM & U_EXPORT2 operator>>(STD_ISTREAM& stream, UnicodeString& str) { /* ipfx should eat whitespace when ios::skipws is set */ @@ -129,6 +131,7 @@ operator>>(STD_ISTREAM& stream, UnicodeString& str) return stream; } +U_NAMESPACE_END #endif diff --git a/icu4c/source/test/iotest/iotest.vcproj b/icu4c/source/test/iotest/iotest.vcproj new file mode 100644 index 0000000000..bd33815337 --- /dev/null +++ b/icu4c/source/test/iotest/iotest.vcproj @@ -0,0 +1,172 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +