Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(12)

Unified Diff: source/io/unicode/ustream.h

Issue 845603002: Update ICU to 54.1 step 1 (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/icu.git@master
Patch Set: remove unusued directories Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « source/io/unicode/ustdio.h ('k') | source/io/uprintf.c » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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
« no previous file with comments | « source/io/unicode/ustdio.h ('k') | source/io/uprintf.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698