ICU-511.35.tar.gz

[apple/icu.git] / icuSources / i18n / currfmt.h

diff --git a/icuSources/i18n/currfmt.h b/icuSources/i18n/currfmt.h
index 659b1ad73825cdfb2e00f3e496aaa651b14605bb..82aae3ec05040ff95d64b65e9730c4bdef7d967c 100644 (file)
--- a/icuSources/i18n/currfmt.h
+++ b/icuSources/i18n/currfmt.h
@@ -1,6 +1,6 @@
 /*
 **********************************************************************
 /*
 **********************************************************************

-* Copyright (c) 2004, International Business Machines
+* Copyright (c) 2004-2010, International Business Machines

 * Corporation and others.  All Rights Reserved.
 **********************************************************************
 * Author: Alan Liu
 * Corporation and others.  All Rights Reserved.
 **********************************************************************
 * Author: Alan Liu


@@ -33,7 +33,7 @@ class NumberFormat;
  * @author Alan Liu
  * @internal
  */
  * @author Alan Liu
  * @internal
  */

-class U_I18N_API CurrencyFormat : public MeasureFormat {
+class CurrencyFormat : public MeasureFormat {

 
  public:
 
 
  public:
 


@@ -62,6 +62,9 @@ class U_I18N_API CurrencyFormat : public MeasureFormat {
      */
     virtual Format* clone() const;
 
      */
     virtual Format* clone() const;
 

+
+    using MeasureFormat::format;
+

     /**
      * Override Format API.
      */
     /**
      * Override Format API.
      */


@@ -70,13 +73,6 @@ class U_I18N_API CurrencyFormat : public MeasureFormat {
                                   FieldPosition& pos,
                                   UErrorCode& ec) const;
 
                                   FieldPosition& pos,
                                   UErrorCode& ec) const;
 

-    /**
-     * Redeclare Format API to prevent hiding.
-     */
-    UnicodeString& format(const Formattable& obj,
-                          UnicodeString& appendTo,
-                          UErrorCode& ec) const;
-

     /**
      * Override Format API.
      */
     /**
      * Override Format API.
      */


@@ -84,13 +80,6 @@ class U_I18N_API CurrencyFormat : public MeasureFormat {
                              Formattable& result,
                              ParsePosition& pos) const;
 
                              Formattable& result,
                              ParsePosition& pos) const;
 

-    /**
-     * Redeclare Format API to prevent hiding.
-     */
-    void parseObject(const UnicodeString& source,
-                     Formattable& result,
-                     UErrorCode& ec) const;
-

     /**
      * Override Format API.
      */
     /**
      * Override Format API.
      */