diff options
Diffstat (limited to 'omegalib/omega/include/basic/Bag.h')
-rw-r--r-- | omegalib/omega/include/basic/Bag.h | 29 |
1 files changed, 18 insertions, 11 deletions
diff --git a/omegalib/omega/include/basic/Bag.h b/omegalib/omega/include/basic/Bag.h index 42285d0..3bd7143 100644 --- a/omegalib/omega/include/basic/Bag.h +++ b/omegalib/omega/include/basic/Bag.h @@ -14,13 +14,14 @@ virtual ~Bag(); Bag(); Bag(const Bag<T>&); Bag & operator=(const Bag<T>&); -virtual void operator |= (const Bag<T> & b); // add elements in b + //! add elements in b + virtual void operator |= (const Bag<T> & b); Iterator<T> *new_iterator(); bool empty() const; void remove(T); -virtual void insert(T); + virtual void insert(T); void clear(); -virtual bool contains(T) const; + virtual bool contains(T) const; int size() const; T extract(); // protected: breaks g++ 261 @@ -31,10 +32,11 @@ virtual bool contains(T) const; template<class T> class Ordered_Bag : public Bag<T> { public: Ordered_Bag(); -// virtual ~Ordered_Bag(); Ordered_Bag(const Ordered_Bag<T>& B) : Bag<T>(B) {} void insert(T); -virtual void operator |= (const Ordered_Bag<T> & b); // add elements in b + //! add elements in b + virtual void operator |= (const Ordered_Bag<T> & b); + //! add elements in b void operator |= (const Bag<T> & b); bool contains(T) const; bool operator == (const Ordered_Bag<T>&) const; @@ -45,21 +47,26 @@ virtual void operator |= (const Ordered_Bag<T> & b); // add elements in b template <class T> class Set : public Ordered_Bag <T> { public: Set(); -// virtual ~Set(); Set(T); Set(const Set<T>& S) : Ordered_Bag<T>(S) {} bool contains (const Set<T>& b) const; bool contains (T t) const { return Ordered_Bag<T>::contains(t); } // the above makes "standard" C++ happy - -virtual void operator |= (const Set<T> & b); // add elements in b + + //! add elements in b + virtual void operator |= (const Set<T> & b); + //! add elements in b void operator |= (const Ordered_Bag<T> & b); + //! add elements in b void operator |= (const Bag<T> & b); - void operator -= (const Set<T> & b); // delete items also in b - void operator &= (const Set<T> & b); // delete items not in b - bool operator & (const Set<T> &) const; // check for elements in common + //! delete items also in b + void operator -= (const Set<T> & b); + //! delete items not in b + void operator &= (const Set<T> & b); + //! check for elements in common + bool operator & (const Set<T> &) const; }; } // namespace |