ICU-11276 Replying to Andy review feedback.

diff --git a/icu4c/source/i18n/number_fluent.cpp b/icu4c/source/i18n/number_fluent.cpp
index 198c7caee0f0e0a6b41c9edc386d0b528d5b7bfe..e0e489a3573610d95716e009c641ea33cc8f8258 100644 (file)
--- a/icu4c/source/i18n/number_fluent.cpp
+++ b/icu4c/source/i18n/number_fluent.cpp
@@ -363,6 +363,7 @@ UnlocalizedNumberFormatter::UnlocalizedNumberFormatter(const NFS<UNF>& other)
     // No additional fields to assign
 }
 
+// Make default copy constructor call the NumberFormatterSettings copy constructor.
 UnlocalizedNumberFormatter::UnlocalizedNumberFormatter(UNF&& src) U_NOEXCEPT
         : UNF(static_cast<NFS<UNF>&&>(src)) {}
 
@@ -383,6 +384,7 @@ UnlocalizedNumberFormatter& UnlocalizedNumberFormatter::operator=(UNF&& src) U_N
     return *this;
 }
 
+// Make default copy constructor call the NumberFormatterSettings copy constructor.
 LocalizedNumberFormatter::LocalizedNumberFormatter(const LNF& other)
         : LNF(static_cast<const NFS<LNF>&>(other)) {}
 

diff --git a/icu4c/source/i18n/numrange_fluent.cpp b/icu4c/source/i18n/numrange_fluent.cpp
index ec00588502e729045ce503c393be7cc5392033ce..aee9518fe09a92ea462205ced8705340b2fa02f7 100644 (file)
--- a/icu4c/source/i18n/numrange_fluent.cpp
+++ b/icu4c/source/i18n/numrange_fluent.cpp
@@ -3,7 +3,7 @@
 
 #include "unicode/utypes.h"
 
-#if !UCONFIG_NO_FORMATTING && !UPRV_INCOMPLETE_CPP11_SUPPORT
+#if !UCONFIG_NO_FORMATTING
 
 // Allow implicit conversion from char16_t* to UnicodeString for this file:
 // Helpful in toString methods and elsewhere.
@@ -192,6 +192,7 @@ UnlocalizedNumberRangeFormatter::UnlocalizedNumberRangeFormatter(const NFS<UNF>&
     // No additional fields to assign
 }
 
+// Make default copy constructor call the NumberRangeFormatterSettings copy constructor.
 UnlocalizedNumberRangeFormatter::UnlocalizedNumberRangeFormatter(UNF&& src) U_NOEXCEPT
         : UNF(static_cast<NFS<UNF>&&>(src)) {}
 
@@ -212,6 +213,7 @@ UnlocalizedNumberRangeFormatter& UnlocalizedNumberRangeFormatter::operator=(UNF&
     return *this;
 }
 
+// Make default copy constructor call the NumberRangeFormatterSettings copy constructor.
 LocalizedNumberRangeFormatter::LocalizedNumberRangeFormatter(const LNF& other)
         : LNF(static_cast<const NFS<LNF>&>(other)) {}
 

diff --git a/icu4c/source/i18n/numrange_impl.cpp b/icu4c/source/i18n/numrange_impl.cpp
index 140effaaa64dd525b3927499d8f03daf5f623f37..b240c3140d6352e7653b71052d133f3c5ac0918c 100644 (file)
--- a/icu4c/source/i18n/numrange_impl.cpp
+++ b/icu4c/source/i18n/numrange_impl.cpp
@@ -3,7 +3,7 @@
 
 #include "unicode/utypes.h"
 
-#if !UCONFIG_NO_FORMATTING && !UPRV_INCOMPLETE_CPP11_SUPPORT
+#if !UCONFIG_NO_FORMATTING
 
 // Allow implicit conversion from char16_t* to UnicodeString for this file:
 // Helpful in toString methods and elsewhere.
