ICU-59180.0.1.tar.gz

[apple/icu.git] / icuSources / i18n / unicode / tmunit.h

diff --git a/icuSources/i18n/unicode/tmunit.h b/icuSources/i18n/unicode/tmunit.h
index 6eda105c12f8920b14521e88b66da9e5a0546218..ce9fc652611658fae7a86ad136202254b7530c91 100644 (file)
--- a/icuSources/i18n/unicode/tmunit.h
+++ b/icuSources/i18n/unicode/tmunit.h
@@ -1,7 +1,9 @@
+// © 2016 and later: Unicode, Inc. and others.
+// License & terms of use: http://www.unicode.org/copyright.html
 /*
  *******************************************************************************
- * Copyright (C) 2009-2010, Google, International Business Machines Corporation and *
- * others. All Rights Reserved.                                                *
+ * Copyright (C) 2009-2016, International Business Machines Corporation,       *
+ * Google, and others. All Rights Reserved.                                    *
  *******************************************************************************
  */
 
@@ -19,6 +21,7 @@
 
 #if !UCONFIG_NO_FORMATTING
 
+#if U_SHOW_CPLUSPLUS_API
 U_NAMESPACE_BEGIN
 
 /**
@@ -41,18 +44,24 @@ public:
         UTIMEUNIT_HOUR,
         UTIMEUNIT_MINUTE,
         UTIMEUNIT_SECOND,
+#ifndef U_HIDE_DEPRECATED_API
+        /**
+         * One more than the highest normal UTimeUnitFields value.
+         * @deprecated ICU 58 The numeric value may change over time, see ICU ticket #12420.
+         */
         UTIMEUNIT_FIELD_COUNT
+#endif  // U_HIDE_DEPRECATED_API
     };
 
     /**
      * Create Instance.
-     * @param timeUnitField  time unit field based on which the instance 
+     * @param timeUnitField  time unit field based on which the instance
      *                       is created.
-     * @param status         input-output error code. 
+     * @param status         input-output error code.
      *                       If the timeUnitField is invalid,
      *                       then this will be set to U_ILLEGAL_ARGUMENT_ERROR.
      * @return               a TimeUnit instance
-     * @stable ICU 4.2 
+     * @stable ICU 4.2
      */
     static TimeUnit* U_EXPORT2 createInstance(UTimeUnitFields timeUnitField,
                                               UErrorCode& status);
@@ -60,43 +69,29 @@ public:
 
     /**
      * Override clone.
-     * @stable ICU 4.2 
+     * @stable ICU 4.2
      */
     virtual UObject* clone() const;
 
     /**
      * Copy operator.
-     * @stable ICU 4.2 
+     * @stable ICU 4.2
      */
     TimeUnit(const TimeUnit& other);
 
     /**
      * Assignment operator.
-     * @stable ICU 4.2 
+     * @stable ICU 4.2
      */
     TimeUnit& operator=(const TimeUnit& other);
 
-    /**
-     * Equality operator. 
-     * @return true if 2 objects are the same.
-     * @stable ICU 4.2 
-     */
-    virtual UBool operator==(const UObject& other) const;
-
-    /**
-     * Non-Equality operator. 
-     * @return true if 2 objects are not the same.
-     * @stable ICU 4.2 
-     */
-    UBool operator!=(const UObject& other) const;
-
     /**
      * Returns a unique class ID for this object POLYMORPHICALLY.
      * This method implements a simple form of RTTI used by ICU.
      * @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.
-     * @stable ICU 4.2 
+     * @stable ICU 4.2
      */
     virtual UClassID getDynamicClassID() const;
 
@@ -104,7 +99,7 @@ public:
      * Returns the class ID for this class. This is used to compare to
      * the return value of getDynamicClassID().
      * @return The class ID for all objects of this class.
-     * @stable ICU 4.2 
+     * @stable ICU 4.2
      */
     static UClassID U_EXPORT2 getStaticClassID();
 
@@ -112,13 +107,13 @@ public:
     /**
      * Get time unit field.
      * @return time unit field.
-     * @stable ICU 4.2 
+     * @stable ICU 4.2
      */
     UTimeUnitFields getTimeUnitField() const;
 
     /**
      * Destructor.
-     * @stable ICU 4.2 
+     * @stable ICU 4.2
      */
     virtual ~TimeUnit();
 
@@ -127,20 +122,15 @@ private:
 
     /**
      * Constructor
-     * @internal ICU 4.2 
+     * @internal (private)
      */
     TimeUnit(UTimeUnitFields timeUnitField);
 
 };
 
 
-inline UBool 
-TimeUnit::operator!=(const UObject& other) const {
-    return !operator==(other);
-}
-
-
 U_NAMESPACE_END
+#endif // U_SHOW_CPLUSPLUS_API
 
 #endif /* #if !UCONFIG_NO_FORMATTING */