ICU-64260.0.1.tar.gz

[apple/icu.git] / icuSources / common / uvector.h

diff --git a/icuSources/common/uvector.h b/icuSources/common/uvector.h
index 29cda39f8f2f43acc4fd3f9f39122760b97f32d6..98318d14c60063dcb0279897f80441f7f20d365b 100644 (file)
--- a/icuSources/common/uvector.h
+++ b/icuSources/common/uvector.h
@@ -1,6 +1,8 @@
+// © 2016 and later: Unicode, Inc. and others.
+// License & terms of use: http://www.unicode.org/copyright.html

 /*
 **********************************************************************
 /*
 **********************************************************************

-*   Copyright (C) 1999-2013, International Business Machines
+*   Copyright (C) 1999-2016, International Business Machines

 *   Corporation and others.  All Rights Reserved.
 **********************************************************************
 *   Date        Name        Description
 *   Corporation and others.  All Rights Reserved.
 **********************************************************************
 *   Date        Name        Description


@@ -59,7 +61,7 @@ U_NAMESPACE_BEGIN
  *
  * <p>In order to implement methods such as contains() and indexOf(),
  * UVector needs a way to compare objects for equality.  To do so, it
  *
  * <p>In order to implement methods such as contains() and indexOf(),
  * UVector needs a way to compare objects for equality.  To do so, it

- * uses a comparison frunction, or "comparer."  If the comparer is not
+ * uses a comparison function, or "comparer."  If the comparer is not

  * set, or is set to zero, then all such methods will act as if the
  * vector contains no element.  That is, indexOf() will always return
  * -1, contains() will always return FALSE, etc.
  * set, or is set to zero, then all such methods will act as if the
  * vector contains no element.  That is, indexOf() will always return
  * -1, contains() will always return FALSE, etc.


@@ -140,19 +142,19 @@ public:
 
     UBool equals(const UVector &other) const;
 
 
     UBool equals(const UVector &other) const;
 

-    void* firstElement(void) const;
+    inline void* firstElement(void) const;

 
 

-    void* lastElement(void) const;
+    inline void* lastElement(void) const;

 
 

-    int32_t lastElementi(void) const;
+    inline int32_t lastElementi(void) const;

 
     int32_t indexOf(void* obj, int32_t startIndex = 0) const;
 
     int32_t indexOf(int32_t obj, int32_t startIndex = 0) const;
 
 
     int32_t indexOf(void* obj, int32_t startIndex = 0) const;
 
     int32_t indexOf(int32_t obj, int32_t startIndex = 0) const;
 

-    UBool contains(void* obj) const;
+    inline UBool contains(void* obj) const;

 
 

-    UBool contains(int32_t obj) const;
+    inline UBool contains(int32_t obj) const;

 
     UBool containsAll(const UVector& other) const;
 
 
     UBool containsAll(const UVector& other) const;
 


@@ -166,9 +168,9 @@ public:
 
     void removeAllElements();
 
 
     void removeAllElements();
 

-    int32_t size(void) const;
+    inline int32_t size(void) const;

 
 

-    UBool isEmpty(void) const;
+    inline UBool isEmpty(void) const;

 
     UBool ensureCapacity(int32_t minimumCapacity, UErrorCode &status);
 
 
     UBool ensureCapacity(int32_t minimumCapacity, UErrorCode &status);
 


@@ -193,7 +195,7 @@ public:
 
     UElementsAreEqual *setComparer(UElementsAreEqual *c);
 
 
     UElementsAreEqual *setComparer(UElementsAreEqual *c);
 

-    void* operator[](int32_t index) const;
+    inline void* operator[](int32_t index) const;

 
     /**
      * Removes the element at the given index from this vector and
 
     /**
      * Removes the element at the given index from this vector and


@@ -307,19 +309,19 @@ public:
     // It's okay not to have a virtual destructor (in UVector)
     // because UStack has no special cleanup to do.
 
     // It's okay not to have a virtual destructor (in UVector)
     // because UStack has no special cleanup to do.
 

-    UBool empty(void) const;
+    inline UBool empty(void) const;

 
 

-    void* peek(void) const;
+    inline void* peek(void) const;

 
 

-    int32_t peeki(void) const;
+    inline int32_t peeki(void) const;

     
     void* pop(void);
     
     int32_t popi(void);
     
     
     void* pop(void);
     
     int32_t popi(void);
     

-    void* push(void* obj, UErrorCode &status);
+    inline void* push(void* obj, UErrorCode &status);

 
 

-    int32_t push(int32_t i, UErrorCode &status);
+    inline int32_t push(int32_t i, UErrorCode &status);

 
     /*
     If the object o occurs as an item in this stack,
 
     /*
     If the object o occurs as an item in this stack,