Changeset d3926b5 for src/Patterns

Timestamp:

Feb 21, 2011, 3:46:02 PM (15 years ago)

Author:

Frederik Heber <heber@…>

Children:

d1e0c0

Parents:

7fff6c

git-author:

Frederik Heber <heber@…> (02/14/11 22:12:10)

git-committer:

Frederik Heber <heber@…> (02/21/11 15:46:02)

Message:

BUGFIX: ObservedContainer::reverse_iterator was wrong way implemnted.

• Library version is now 4:0:4, API version is still 1.0.9.
• reverse_iterator had begin(), end() messed in cstor.
• added unit test on ObservedContainer.

Location:

src/Patterns

Files:

• ObservedContainer.hpp (modified) (3 diffs)
• ObservedContainer_impl.hpp (modified) (4 diffs)
• unittests/Makefile.am (modified) (2 diffs)
• unittests/ObservedContainerUnitTest.cpp (added)
• unittests/ObservedContainerUnitTest.hpp (added)
• unittests/ObserverUnitTest.cpp (modified) (1 diff)

src/Patterns/ObservedContainer.hpp

@@ -14 +14 @@
 #endif
 
-#include "types.hpp"
-
 #include <utility>
 #include "ObservedIterator.hpp"
-#include "Descriptors/SelectiveIterator.hpp"
-
-class World;
-class atom;
-class AtomDescriptor;
 
 /**
@@ -34 +27 @@
 class ObservedContainer
 {
-  friend class World;
-
 public:
   typedef Container set_t;
@@ -46 +37 @@
   typedef ObservedIterator<set_t>                               iterator;
   typedef typename set_t::const_iterator                        const_iterator;
-  typedef std::reverse_iterator<iterator>                       reverse_iterator;
+  typedef typename std::reverse_iterator<iterator>              reverse_iterator;
   typedef typename std::reverse_iterator<const_iterator>        const_reverse_iterator;
 

src/Patterns/ObservedContainer_impl.hpp

@@ -71 +71 @@
 typename ObservedContainer<Container>::reverse_iterator
 ObservedContainer<Container>::rbegin(){
-  return reverse_iterator(begin());
+  return reverse_iterator(end());
 }
 
@@ -78 +78 @@
 typename ObservedContainer<Container>::const_reverse_iterator
 ObservedContainer<Container>::rbegin() const{
-  return const_reverse_iterator(begin());
+  return const_reverse_iterator(end());
 }
 
@@ -85 +85 @@
 typename ObservedContainer<Container>::reverse_iterator
 ObservedContainer<Container>::rend(){
-  return reverse_iterator(end());
+  return reverse_iterator(begin());
 }
 
@@ -92 +92 @@
 typename ObservedContainer<Container>::const_reverse_iterator
 ObservedContainer<Container>::rend() const{
-  return const_reverse_iterator(end());
+  return const_reverse_iterator(begin());
 }
 

src/Patterns/unittests/Makefile.am

@@ -15 +15 @@
   ManipulableCloneUnitTest \
   ManipulablePrototypeFactoryUnitTest \
+  ObservedContainerUnitTest \
   ObserverUnitTest \
   PrototypeFactoryUnitTest \
@@ -106 +107 @@
 nodist_ObserverUnitTest_SOURCES = \
         ../Observer.hpp \
+        ../ObserverContainer.hpp \
+        ../ObserverContainer_impl.hpp \
         ../ObserverIterator.hpp
 ObserverUnitTest_LDADD = $(TESTLIBS)
+
+ObservedContainerUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \
+        ObservedContainerUnitTest.cpp \
+        ObservedContainerUnitTest.hpp \
+        stubs/ObserverStub.cpp \
+        stubs/ObserverStub.hpp
+nodist_ObservedContainerUnitTest_SOURCES = \
+        ../ObserverContainer.hpp \
+        ../ObserverContainer_impl.hpp
+ObservedContainerUnitTest_LDADD = $(TESTLIBS)
 
 PrototypeFactoryUnitTest_SOURCES = $(top_srcdir)/src/unittests/UnitTestMain.cpp \

src/Patterns/unittests/ObserverUnitTest.cpp

@@ -28 +28 @@
 
 #include "stubs/ObserverStub.hpp"
+#include "ObservedContainer.hpp"
+#include "ObservedContainer_impl.hpp"
 
 #include "ObserverUnitTest.hpp"