Update ICU to 58.1

source/io/ustream.cpp

Index: source/io/ustream.cpp
diff --git a/source/io/ustream.cpp b/source/io/ustream.cpp
index be02dd05427e6b9202a0540d5c50ac50a7abc7ac..8e0087edbe6b2193d3277fd50bfe7511901d6a73 100644
--- a/source/io/ustream.cpp
+++ b/source/io/ustream.cpp
@@ -1,6 +1,8 @@
+// Copyright (C) 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-2016, International Business Machines
 *   Corporation and others.  All Rights Reserved.
 **********************************************************************
 *  FILE NAME : ustream.cpp
@@ -88,7 +90,7 @@ operator>>(STD_ISTREAM& stream, UnicodeString& str)
     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;