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

Side by Side Diff: source/i18n/unicode/tzfmt.h

Issue 1621843002: ICU 56 update step 1 (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/icu.git@561
Patch Set: Created 4 years, 11 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 | « source/i18n/unicode/timezone.h ('k') | source/i18n/unicode/tznames.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 /* 1 /*
2 ******************************************************************************* 2 *******************************************************************************
3 * Copyright (C) 2011-2014, International Business Machines Corporation and 3 * Copyright (C) 2011-2015, International Business Machines Corporation and
4 * others. All Rights Reserved. 4 * others. All Rights Reserved.
5 ******************************************************************************* 5 *******************************************************************************
6 */ 6 */
7 #ifndef __TZFMT_H 7 #ifndef __TZFMT_H
8 #define __TZFMT_H 8 #define __TZFMT_H
9 9
10 /** 10 /**
11 * \file 11 * \file
12 * \brief C++ API: TimeZoneFormat 12 * \brief C++ API: TimeZoneFormat
13 */ 13 */
(...skipping 212 matching lines...) Expand 10 before | Expand all | Expand 10 after
226 * No option. 226 * No option.
227 * @stable ICU 50 227 * @stable ICU 50
228 */ 228 */
229 UTZFMT_PARSE_OPTION_NONE = 0x00, 229 UTZFMT_PARSE_OPTION_NONE = 0x00,
230 /** 230 /**
231 * When a time zone display name is not found within a set of display names 231 * When a time zone display name is not found within a set of display names
232 * used for the specified style, look for the name from display names used 232 * used for the specified style, look for the name from display names used
233 * by other styles. 233 * by other styles.
234 * @stable ICU 50 234 * @stable ICU 50
235 */ 235 */
236 UTZFMT_PARSE_OPTION_ALL_STYLES = 0x01 236 UTZFMT_PARSE_OPTION_ALL_STYLES = 0x01,
237 #ifndef U_HIDE_DRAFT_API
238 ,
239 /** 237 /**
240 * When parsing a time zone display name in UTZFMT_STYLE_SPECIFIC_SHORT, 238 * When parsing a time zone display name in UTZFMT_STYLE_SPECIFIC_SHORT,
241 * look for the IANA tz database compatible zone abbreviations in addition 239 * look for the IANA tz database compatible zone abbreviations in addition
242 * to the localized names coming from the {@link TimeZoneNames} currently 240 * to the localized names coming from the {@link TimeZoneNames} currently
243 * used by the {@link TimeZoneFormat}. 241 * used by the {@link TimeZoneFormat}.
244 * @draft ICU 54 242 * @stable ICU 54
245 */ 243 */
246 UTZFMT_PARSE_OPTION_TZ_DATABASE_ABBREVIATIONS = 0x02 244 UTZFMT_PARSE_OPTION_TZ_DATABASE_ABBREVIATIONS = 0x02
247 #endif /* U_HIDE_DRAFT_API */
248 } UTimeZoneFormatParseOption; 245 } UTimeZoneFormatParseOption;
249 246
250 U_CDECL_END 247 U_CDECL_END
251 248
252 U_NAMESPACE_BEGIN 249 U_NAMESPACE_BEGIN
253 250
254 class TimeZoneGenericNames; 251 class TimeZoneGenericNames;
255 class TZDBTimeZoneNames; 252 class TZDBTimeZoneNames;
256 class UVector; 253 class UVector;
257 254
(...skipping 831 matching lines...) Expand 10 before | Expand all | Expand 10 after
1089 * @param tzID receives the time zone ID 1086 * @param tzID receives the time zone ID
1090 * @return a reference to tzID 1087 * @return a reference to tzID
1091 */ 1088 */
1092 UnicodeString& parseExemplarLocation(const UnicodeString& text, ParsePositio n& pos, UnicodeString& tzID) const; 1089 UnicodeString& parseExemplarLocation(const UnicodeString& text, ParsePositio n& pos, UnicodeString& tzID) const;
1093 }; 1090 };
1094 1091
1095 U_NAMESPACE_END 1092 U_NAMESPACE_END
1096 1093
1097 #endif /* !UCONFIG_NO_FORMATTING */ 1094 #endif /* !UCONFIG_NO_FORMATTING */
1098 #endif 1095 #endif
OLDNEW
« no previous file with comments | « source/i18n/unicode/timezone.h ('k') | source/i18n/unicode/tznames.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698