From: Michael Ow Date: Thu, 19 Apr 2012 19:07:33 +0000 (+0000) Subject: ICU-9239 Fix StringPiece::npos build error on Windows X-Git-Tag: milestone-59-0-1~3852 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=46e9f5081f029cd67fa7960c9f6ac88322ed9b44;p=icu ICU-9239 Fix StringPiece::npos build error on Windows X-SVN-Rev: 31746 --- diff --git a/icu4c/source/common/stringpiece.cpp b/icu4c/source/common/stringpiece.cpp index 64cd376f02c..d9194e31e18 100644 --- a/icu4c/source/common/stringpiece.cpp +++ b/icu4c/source/common/stringpiece.cpp @@ -1,4 +1,4 @@ -// Copyright (C) 2009-2010, International Business Machines +// Copyright (C) 2009-2012, International Business Machines // Corporation and others. All Rights Reserved. // // Copyright 2004 and onwards Google Inc. @@ -75,7 +75,7 @@ operator==(const StringPiece& x, const StringPiece& y) { * Visual Studios 9.0. * Cygwin with MSVC 9.0 also complains here about redefinition. */ -#if (!defined(_MSC_VER) || (_MSC_VER > 1500)) && !defined(CYGWINMSVC) +#if (!defined(_MSC_VER) || (_MSC_VER >= 1500)) && !defined(CYGWINMSVC) const int32_t StringPiece::npos; #endif