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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: source/i18n/unicode/measunit.h

Issue 2440913002: Update ICU to 58.1
Patch Set: Created 4 years, 2 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « source/i18n/unicode/measfmt.h ('k') | source/i18n/unicode/measure.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: source/i18n/unicode/measunit.h
diff --git a/source/i18n/unicode/measunit.h b/source/i18n/unicode/measunit.h
index dc7c9703d03b511b14e91dea336ec7807ede05e8..afef83ed0e96c54605ad974ed20807b86282e7f7 100644
--- a/source/i18n/unicode/measunit.h
+++ b/source/i18n/unicode/measunit.h
@@ -1,6 +1,8 @@
+// Copyright (C) 2016 and later: Unicode, Inc. and others.
+// License & terms of use: http://www.unicode.org/copyright.html
/*
**********************************************************************
-* Copyright (c) 2004-2015, International Business Machines
+* Copyright (c) 2004-2016, International Business Machines
* Corporation and others. All Rights Reserved.
**********************************************************************
* Author: Alan Liu
@@ -255,15 +257,13 @@ class U_I18N_API MeasureUnit: public UObject {
*/
static MeasureUnit *createRadian(UErrorCode &status);
-#ifndef U_HIDE_DRAFT_API
/**
* Returns unit of angle: revolution.
* Caller owns returned value and must free it.
* @param status ICU error code.
- * @draft ICU 56
+ * @stable ICU 56
*/
static MeasureUnit *createRevolutionAngle(UErrorCode &status);
-#endif /* U_HIDE_DRAFT_API */
/**
* Returns unit of area: acre.
@@ -337,15 +337,51 @@ class U_I18N_API MeasureUnit: public UObject {
*/
static MeasureUnit *createSquareYard(UErrorCode &status);
+ /**
+ * Returns unit of concentr: karat.
+ * Caller owns returned value and must free it.
+ * @param status ICU error code.
+ * @stable ICU 54
+ */
+ static MeasureUnit *createKarat(UErrorCode &status);
+
+#ifndef U_HIDE_DRAFT_API
+ /**
+ * Returns unit of concentr: milligram-per-deciliter.
+ * Caller owns returned value and must free it.
+ * @param status ICU error code.
+ * @draft ICU 57
+ */
+ static MeasureUnit *createMilligramPerDeciliter(UErrorCode &status);
+#endif /* U_HIDE_DRAFT_API */
+
+#ifndef U_HIDE_DRAFT_API
+ /**
+ * Returns unit of concentr: millimole-per-liter.
+ * Caller owns returned value and must free it.
+ * @param status ICU error code.
+ * @draft ICU 57
+ */
+ static MeasureUnit *createMillimolePerLiter(UErrorCode &status);
+#endif /* U_HIDE_DRAFT_API */
+
#ifndef U_HIDE_DRAFT_API
/**
+ * Returns unit of concentr: part-per-million.
+ * Caller owns returned value and must free it.
+ * @param status ICU error code.
+ * @draft ICU 57
+ */
+ static MeasureUnit *createPartPerMillion(UErrorCode &status);
+#endif /* U_HIDE_DRAFT_API */
+
+ /**
* Returns unit of consumption: liter-per-100kilometers.
* Caller owns returned value and must free it.
* @param status ICU error code.
- * @draft ICU 56
+ * @stable ICU 56
*/
static MeasureUnit *createLiterPer100Kilometers(UErrorCode &status);
-#endif /* U_HIDE_DRAFT_API */
/**
* Returns unit of consumption: liter-per-kilometer.
@@ -363,6 +399,56 @@ class U_I18N_API MeasureUnit: public UObject {
*/
static MeasureUnit *createMilePerGallon(UErrorCode &status);
+#ifndef U_HIDE_DRAFT_API
+ /**
+ * Returns unit of consumption: mile-per-gallon-imperial.
+ * Caller owns returned value and must free it.
+ * @param status ICU error code.
+ * @draft ICU 57
+ */
+ static MeasureUnit *createMilePerGallonImperial(UErrorCode &status);
+#endif /* U_HIDE_DRAFT_API */
+
+#ifndef U_HIDE_DRAFT_API
+ /**
+ * Returns unit of coordinate: east.
+ * Caller owns returned value and must free it.
+ * @param status ICU error code.
+ * @draft ICU 58
+ */
+ static MeasureUnit *createEast(UErrorCode &status);
+#endif /* U_HIDE_DRAFT_API */
+
+#ifndef U_HIDE_DRAFT_API
+ /**
+ * Returns unit of coordinate: north.
+ * Caller owns returned value and must free it.
+ * @param status ICU error code.
+ * @draft ICU 58
+ */
+ static MeasureUnit *createNorth(UErrorCode &status);
+#endif /* U_HIDE_DRAFT_API */
+
+#ifndef U_HIDE_DRAFT_API
+ /**
+ * Returns unit of coordinate: south.
+ * Caller owns returned value and must free it.
+ * @param status ICU error code.
+ * @draft ICU 58
+ */
+ static MeasureUnit *createSouth(UErrorCode &status);
+#endif /* U_HIDE_DRAFT_API */
+
+#ifndef U_HIDE_DRAFT_API
+ /**
+ * Returns unit of coordinate: west.
+ * Caller owns returned value and must free it.
+ * @param status ICU error code.
+ * @draft ICU 58
+ */
+ static MeasureUnit *createWest(UErrorCode &status);
+#endif /* U_HIDE_DRAFT_API */
+
/**
* Returns unit of digital: bit.
* Caller owns returned value and must free it.
@@ -443,15 +529,13 @@ class U_I18N_API MeasureUnit: public UObject {
*/
static MeasureUnit *createTerabyte(UErrorCode &status);
-#ifndef U_HIDE_DRAFT_API
/**
* Returns unit of duration: century.
* Caller owns returned value and must free it.
* @param status ICU error code.
- * @draft ICU 56
+ * @stable ICU 56
*/
static MeasureUnit *createCentury(UErrorCode &status);
-#endif /* U_HIDE_DRAFT_API */
/**
* Returns unit of duration: day.
@@ -741,15 +825,13 @@ class U_I18N_API MeasureUnit: public UObject {
*/
static MeasureUnit *createMile(UErrorCode &status);
-#ifndef U_HIDE_DRAFT_API
/**
* Returns unit of length: mile-scandinavian.
* Caller owns returned value and must free it.
* @param status ICU error code.
- * @draft ICU 56
+ * @stable ICU 56
*/
static MeasureUnit *createMileScandinavian(UErrorCode &status);
-#endif /* U_HIDE_DRAFT_API */
/**
* Returns unit of length: millimeter.
@@ -984,14 +1066,6 @@ class U_I18N_API MeasureUnit: public UObject {
static MeasureUnit *createPoundPerSquareInch(UErrorCode &status);
/**
- * Returns unit of proportion: karat.
- * Caller owns returned value and must free it.
- * @param status ICU error code.
- * @stable ICU 54
- */
- static MeasureUnit *createKarat(UErrorCode &status);
-
- /**
* Returns unit of speed: kilometer-per-hour.
* Caller owns returned value and must free it.
* @param status ICU error code.
@@ -999,15 +1073,13 @@ class U_I18N_API MeasureUnit: public UObject {
*/
static MeasureUnit *createKilometerPerHour(UErrorCode &status);
-#ifndef U_HIDE_DRAFT_API
/**
* Returns unit of speed: knot.
* Caller owns returned value and must free it.
* @param status ICU error code.
- * @draft ICU 56
+ * @stable ICU 56
*/
static MeasureUnit *createKnot(UErrorCode &status);
-#endif /* U_HIDE_DRAFT_API */
/**
* Returns unit of speed: meter-per-second.
@@ -1041,15 +1113,13 @@ class U_I18N_API MeasureUnit: public UObject {
*/
static MeasureUnit *createFahrenheit(UErrorCode &status);
-#ifndef U_HIDE_DRAFT_API
/**
* Returns unit of temperature: generic.
* Caller owns returned value and must free it.
* @param status ICU error code.
- * @draft ICU 56
+ * @stable ICU 56
*/
static MeasureUnit *createGenericTemperature(UErrorCode &status);
-#endif /* U_HIDE_DRAFT_API */
/**
* Returns unit of temperature: kelvin.
@@ -1147,15 +1217,13 @@ class U_I18N_API MeasureUnit: public UObject {
*/
static MeasureUnit *createCup(UErrorCode &status);
-#ifndef U_HIDE_DRAFT_API
/**
* Returns unit of volume: cup-metric.
* Caller owns returned value and must free it.
* @param status ICU error code.
- * @draft ICU 56
+ * @stable ICU 56
*/
static MeasureUnit *createCupMetric(UErrorCode &status);
-#endif /* U_HIDE_DRAFT_API */
/**
* Returns unit of volume: deciliter.
@@ -1181,6 +1249,16 @@ class U_I18N_API MeasureUnit: public UObject {
*/
static MeasureUnit *createGallon(UErrorCode &status);
+#ifndef U_HIDE_DRAFT_API
+ /**
+ * Returns unit of volume: gallon-imperial.
+ * Caller owns returned value and must free it.
+ * @param status ICU error code.
+ * @draft ICU 57
+ */
+ static MeasureUnit *createGallonImperial(UErrorCode &status);
+#endif /* U_HIDE_DRAFT_API */
+
/**
* Returns unit of volume: hectoliter.
* Caller owns returned value and must free it.
@@ -1221,15 +1299,13 @@ class U_I18N_API MeasureUnit: public UObject {
*/
static MeasureUnit *createPint(UErrorCode &status);
-#ifndef U_HIDE_DRAFT_API
/**
* Returns unit of volume: pint-metric.
* Caller owns returned value and must free it.
* @param status ICU error code.
- * @draft ICU 56
+ * @stable ICU 56
*/
static MeasureUnit *createPintMetric(UErrorCode &status);
-#endif /* U_HIDE_DRAFT_API */
/**
* Returns unit of volume: quart.
« no previous file with comments | « source/i18n/unicode/measfmt.h ('k') | source/i18n/unicode/measure.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698