source/common/stringpiece.cpp - Issue 23889022: Fix icu compilation on VS2013

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: source/common/stringpiece.cpp

Issue 23889022: Fix icu compilation on VS2013 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/icu46/

Patch Set: Created 7 years, 3 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 unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « patches/vs2012.patch ('k') | vs2012.patch » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (C) 2009-2010, International Business Machines	1 // Copyright (C) 2009-2010, International Business Machines

2 // Corporation and others. All Rights Reserved.	2 // Corporation and others. All Rights Reserved.

3 //	3 //

4 // Copyright 2004 and onwards Google Inc.	4 // Copyright 2004 and onwards Google Inc.

5 //	5 //

6 // Author: wilsonh@google.com (Wilson Hsieh)	6 // Author: wilsonh@google.com (Wilson Hsieh)

7 //	7 //

8	8

9 #include "unicode/utypes.h"	9 #include "unicode/utypes.h"

10 #include "unicode/stringpiece.h"	10 #include "unicode/stringpiece.h"

(...skipping 57 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
68 }	68 }

69	69

70	70

71 /* Microsft Visual Studios <= 8.0 complains about redefinition of this	71 /* Microsft Visual Studios <= 8.0 complains about redefinition of this

72 * static const class variable. However, the C++ standard states that this	72 * static const class variable. However, the C++ standard states that this

73 * definition is correct. Perhaps there is a bug in the Microsoft compiler.	73 * definition is correct. Perhaps there is a bug in the Microsoft compiler.

74 * This is not an issue on any other compilers (that we know of) including	74 * This is not an issue on any other compilers (that we know of) including

75 * Visual Studios 9.0.	75 * Visual Studios 9.0.

76 * Cygwin with MSVC 9.0 also complains here about redefinition.	76 * Cygwin with MSVC 9.0 also complains here about redefinition.

77 */	77 */

78 #if (!defined(_MSC_VER) \|\| (_MSC_VER > 1700)) && !defined(CYGWINMSVC)	78 #if (!defined(_MSC_VER) \|\| (_MSC_VER > 1800)) && !defined(CYGWINMSVC)

79 const int32_t StringPiece::npos;	79 const int32_t StringPiece::npos;

80 #endif	80 #endif

81	81

82 U_NAMESPACE_END	82 U_NAMESPACE_END

OLD	NEW