@@ -181,6 +181,7 @@ NumberRangeFormatterImpl::NumberRangeFormatterImpl(const RangeMacroProps& macros
     // this part of the code should be updated to load from the local numbering system.
     // The numbering system could come from the one specified in the NumberFormatter passed to
     // numberFormatterBoth() or similar.
+    // See ICU-20144
 
     NumberRangeData data;
     getNumberRangeData(macros.locale.getName(), "latn", data, status);

diff --git a/icu4c/source/i18n/numrange_impl.h b/icu4c/source/i18n/numrange_impl.h
index c763f0c72c58d0b312cf68924e030a9ef74ea20a..787fc656860d53c5593d0092c6b465dc8ad9276a 100644 (file)
--- a/icu4c/source/i18n/numrange_impl.h
+++ b/icu4c/source/i18n/numrange_impl.h
@@ -20,13 +20,10 @@ namespace impl {
 
 
 /**
- * Implementation class for UFormattedNumber with magic number for safety.
+ * Class similar to UFormattedNumberData.
  *
- * This struct is also held internally by the C++ version FormattedNumber since the member types are not
- * declared in the public header file.
- *
- * The DecimalQuantity is not currently being used by FormattedNumber, but at some point it could be used
- * to add a toDecNumber() or similar method.
+ * Has incomplete magic number logic that will need to be finished
+ * if this is to be exposed as C API in the future.
  */
 struct UFormattedNumberRangeData : public UMemory {
     // The magic number to identify incoming objects.

diff --git a/icu4c/source/i18n/unicode/numberformatter.h b/icu4c/source/i18n/unicode/numberformatter.h
index b742e9104f1c2ccaff2c6120e26a6f2994f057d7..b75d8e6432f52d9cc15be66840f791c431e0cda3 100644 (file)
--- a/icu4c/source/i18n/unicode/numberformatter.h
+++ b/icu4c/source/i18n/unicode/numberformatter.h
@@ -2157,7 +2157,6 @@ class U_I18N_API UnlocalizedNumberFormatter
      */
     UnlocalizedNumberFormatter() = default;
 
-    // Make default copy constructor call the NumberFormatterSettings copy constructor.
     /**
      * Returns a copy of this UnlocalizedNumberFormatter.
      * @draft ICU 60
@@ -2296,7 +2295,6 @@ class U_I18N_API LocalizedNumberFormatter
      */
     LocalizedNumberFormatter() = default;
 
-    // Make default copy constructor call the NumberFormatterSettings copy constructor.
     /**
      * Returns a copy of this LocalizedNumberFormatter.
      * @draft ICU 60

diff --git a/icu4c/source/i18n/unicode/numberrangeformatter.h b/icu4c/source/i18n/unicode/numberrangeformatter.h
index 30a7c1e805082735cd1abf9663f55da363b12437..5b9f264f9bf1f46203a76cfd1543258eb4c53c21 100644 (file)
--- a/icu4c/source/i18n/unicode/numberrangeformatter.h
+++ b/icu4c/source/i18n/unicode/numberrangeformatter.h
@@ -493,7 +493,6 @@ class U_I18N_API UnlocalizedNumberRangeFormatter
      */
     UnlocalizedNumberRangeFormatter() = default;
 
-    // Make default copy constructor call the NumberFormatterSettings copy constructor.
     /**
      * Returns a copy of this UnlocalizedNumberRangeFormatter.
      * @draft ICU 63
@@ -566,7 +565,6 @@ class U_I18N_API LocalizedNumberRangeFormatter
      */
     LocalizedNumberRangeFormatter() = default;
 
-    // Make default copy constructor call the NumberRangeFormatterSettings copy constructor.
     /**
      * Returns a copy of this LocalizedNumberRangeFormatter.
      * @draft ICU 63

diff --git a/icu4j/main/classes/core/src/com/ibm/icu/number/NumberRangeFormatterImpl.java b/icu4j/main/classes/core/src/com/ibm/icu/number/NumberRangeFormatterImpl.java
index 1a43f85f36e1a5aa03d9dc66d32051632570ad6a..cdccb5e6df6c7475fe83b4678bdf93b27f6d99ec 100644 (file)
--- a/icu4j/main/classes/core/src/com/ibm/icu/number/NumberRangeFormatterImpl.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/number/NumberRangeFormatterImpl.java
@@ -120,6 +120,7 @@ class NumberRangeFormatterImpl {
         // this part of the code should be updated to load from the local numbering system.
         // The numbering system could come from the one specified in the NumberFormatter passed to
         // numberFormatterBoth() or similar.
+        // See ICU-20144
 
         getNumberRangeData(macros.loc, "latn", this);