Changeset 4fb16c for src/Helpers

Timestamp:

Feb 28, 2011, 2:20:23 PM (15 years ago)

Author:

Frederik Heber <heber@…>

Children:

6b898c

Parents:

178da0

git-author:

Frederik Heber <heber@…> (02/22/11 14:45:16)

git-committer:

Frederik Heber <heber@…> (02/28/11 14:20:23)

Message:

BUGFIX: ObservedIterator::operator* and ::operator-> have to be const members, added MapValue(Const)Iterator adaptors.

• Library version is now 6:0:0, API version is still 1.0.12.
• note: in order to comply with standards operator* and operator-> of iterators have to be const members (e.g. for use with boost::iterator_adaptor, or iterator_facade). Hence, ObservedIterator::protector is now mutable and AcquireLock() is const member as well.
• Added const versions of both IteratorAdaptors.

File:

• src/Helpers/IteratorAdaptors.hpp (modified) (2 diffs)

src/Helpers/IteratorAdaptors.hpp

@@ -46 +46 @@
 
 /** This class wraps an iterator and implements a dereferencer (operator*) that
+ *  always returns the value
+ */
+template <class BaseIterator>
+class MapValueConstIterator :
+    public boost::iterator_adaptor<
+    MapValueConstIterator<BaseIterator>,
+        BaseIterator,
+        const typename BaseIterator::value_type::second_type >
+{
+public:
+    typedef const typename BaseIterator::value_type::second_type& const_reference;
+
+    MapValueConstIterator() {}
+
+    explicit MapValueConstIterator(BaseIterator base)
+    :   MapValueConstIterator::iterator_adaptor_(base) {}
+
+ private:
+    friend class boost::iterator_core_access;
+    const_reference dereference() const
+        {return this->base_reference()->second;}
+};
+
+/** This class wraps an iterator and implements a dereferencer (operator*) that
  *  always returns the key
  */
@@ -69 +93 @@
 };
 
+/** This class wraps an iterator and implements a dereferencer (operator*) that
+ *  always returns the key
+ */
+template <class BaseIterator>
+class MapKeyConstIterator :
+    public boost::iterator_adaptor<
+    MapKeyConstIterator<BaseIterator>,
+        BaseIterator,
+        const typename BaseIterator::value_type::first_type >
+{
+public:
+    typedef const typename BaseIterator::value_type::first_type& const_reference;
+
+    MapKeyConstIterator() {}
+
+    explicit MapKeyConstIterator(BaseIterator base)
+    :   MapKeyConstIterator::iterator_adaptor_(base) {}
+
+ private:
+    friend class boost::iterator_core_access;
+    const_reference dereference() const
+        {return this->base_reference()->first;}
+};
+
 #endif /* ITERATORADAPTORS_HPP_ */