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

Unified Diff: source/common/stringpiece.cpp

Issue 2440913002: Update ICU to 58.1
Patch Set: Created 4 years, 2 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/sprpimpl.h ('k') | source/common/stringtriebuilder.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: source/common/stringpiece.cpp
diff --git a/source/common/stringpiece.cpp b/source/common/stringpiece.cpp
index 007713e6f8f30310c612f52dc607e548a87bb9b7..b032b474f65616385441a1f741de6e3113731085 100644
--- a/source/common/stringpiece.cpp
+++ b/source/common/stringpiece.cpp
@@ -1,3 +1,5 @@
+// Copyright (C) 2016 and later: Unicode, Inc. and others.
+// License & terms of use: http://www.unicode.org/copyright.html
// Copyright (C) 2009-2013, International Business Machines
// Corporation and others. All Rights Reserved.
//
@@ -68,14 +70,6 @@ operator==(const StringPiece& x, const StringPiece& y) {
}
-/* Microsoft Visual Studio (even 2013) complains about redefinition of this
- * static const class variable. However, the C++ standard states that this
- * definition is correct. Perhaps there is a bug in the Microsoft compiler.
- * This is not an issue on any other compilers (that we know of).
- * Cygwin with MSVC 9.0 also complains here about redefinition.
- */
-#if (!defined(_MSC_VER) || (_MSC_VER > 1800)) && !defined(CYGWINMSVC)
const int32_t StringPiece::npos = 0x7fffffff;
-#endif
U_NAMESPACE_END
« no previous file with comments | « source/common/sprpimpl.h ('k') | source/common/stringtriebuilder.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698