ICU-64260.0.1.tar.gz

[apple/icu.git] / icuSources / common / stringpiece.cpp

diff --git a/icuSources/common/stringpiece.cpp b/icuSources/common/stringpiece.cpp
index 64cd376f02cda2dd3923fec5a5cbabd00e39c2f7..d4f7f310bafc7d8a8d736638d9d80e46be82a2aa 100644 (file)
--- a/icuSources/common/stringpiece.cpp
+++ b/icuSources/common/stringpiece.cpp
@@ -1,4 +1,6 @@
-// Copyright (C) 2009-2010, International Business Machines
+// © 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.
 //
 // Copyright 2004 and onwards Google Inc.
@@ -68,15 +70,6 @@ operator==(const StringPiece& x, const StringPiece& y) {
 }
 
 
-/* Microsft Visual Studios <= 8.0 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) including 
- * Visual Studios 9.0.
- * Cygwin with MSVC 9.0 also complains here about redefinition.
- */
-#if (!defined(_MSC_VER) || (_MSC_VER > 1500)) && !defined(CYGWINMSVC)
-const int32_t StringPiece::npos;
-#endif
+const int32_t StringPiece::npos = 0x7fffffff;
 
 U_NAMESPACE_END