[Mockpp-commits] mockpp/mockpp/constraint ConstraintList.h,1.6,1.7
Brought to you by:
ewald-arnold
From: Ewald A. <ewa...@us...> - 2005-11-26 17:57:08
|
Update of /cvsroot/mockpp/mockpp/mockpp/constraint In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20521/mockpp/constraint Modified Files: ConstraintList.h Log Message: prepare use of alternative stl Index: ConstraintList.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/constraint/ConstraintList.h,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- ConstraintList.h 13 Nov 2005 11:53:18 -0000 1.6 +++ ConstraintList.h 26 Nov 2005 17:57:00 -0000 1.7 @@ -32,8 +32,8 @@ #include <mockpp/mockpp.h> // always first -#include <algorithm> -#include <vector> +#include MOCKPP_ALGORITHM_H +#include MOCKPP_VECTOR_H #include <mockpp/AbstractExpectationCollection.h> @@ -283,8 +283,8 @@ ConstraintList<T> (const ConstraintList<T> &); // forbid due to internal pointers ConstraintList<T>& operator=(ConstraintList<T>&); - std::vector<T> actualItems; - std::vector<Constraint<T>*> constraints; + MOCKPP_STL::vector<T> actualItems; + MOCKPP_STL::vector<Constraint<T>*> constraints; bool expectNothing; bool haveActualValue; }; |