Wed Mar 26 16:15:39 2003 Simon McQueen <sm@prismtechnologies.com>

1 files changed, 14 insertions, 33 deletions

diff --git a/ace/Unbounded_Set.h b/ace/Unbounded_Set.h
index 6f35c1228d7..d4c882b6f5c 100644
--- a/ace/Unbounded_Set.h
+++ b/ace/Unbounded_Set.h
@@ -33,9 +33,6 @@ class ACE_Unbounded_Set_Iterator
 public:
   // = Initialization method.
   ACE_Unbounded_Set_Iterator (ACE_Unbounded_Set<T> &s, int end = 0);
-  ACE_Unbounded_Set_Iterator (const  ACE_Unbounded_Set_Iterator &o);
-  void operator= (const ACE_Unbounded_Set_Iterator &o);
-  ~ACE_Unbounded_Set_Iterator ();
 
   // = Iteration methods.
 
@@ -95,9 +92,6 @@ class ACE_Unbounded_Set_Const_Iterator
 public:
   // = Initialization method.
   ACE_Unbounded_Set_Const_Iterator (const ACE_Unbounded_Set<T> &s, int end = 0);
-  ACE_Unbounded_Set_Const_Iterator (const ACE_Unbounded_Set_Const_Iterator& o);
-  void operator= (const ACE_Unbounded_Set_Const_Iterator& o);
-  ~ACE_Unbounded_Set_Const_Iterator ();
 
   // = Iteration methods.
 
@@ -196,26 +190,26 @@ public:
   /// Constructor.  Use user specified allocation strategy
   /// if specified.
   /**
-   * Initialize an empty set using the allocation strategy of the user if
-   * provided.
+   * Initialize an empty set using the allocation strategy of the user if 
+   * provided. 
    */
   ACE_Unbounded_Set (ACE_Allocator *alloc = 0);
 
   /// Copy constructor.
   /**
-   * Initialize this set to be an exact copy of the set provided.
+   * Initialize this set to be an exact copy of the set provided. 
    */
   ACE_Unbounded_Set (const ACE_Unbounded_Set<T> &);
 
   /// Assignment operator.
   /**
-   * Perform a deep copy of the rhs into the lhs.
+   * Perform a deep copy of the rhs into the lhs. 
    */
   void operator= (const ACE_Unbounded_Set<T> &);
 
   /// Destructor.
   /**
-   * Destroy the nodes of the set.
+   * Destroy the nodes of the set. 
    */
   ~ACE_Unbounded_Set (void);
 
@@ -223,19 +217,19 @@ public:
 
   /// Returns 1 if the container is empty, otherwise returns 0.
   /**
-   * Constant time is_empty check.
+   * Constant time is_empty check. 
    */
   int is_empty (void) const;
 
   /// Returns 0.
-  /**
-   * Always returns 0 since the set can never fill up.
+  /** 
+   * Always returns 0 since the set can never fill up. 
    */
   int is_full (void) const;
 
   // = Classic unordered set operations.
 
-  ///Linear insertion of an item.
+  ///Linear insertion of an item. 
   /**
    * Insert <new_item> into the set (doesn't allow duplicates).
    * Returns -1 if failures occur, 1 if item is already present, else
@@ -246,11 +240,11 @@ public:
   /// Insert <item> at the tail of the set (doesn't check for
   /// duplicates).
   /**
-   * Constant time insert at the end of the set.
+   * Constant time insert at the end of the set. 
    */
   int insert_tail (const T &item);
 
-  ///Linear remove operation.
+  ///Linear remove operation. 
   /**
    * Remove first occurrence of <item> from the set.  Returns 0 if
    * it removes the item, -1 if it can't find the item, and -1 if a
@@ -261,13 +255,13 @@ public:
   /// Finds if <item> occurs in the set.  Returns 0 if find succeeds,
   /// else -1.
   /**
-   * Performs a linear find operation.
+   * Performs a linear find operation. 
    */
   int find (const T &item) const;
 
   /// Size of the set.
   /**
-   * Access the size of the set.
+   * Access the size of the set. 
    */
   size_t size (void) const;
 
@@ -276,7 +270,7 @@ public:
 
   /// Reset the <ACE_Unbounded_Set> to be empty.
   /**
-   * Delete the nodes of the set.
+   * Delete the nodes of the set. 
    */
   void reset (void);
 
@@ -284,13 +278,6 @@ public:
   ACE_Unbounded_Set_Iterator<T> begin (void);
   ACE_Unbounded_Set_Iterator<T> end (void);
 
-  /// An Iterator has to register itself here.
-  void iterator_add () const;
-  /// A non-const Iterator has to unregister itself here.
-  void iterator_leave ();
-  /// A Const_Iterator has to unregister itself here.
-  void const_iterator_leave () const;
-
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
 
@@ -301,9 +288,6 @@ private:
   /// Copy nodes into this set.
   void copy_nodes (const ACE_Unbounded_Set<T> &);
 
-  /// Really delete all nodes marked for deletion.
-  void cleanup ();
-
   /// Head of the linked list of Nodes.
   ACE_Node<T> *head_;
 
@@ -312,9 +296,6 @@ private:
 
   /// Allocation strategy of the set.
   ACE_Allocator *allocator_;
-
-  /// Number of iterators working on this set.
-  mutable int number_of_iterators_;
 };
 
 #if defined (__ACE_INLINE__)