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

Side by Side Diff: patches/vscomp.patch

Issue 1664293002: Add back UTF-32 for now and fix a MSVC build issue (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/icu.git@master
Patch Set: Created 4 years, 10 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
« no previous file with comments | « patches/utf32.patch ('k') | source/common/sharedobject.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 diff --git a/source/common/locmap.c b/source/common/locmap.c 1 diff --git a/source/common/locmap.c b/source/common/locmap.c
2 index c746ce3..224a2b1 100644 2 index c746ce3..224a2b1 100644
3 --- a/source/common/locmap.c 3 --- a/source/common/locmap.c
4 +++ b/source/common/locmap.c 4 +++ b/source/common/locmap.c
5 @@ -29,6 +29,7 @@ 5 @@ -29,6 +29,7 @@
6 #include "cstring.h" 6 #include "cstring.h"
7 #include "cmemory.h" 7 #include "cmemory.h"
8 8
9 +#if 0 9 +#if 0
10 #if U_PLATFORM == U_PF_WINDOWS && defined(_MSC_VER) && (_MSC_VER >= 1500) 10 #if U_PLATFORM == U_PF_WINDOWS && defined(_MSC_VER) && (_MSC_VER >= 1500)
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 +++ b/source/i18n/dtfmtsym.cpp 43 +++ b/source/i18n/dtfmtsym.cpp
44 @@ -169,7 +169,7 @@ SharedDateFormatSymbols::~SharedDateFormatSymbols() { 44 @@ -169,7 +169,7 @@ SharedDateFormatSymbols::~SharedDateFormatSymbols() {
45 template<> U_I18N_API 45 template<> U_I18N_API
46 const SharedDateFormatSymbols * 46 const SharedDateFormatSymbols *
47 LocaleCacheKey<SharedDateFormatSymbols>::createObject( 47 LocaleCacheKey<SharedDateFormatSymbols>::createObject(
48 - const void */*unusedContext*/, UErrorCode &status) const { 48 - const void */*unusedContext*/, UErrorCode &status) const {
49 + const void * /*unusedContext*/, UErrorCode &status) const { 49 + const void * /*unusedContext*/, UErrorCode &status) const {
50 char type[256]; 50 char type[256];
51 Calendar::getCalendarTypeFromLocale(fLoc, type, UPRV_LENGTHOF(type), status ); 51 Calendar::getCalendarTypeFromLocale(fLoc, type, UPRV_LENGTHOF(type), status );
52 if (U_FAILURE(status)) { 52 if (U_FAILURE(status)) {
53 diff --git a/source/common/sharedobject.h b/source/common/sharedobject.h
54 index 4402869..e5062cc 100644
55 --- a/source/common/sharedobject.h
56 +++ b/source/common/sharedobject.h
57 @@ -21,7 +21,7 @@ U_NAMESPACE_BEGIN
58 * update cache metrics. No other part of ICU, except for SharedObject,
59 * should directly call the methods of this base class.
60 */
61 -class UnifiedCacheBase : public UObject {
62 +class U_COMMON_API UnifiedCacheBase : public UObject {
63 public:
64 UnifiedCacheBase() { }
65
OLDNEW
« no previous file with comments | « patches/utf32.patch ('k') | source/common/sharedobject.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698