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

Side by Side Diff: source/i18n/dtfmtsym.cpp

Issue 1646623006: Fix compilation errors on Android and Windows (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/vscomp.patch ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 ******************************************************************************* 2 *******************************************************************************
3 * Copyright (C) 1997-2015, International Business Machines Corporation and * 3 * Copyright (C) 1997-2015, International Business Machines Corporation and *
4 * others. All Rights Reserved. * 4 * others. All Rights Reserved. *
5 ******************************************************************************* 5 *******************************************************************************
6 * 6 *
7 * File DTFMTSYM.CPP 7 * File DTFMTSYM.CPP
8 * 8 *
9 * Modification History: 9 * Modification History:
10 * 10 *
(...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after
162 } LastResortSize; 162 } LastResortSize;
163 163
164 U_NAMESPACE_BEGIN 164 U_NAMESPACE_BEGIN
165 165
166 SharedDateFormatSymbols::~SharedDateFormatSymbols() { 166 SharedDateFormatSymbols::~SharedDateFormatSymbols() {
167 } 167 }
168 168
169 template<> U_I18N_API 169 template<> U_I18N_API
170 const SharedDateFormatSymbols * 170 const SharedDateFormatSymbols *
171 LocaleCacheKey<SharedDateFormatSymbols>::createObject( 171 LocaleCacheKey<SharedDateFormatSymbols>::createObject(
172 const void */*unusedContext*/, UErrorCode &status) const { 172 const void * /*unusedContext*/, UErrorCode &status) const {
173 char type[256]; 173 char type[256];
174 Calendar::getCalendarTypeFromLocale(fLoc, type, UPRV_LENGTHOF(type), status) ; 174 Calendar::getCalendarTypeFromLocale(fLoc, type, UPRV_LENGTHOF(type), status) ;
175 if (U_FAILURE(status)) { 175 if (U_FAILURE(status)) {
176 return NULL; 176 return NULL;
177 } 177 }
178 SharedDateFormatSymbols *shared 178 SharedDateFormatSymbols *shared
179 = new SharedDateFormatSymbols(fLoc, type, status); 179 = new SharedDateFormatSymbols(fLoc, type, status);
180 if (shared == NULL) { 180 if (shared == NULL) {
181 status = U_MEMORY_ALLOCATION_ERROR; 181 status = U_MEMORY_ALLOCATION_ERROR;
182 return NULL; 182 return NULL;
(...skipping 1814 matching lines...) Expand 10 before | Expand all | Expand 10 after
1997 DateFormatSymbols::getLocale(ULocDataLocaleType type, UErrorCode& status) const { 1997 DateFormatSymbols::getLocale(ULocDataLocaleType type, UErrorCode& status) const {
1998 U_LOCALE_BASED(locBased, *this); 1998 U_LOCALE_BASED(locBased, *this);
1999 return locBased.getLocale(type, status); 1999 return locBased.getLocale(type, status);
2000 } 2000 }
2001 2001
2002 U_NAMESPACE_END 2002 U_NAMESPACE_END
2003 2003
2004 #endif /* #if !UCONFIG_NO_FORMATTING */ 2004 #endif /* #if !UCONFIG_NO_FORMATTING */
2005 2005
2006 //eof 2006 //eof
OLDNEW
« no previous file with comments | « patches/vscomp.patch ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698