From: Shane F. Carr <shane@unicode.org>
Date: Thu, 11 Apr 2019 02:09:52 +0000 (-0700)
Subject: ICU-20511 Merge branch 'master' into 64-merge-branch
X-Git-Tag: release-65-rc~171^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=refs%2Fpull%2F617%2Fhead;p=icu

ICU-20511 Merge branch 'master' into 64-merge-branch
---

a268e3a29947eddc07b4b0f1f07b3b5be81b0def
diff --cc icu4c/source/i18n/number_output.cpp
index 6f4e2482044,888a9f25463..8804916ace7
--- a/icu4c/source/i18n/number_output.cpp
+++ b/icu4c/source/i18n/number_output.cpp
@@@ -31,8 -29,8 +30,8 @@@ void FormattedNumber::getAllFieldPositi
  
  void FormattedNumber::getAllFieldPositionsImpl(FieldPositionIteratorHandler& fpih,
                                                 UErrorCode& status) const {
 -    UPRV_FORMATTED_VALUE_METHOD_GUARD()
 +    UPRV_FORMATTED_VALUE_METHOD_GUARD(UPRV_NOARG)
-     fData->getStringRef().getAllFieldPositions(fpih, status);
+     fData->getAllFieldPositions(fpih, status);
  }
  
  void FormattedNumber::getDecimalQuantity(impl::DecimalQuantity& output, UErrorCode& status) const {
diff --cc icu4c/source/i18n/numrange_fluent.cpp
index b284561cdc2,a788108ae63..654cafaf00b
--- a/icu4c/source/i18n/numrange_fluent.cpp
+++ b/icu4c/source/i18n/numrange_fluent.cpp
@@@ -392,8 -391,8 +392,8 @@@ void FormattedNumberRange::getAllFieldP
  
  void FormattedNumberRange::getAllFieldPositionsImpl(
          FieldPositionIteratorHandler& fpih, UErrorCode& status) const {
 -    UPRV_FORMATTED_VALUE_METHOD_GUARD()
 +    UPRV_FORMATTED_VALUE_METHOD_GUARD(UPRV_NOARG)
-     fData->getStringRef().getAllFieldPositions(fpih, status);
+     fData->getAllFieldPositions(fpih, status);
  }
  
  UnicodeString FormattedNumberRange::getFirstDecimal(UErrorCode& status) const {