ICU-57132.0.1.tar.gz

[apple/icu.git] / icuSources / io / ustream.cpp

diff --git a/icuSources/io/ustream.cpp b/icuSources/io/ustream.cpp
index fb5f8880150ddef11a95295a568519f0221b22d4..25c54eb55532f91023bb920bc4d8d7f4cbcb7083 100644 (file)
--- a/icuSources/io/ustream.cpp
+++ b/icuSources/io/ustream.cpp
@@ -1,6 +1,6 @@
 /*
 **********************************************************************
 /*
 **********************************************************************

-*   Copyright (C) 2001-2011, International Business Machines
+*   Copyright (C) 2001-2016, International Business Machines

 *   Corporation and others.  All Rights Reserved.
 **********************************************************************
 *  FILE NAME : ustream.cpp
 *   Corporation and others.  All Rights Reserved.
 **********************************************************************
 *  FILE NAME : ustream.cpp


@@ -13,6 +13,9 @@
 */
 
 #include "unicode/utypes.h"
 */
 
 #include "unicode/utypes.h"

+
+#if !UCONFIG_NO_CONVERSION
+

 #include "unicode/uobject.h"
 #include "unicode/ustream.h"
 #include "unicode/ucnv.h"
 #include "unicode/uobject.h"
 #include "unicode/ustream.h"
 #include "unicode/ucnv.h"


@@ -85,7 +88,7 @@ operator>>(STD_ISTREAM& stream, UnicodeString& str)
     converter = u_getDefaultConverter(&errorCode);
     if(U_SUCCESS(errorCode)) {
         UChar *us = uBuffer;
     converter = u_getDefaultConverter(&errorCode);
     if(U_SUCCESS(errorCode)) {
         UChar *us = uBuffer;

-        const UChar *uLimit = uBuffer + sizeof(uBuffer)/sizeof(*uBuffer);
+        const UChar *uLimit = uBuffer + UPRV_LENGTHOF(uBuffer);

         const char *s, *sLimit;
         char ch;
         UChar ch32;
         const char *s, *sLimit;
         char ch;
         UChar ch32;


@@ -165,3 +168,4 @@ STOP_READING:
 U_NAMESPACE_END
 
 #endif
 U_NAMESPACE_END
 
 #endif

+#endif