Changeset 4fb16c

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.

Files:

• configure.ac (modified) (2 diffs)
• src/Helpers/IteratorAdaptors.hpp (modified) (2 diffs)
• src/Patterns/ObservedIterator.hpp (modified) (4 diffs)

configure.ac

@@ -3 +3 @@
 
 AC_PREREQ([2.65])
-AC_INIT([CodePatterns], [1.0.11], [heber@ins.uni-bonn.de], [codepatterns], [http://trac.ins.uni-bonn.de/projects/CodePatterns/])
+AC_INIT([CodePatterns], [1.0.12], [heber@ins.uni-bonn.de], [codepatterns], [http://trac.ins.uni-bonn.de/projects/CodePatterns/])
 AC_CONFIG_AUX_DIR(config)
 AC_CONFIG_SRCDIR([src/Patterns/Singleton_impl.hpp])
@@ -25 +25 @@
 # refer to the libtool manual, section "Updating library version information":
 # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
-AC_SUBST([CODEPATTERNS_SO_VERSION], [5:1:5])
-AC_SUBST([CODEPATTERNS_API_VERSION], [1.0.11])
+AC_SUBST([CODEPATTERNS_SO_VERSION], [6:0:0])
+AC_SUBST([CODEPATTERNS_API_VERSION], [1.0.12])
 
 # Checks for libraries.

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_ */

src/Patterns/ObservedIterator.hpp

@@ -109 +109 @@
   }
 
-  value_type operator*(){
+  /** Returns the value_type this iterator represents.
+   * Activates a lock.
+   *
+   * \note In order to be conforming, dereference must be const member.
+   *
+   * @return value_type of iterator
+   */
+  value_type operator*() const {
     // access is requested... time to get the lock
     acquireLock();
@@ -115 +122 @@
   }
 
-  value_type *operator->(){
+  /** Returns pointer to value_type this iterator represents.
+   * Activates a lock.
+   *
+   * \note In order to be conforming, dereference must be const member.
+   *
+   * @return pointer to value_type of iterator
+   */
+  value_type *operator->() const {
     acquireLock();
     return &(*iter);
@@ -135 +149 @@
    * etc.
    */
-  void acquireLock(){
+  void acquireLock() const {
     if(!protector)
       protector = new Observable::_Observable_protector(collection);
@@ -152 +166 @@
   _Iter iter;
   Observable *collection;
-  Observable::_Observable_protector *protector;
+  mutable Observable::_Observable_protector *protector;
 };