Changeset 4fb16c for src/Patterns

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/Patterns/ObservedIterator.hpp (modified) (4 diffs)

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;
 };