cppunit-cvs

[Baptiste L. <bl...@us...>]

Update of /cvsroot/cppunit/cppunit2/include/opentest
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16055/include/opentest

Modified Files:
	serializer.h 
Log Message:
Fixed serialization of stl sequence.

Index: serializer.h
===================================================================
RCS file: /cvsroot/cppunit/cppunit2/include/opentest/serializer.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** serializer.h	24 Jun 2005 08:23:49 -0000	1.1
--- serializer.h	24 Jun 2005 19:41:50 -0000	1.2
***************
*** 98,103 ****
  Stream &serializeSTLSequence( Stream &stream, const SequenceType &sequence )
  {
!    typedef CPPTL_TYPENAME SequenceType::const_iterator it = sequence.begin();
!    typedef CPPTL_TYPENAME SequenceType::const_iterator itEnd = sequence.end();
     unsigned int size = itEnd - it;
     stream << size;
--- 98,103 ----
  Stream &serializeSTLSequence( Stream &stream, const SequenceType &sequence )
  {
!    CPPTL_TYPENAME SequenceType::const_iterator it = sequence.begin();
!    CPPTL_TYPENAME SequenceType::const_iterator itEnd = sequence.end();
     unsigned int size = itEnd - it;
     stream << size;
***************
*** 108,118 ****
  
  template<class SequenceType>
! Stream &unserializeSTLSequence( Stream &stream, const SequenceType &sequence )
  {
     unsigned int size;
     stream >> size;
     sequence.resize( size );
!    typedef CPPTL_TYPENAME SequenceType::const_iterator it = sequence.begin();
!    typedef CPPTL_TYPENAME SequenceType::const_iterator itEnd = sequence.end();
     for ( ; it != itEnd; ++it )
        stream >> *it;
--- 108,118 ----
  
  template<class SequenceType>
! Stream &unserializeSTLSequence( Stream &stream, SequenceType &sequence )
  {
     unsigned int size;
     stream >> size;
     sequence.resize( size );
!    CPPTL_TYPENAME SequenceType::iterator it = sequence.begin();
!    CPPTL_TYPENAME SequenceType::iterator itEnd = sequence.end();
     for ( ; it != itEnd; ++it )
        stream >> *it;