Skip to content

Commit 9685f36

Browse files
committed
ICU-23150 Deprecate C create/getMilligramPerDeciliter, J MILLIGRAM_PER_DECILITER
1 parent 3e26b1a commit 9685f36

File tree

3 files changed

+14
-10
lines changed

3 files changed

+14
-10
lines changed

icu4c/source/i18n/unicode/measunit.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1173,14 +1173,15 @@ class U_I18N_API MeasureUnit: public UObject {
11731173
*/
11741174
static MeasureUnit getMilligramOfglucosePerDeciliter();
11751175

1176+
#ifndef U_HIDE_DEPRECATED_API
11761177
/**
11771178
* Returns by pointer, unit of concentr: milligram-per-deciliter.
11781179
* (renamed to milligram-ofglucose-per-deciliter in CLDR 39 / ICU 69).
11791180
* Caller owns returned value and must free it.
11801181
* Also see {@link #createMilligramOfglucosePerDeciliter()}.
11811182
* Also see {@link #getMilligramPerDeciliter()}.
11821183
* @param status ICU error code.
1183-
* @stable ICU 57
1184+
* @deprecated ICU 78 use createMilligramOfglucosePerDeciliter(UErrorCode &status)
11841185
*/
11851186
static MeasureUnit *createMilligramPerDeciliter(UErrorCode &status);
11861187

@@ -1189,9 +1190,10 @@ class U_I18N_API MeasureUnit: public UObject {
11891190
* (renamed to milligram-ofglucose-per-deciliter in CLDR 39 / ICU 69).
11901191
* Also see {@link #getMilligramOfglucosePerDeciliter()}.
11911192
* Also see {@link #createMilligramPerDeciliter()}.
1192-
* @stable ICU 64
1193+
* @deprecated ICU 78 use getMilligramOfglucosePerDeciliter()
11931194
*/
11941195
static MeasureUnit getMilligramPerDeciliter();
1196+
#endif /* U_HIDE_DEPRECATED_API */
11951197

11961198
/**
11971199
* Returns by pointer, unit of concentr: millimole-per-liter.

icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/format/MeasureUnitGeneratorTest.java

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -480,14 +480,15 @@ private static void generateCXXHConstants(String thisVersion) throws IOException
480480

481481
// Add backward compatibility header for "milligram-per-deciliter"
482482
private static void addCXXHForMilligramPerDeciliter(PrintStream out) {
483+
out.println("#ifndef U_HIDE_DEPRECATED_API");
483484
out.println(" /**");
484485
out.println(" * Returns by pointer, unit of concentr: milligram-per-deciliter.");
485486
out.println(" * (renamed to milligram-ofglucose-per-deciliter in CLDR 39 / ICU 69).");
486487
out.println(" * Caller owns returned value and must free it.");
487488
out.println(" * Also see {@link #createMilligramOfglucosePerDeciliter()}.");
488489
out.println(" * Also see {@link #getMilligramPerDeciliter()}.");
489490
out.println(" * @param status ICU error code.");
490-
out.println(" * @stable ICU 57");
491+
out.println(" * @deprecated ICU 78 use createMilligramOfglucosePerDeciliter(UErrorCode &status)");
491492
out.println(" */");
492493
out.println(" static MeasureUnit *createMilligramPerDeciliter(UErrorCode &status);");
493494
out.println("");
@@ -496,9 +497,10 @@ private static void addCXXHForMilligramPerDeciliter(PrintStream out) {
496497
out.println(" * (renamed to milligram-ofglucose-per-deciliter in CLDR 39 / ICU 69).");
497498
out.println(" * Also see {@link #getMilligramOfglucosePerDeciliter()}.");
498499
out.println(" * Also see {@link #createMilligramPerDeciliter()}.");
499-
out.println(" * @stable ICU 64");
500+
out.println(" * @deprecated ICU 78 use getMilligramOfglucosePerDeciliter()");
500501
out.println(" */");
501502
out.println(" static MeasureUnit getMilligramPerDeciliter();");
503+
out.println("#endif /* U_HIDE_DEPRECATED_API */");
502504
out.println("");
503505
}
504506

@@ -966,8 +968,9 @@ private static void addJavaForMilligramPerDeciliter(PrintStream out, String type
966968
out.println(" /**");
967969
out.println(" * Constant for unit of concentr: milligram-per-deciliter");
968970
out.println(" * (renamed to milligram-ofglucose-per-deciliter in CLDR 39 / ICU 69).");
969-
out.println(" * @stable ICU 57");
971+
out.println(" * @deprecated ICU 78 use MILLIGRAM_OFGLUCOSE_PER_DECILITER");
970972
out.println(" */");
973+
out.println(" @Deprecated");
971974
out.println(" public static final MeasureUnit MILLIGRAM_PER_DECILITER = MeasureUnit.internalGetInstance(\"" +
972975
type + "\", \"" + code + "\");");
973976
out.println("");
@@ -990,8 +993,7 @@ private static void addJavaForMetricTon(PrintStream out, String type, String cod
990993
out.println(" /**");
991994
out.println(" * Constant for unit of mass: metric-ton");
992995
out.println(" * (renamed to tonne in CLDR 42 / ICU 72).");
993-
out.println(" * @internal");
994-
out.println(" * @deprecated This API is ICU internal only.");
996+
out.println(" * @deprecated ICU 78 use TONNE");
995997
out.println(" */");
996998
out.println(" @Deprecated");
997999
out.println(" public static final MeasureUnit METRIC_TON = MeasureUnit.internalGetInstance(\"" +

icu4j/main/core/src/main/java/com/ibm/icu/util/MeasureUnit.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1202,8 +1202,9 @@ protected synchronized static MeasureUnit addUnit(String type, String unitName,
12021202
/**
12031203
* Constant for unit of concentr: milligram-per-deciliter
12041204
* (renamed to milligram-ofglucose-per-deciliter in CLDR 39 / ICU 69).
1205-
* @stable ICU 57
1205+
* @deprecated ICU 78 use MILLIGRAM_OFGLUCOSE_PER_DECILITER
12061206
*/
1207+
@Deprecated
12071208
public static final MeasureUnit MILLIGRAM_PER_DECILITER = MeasureUnit.internalGetInstance("concentr", "milligram-ofglucose-per-deciliter");
12081209

12091210
/**
@@ -2026,8 +2027,7 @@ protected synchronized static MeasureUnit addUnit(String type, String unitName,
20262027
/**
20272028
* Constant for unit of mass: metric-ton
20282029
* (renamed to tonne in CLDR 42 / ICU 72).
2029-
* @internal
2030-
* @deprecated This API is ICU internal only.
2030+
* @deprecated ICU 78 use TONNE
20312031
*/
20322032
@Deprecated
20332033
public static final MeasureUnit METRIC_TON = MeasureUnit.internalGetInstance("mass", "tonne");

0 commit comments

Comments
 (0)