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

Side by Side Diff: icu52/patches/vscomp.patch

Issue 224943002: icu local change part1 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/
Patch Set: function indentation changed Created 6 years, 8 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 | « icu52/patches/vs2012.patch ('k') | icu52/patches/wpo.patch » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 Index: source/common/normalizer2impl.h
2 ===================================================================
3 --- source/common/normalizer2impl.h (revision 73520)
4 +++ source/common/normalizer2impl.h (working copy)
5 @@ -31,7 +31,7 @@
6
7 U_NAMESPACE_BEGIN
8
9 -class CanonIterData;
10 +struct CanonIterData;
11
12 class Hangul {
13 public:
14 Index: source/common/locmap.c 1 Index: source/common/locmap.c
15 =================================================================== 2 ===================================================================
16 --- source/common/locmap.c» (revision 73520) 3 --- source/common/locmap.c» (revision 259715)
17 +++ source/common/locmap.c (working copy) 4 +++ source/common/locmap.c (working copy)
18 @@ -30,9 +30,11 @@ 5 @@ -29,6 +29,7 @@
19 #include "cstring.h" 6 #include "cstring.h"
20 #include "cmemory.h" 7 #include "cmemory.h"
21 8
22 +#if 0 9 +#if 0
23 #if defined(U_WINDOWS) && defined(_MSC_VER) && (_MSC_VER >= 1500) 10 #if U_PLATFORM == U_PF_WINDOWS && defined(_MSC_VER) && (_MSC_VER >= 1500)
11 /*
12 * TODO: It seems like we should widen this to
13 @@ -40,6 +41,7 @@
14 */
24 #define USE_WINDOWS_LOCALE_API 15 #define USE_WINDOWS_LOCALE_API
25 #endif 16 #endif
26 +#endif 17 +#endif
27 18
28 #ifdef USE_WINDOWS_LOCALE_API 19 #ifdef USE_WINDOWS_LOCALE_API
29 #include <windows.h> 20 #include <windows.h>
30 Index: source/common/putil.c 21 Index: source/common/stringpiece.cpp
31 =================================================================== 22 ===================================================================
32 --- source/common/putil.c» (revision 73520) 23 --- source/common/stringpiece.cpp» (revision 259715)
33 +++ source/common/putil.c» (working copy) 24 +++ source/common/stringpiece.cpp» (working copy)
34 @@ -2159,7 +2159,7 @@ 25 @@ -68,6 +68,14 @@
35 26 }
36 if(U_FAILURE(*status)) return NULL;
37
38 - lib = LoadLibrary(libName);
39 + lib = LoadLibraryA(libName);
40
41 if(lib==NULL) {
42 *status = U_MISSING_RESOURCE_ERROR;
43 Index: source/i18n/zstrfmt.h
44 ===================================================================
45 --- source/i18n/zstrfmt.h» (revision 73520)
46 +++ source/i18n/zstrfmt.h» (working copy)
47 @@ -80,7 +80,7 @@
48 * ZSFStringPool Pool of (UChar *) strings. Provides for sharing of repeated
49 * strings within ZoneStringFormats.
50 */
51 -class ZSFStringPoolChunk;
52 +struct ZSFStringPoolChunk;
53 class ZSFStringPool: public UMemory {
54 public:
55 ZSFStringPool(UErrorCode &status);
56 Index: source/i18n/fmtable.cpp
57 ===================================================================
58 --- source/i18n/fmtable.cpp» (revision 73520)
59 +++ source/i18n/fmtable.cpp» (working copy)
60 @@ -199,6 +199,9 @@
61 // -------------------------------------
62 // copy constructor
63 27
64 +#ifdef U_WINODWS 28
65 +#pragram warning(disable: 4996) 29 +/* Microsoft Visual Studio (even 2013) complains about redefinition of this
30 + * static const class variable. However, the C++ standard states that this
31 + * definition is correct. Perhaps there is a bug in the Microsoft compiler.
32 + * This is not an issue on any other compilers (that we know of).
33 + * Cygwin with MSVC 9.0 also complains here about redefinition.
34 + */
35 +#if (!defined(_MSC_VER) || (_MSC_VER > 1800)) && !defined(CYGWINMSVC)
36 const int32_t StringPiece::npos = 0x7fffffff;
66 +#endif 37 +#endif
67 38
68 Formattable::Formattable(const Formattable &source) 39 U_NAMESPACE_END
69 : UObject(*this)
OLDNEW
« no previous file with comments | « icu52/patches/vs2012.patch ('k') | icu52/patches/wpo.patch » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698