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

Unified Diff: source/common/unicode/std_string.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/common/unicode/rbbi.h ('k') | source/common/unicode/stringtriebuilder.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: source/common/unicode/std_string.h
diff --git a/source/common/unicode/std_string.h b/source/common/unicode/std_string.h
index 67b1d6c5aad10a0b62837c2525477635b6b01f22..05955c5d1e727f8e35bcaeb7d95f85a70d630ca1 100644
--- a/source/common/unicode/std_string.h
+++ b/source/common/unicode/std_string.h
@@ -1,7 +1,7 @@
/*
*******************************************************************************
*
-* Copyright (C) 2009-2011, International Business Machines
+* Copyright (C) 2009-2014, International Business Machines
* Corporation and others. All Rights Reserved.
*
*******************************************************************************
@@ -18,7 +18,7 @@
#define __STD_STRING_H__
/**
- * \file
+ * \file
* \brief C++ API: Central ICU header for including the C++ standard <string>
* header and for related definitions.
*/
@@ -27,6 +27,9 @@
#if U_HAVE_STD_STRING
+#if !defined(_MSC_VER)
+namespace std { class type_info; } // WORKAROUND: http://llvm.org/bugs/show_bug.cgi?id=13364
+#endif
#include <string>
#endif // U_HAVE_STD_STRING
« no previous file with comments | « source/common/unicode/rbbi.h ('k') | source/common/unicode/stringtriebuilder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698