[Mockpp-commits] mockpp/mockpp/stub StubSequence.h,1.25,1.26 TypelessStubSequence.h,1.7,1.8

[Ewald A. <ewa...@us...>]

Update of /cvsroot/mockpp/mockpp/mockpp/stub
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29052/mockpp/stub

Modified Files:
	StubSequence.h TypelessStubSequence.h 
Log Message:
prepare use of alternative stl

Index: TypelessStubSequence.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/stub/TypelessStubSequence.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- TypelessStubSequence.h	26 Nov 2005 17:57:17 -0000	1.7
+++ TypelessStubSequence.h	26 Nov 2005 18:27:30 -0000	1.8
@@ -32,7 +32,7 @@
 
 #include <mockpp/mockpp.h> // always first
 
-#include MOCKPP_DEQUE_H
+#include MOCKPP_VECTOR_H
 
 #include <mockpp/stub/TypelessStub.h>
 #include <mockpp/compat/Assert.h>
@@ -65,8 +65,8 @@
     {
       while (!stubs.empty() )
       {
-        delete stubs.front();
-        stubs.pop_front();
+        delete stubs[0];
+        stubs.erase(stubs.begin());
       }
     }
 
@@ -77,8 +77,8 @@
     {
         if (!stubs.empty())
         {
-            std::auto_ptr< TypelessStub<R> > curr (stubs.front());
-            stubs.pop_front();
+            std::auto_ptr< TypelessStub<R> > curr (stubs[0]);
+            stubs.erase(stubs.begin());
             return curr->typelessInvoke();
         }
         assertionFailed(__LINE__, __FILE__, MOCKPP_PCHAR("no more stubs available"));
@@ -108,7 +108,7 @@
     TypelessStubSequence(const TypelessStubSequence &);
     TypelessStubSequence &operator =(const TypelessStubSequence &);
 
-    std::deque<TypelessStub<R>* >  stubs;
+    std::vector<TypelessStub<R>* >  stubs;
 };
 
 

Index: StubSequence.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/stub/StubSequence.h,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- StubSequence.h	26 Nov 2005 17:57:17 -0000	1.25
+++ StubSequence.h	26 Nov 2005 18:27:30 -0000	1.26
@@ -36,7 +36,7 @@
 
 #include <mockpp/mockpp.h> // always first
 
-#include MOCKPP_DEQUE_H
+#include MOCKPP_VECTOR_H
 
 #include <mockpp/stub/Stub.h>
 #include <mockpp/compat/Assert.h>
@@ -72,8 +72,8 @@
     {
       while (!stubs.empty() )
       {
-        delete stubs.front();
-        stubs.pop_front();
+        delete stubs[0];
+        stubs.erase(stubs.begin());
       }
     }
 
@@ -85,8 +85,8 @@
     {
         if (!stubs.empty())
         {
-            std::auto_ptr< Stub<R, I> > curr (stubs.front());
-            stubs.pop_front();
+            std::auto_ptr< Stub<R, I> > curr (stubs[0]);
+            stubs.erase(stubs.begin());
             return curr->invoke(invocation);
         }
         assertionFailed(__LINE__, __FILE__, MOCKPP_PCHAR("no more stubs available"));
@@ -116,7 +116,7 @@
     StubSequence(const StubSequence &);
     StubSequence &operator =(const StubSequence &);
 
-    std::deque<Stub<R, I>* >  stubs;
+    std::vector<Stub<R, I>* >  stubs;
 };