ICU 56 update step 1

source/i18n/winnmfmt.h

 /*
 ********************************************************************************
-*   Copyright (C) 2005-2014, International Business Machines
+*   Copyright (C) 2005-2015, International Business Machines
 *   Corporation and others.  All Rights Reserved.
 ********************************************************************************
 *
 * File WINNMFMT.H
 *
 ********************************************************************************
 */
 
 #ifndef __WINNMFMT
 #define __WINNMFMT
@@ skipping 68 matching lines @@
      * @param appendTo  Output parameter to receive result.
      *                  Result is appended to existing contents.
      * @param pos       On input: an alignment field, if desired.
      *                  On output: the offsets of the alignment field.
      * @return          Reference to 'appendTo' parameter.
     */
     virtual UnicodeString& format(int64_t number,
                                   UnicodeString& appendTo,
                                   FieldPosition& pos) const;
 
+    using NumberFormat::format;
+
 // Use the default behavior for the following.
 //    virtual UnicodeString &format(double number, UnicodeString &appendTo) const;
 //    virtual UnicodeString &format(int32_t number, UnicodeString &appendTo) const;
 //    virtual UnicodeString &format(int64_t number, UnicodeString &appendTo) const;
 
     virtual void parse(const UnicodeString& text, Formattable& result, ParsePosition& parsePosition) const;
 
     /**
      * Sets the maximum number of digits allowed in the fraction portion of a
      * number. maximumFractionDigits must be >= minimumFractionDigits.  If the
@@ skipping 34 matching lines @@
      * compilers support genuine RTTI. Polymorphic operator==() and clone()
      * methods call this method.
      *
      * @return          The class ID for this object. All objects of a
      *                  given class have the same class ID.  Objects of
      *                  other classes have different class IDs.
      */
     virtual UClassID getDynamicClassID(void) const;
 
 private:
-    UnicodeString &variadicFormat(int32_t numDigits, UnicodeString &appendTo, const wchar_t *format, ...) const;
+    UnicodeString &format(int32_t numDigits, UnicodeString &appendTo, const wchar_t *format, ...) const;
 
     UBool fCurrency;
     Locale fLocale;
     int32_t fLCID;
     FormatInfo *fFormatInfo;
     UBool fFractionDigitsSet;
 
 };
 
 U_NAMESPACE_END
 
 #endif /* #if !UCONFIG_NO_FORMATTING */
 
 #endif // U_PLATFORM_USES_ONLY_WIN32_API
 
 #endif // __WINNMFMT