Update ICU to 54.1 step 1

source/io/unicode/ustream.h

Index: source/io/unicode/ustream.h
diff --git a/source/io/unicode/ustream.h b/source/io/unicode/ustream.h
index abd24388697bcdb1361c663df65c9ec1771f05de..41ccf5ae036c67a192bfaa0b5e80f942be43d0eb 100644
--- a/source/io/unicode/ustream.h
+++ b/source/io/unicode/ustream.h
@@ -1,6 +1,6 @@
 /*
 **********************************************************************
-*   Copyright (C) 2001-2011 International Business Machines
+*   Copyright (C) 2001-2014 International Business Machines
 *   Corporation and others.  All Rights Reserved.
 **********************************************************************
 *  FILE NAME : ustream.h
@@ -17,6 +17,8 @@
 
 #include "unicode/unistr.h"
 
+#if !UCONFIG_NO_CONVERSION  // not available without conversion
+
 /**
  * \file
  * \brief C++ API: Unicode iostream like API
@@ -26,6 +28,10 @@
  * C++ I/O stream API.
  */
 
+#if !defined(_MSC_VER)
+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>
@@ -59,3 +65,4 @@ U_NAMESPACE_END
 /* No operator for UChar because it can conflict with wchar_t  */
 
 #endif
+#endif