[Cppunit-cvs] cppunit2/src/cpputtest enumeratortest.cpp,1.4,1.5
Brought to you by:
blep
From: Baptiste L. <bl...@us...> - 2004-11-15 08:52:51
|
Update of /cvsroot/cppunit/cppunit2/src/cpputtest In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5653/src/cpputtest Modified Files: enumeratortest.cpp Log Message: * started implementing explicit type passing for returned enumerator in generator function. Index: enumeratortest.cpp =================================================================== RCS file: /cvsroot/cppunit/cppunit2/src/cpputtest/enumeratortest.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** enumeratortest.cpp 22 Oct 2004 06:20:07 -0000 1.4 --- enumeratortest.cpp 15 Nov 2004 08:52:40 -0000 1.5 *************** *** 297,305 **** --- 297,313 ---- #endif + #if !defined(CPPTL_NO_TEMPLATE_PARTIAL_SPECIALIZATION) checkContent( CppTL::Enum::range( set1_.begin(), set1_.end() ) ); + #endif checkContent( CppTL::Enum::range( list1_.begin(), list1_.end() ) ); checkContent( CppTL::Enum::anyRange( list1_.begin(), list1_.end() ) ); + + // Specifying Type ensure portability across all platforms. + checkContent( CppTL::Enum::range( deque1_.begin(), deque1_.end(), CppTL::Type<int>() ) ); + checkContent( CppTL::Enum::range( vector1_.begin(), vector1_.end(), CppTL::Type<int>() ) ); + checkContent( CppTL::Enum::range( set1_.begin(), set1_.end(), CppTL::Type<int>() ) ); + checkContent( CppTL::Enum::range( list1_.begin(), list1_.end(), CppTL::Type<int>() ) ); } *************** *** 334,345 **** { checkContent( CppTL::Enum::container( deque1_ ) ); - checkContent( CppTL::Enum::container( vector1_ ) ); - checkContent( CppTL::Enum::container( set1_ ) ); - checkContent( CppTL::Enum::container( list1_ ) ); - checkContent( CppTL::Enum::anyContainer( list1_ ) ); } --- 342,354 ---- { checkContent( CppTL::Enum::container( deque1_ ) ); checkContent( CppTL::Enum::container( vector1_ ) ); checkContent( CppTL::Enum::container( set1_ ) ); checkContent( CppTL::Enum::container( list1_ ) ); checkContent( CppTL::Enum::anyContainer( list1_ ) ); + + checkContent( CppTL::Enum::container( deque1_, CppTL::Type<int>() ) ); + checkContent( CppTL::Enum::container( vector1_, CppTL::Type<int>() ) ); + checkContent( CppTL::Enum::container( set1_, CppTL::Type<int>() ) ); + checkContent( CppTL::Enum::container( list1_, CppTL::Type<int>() ) ); } *************** *** 350,355 **** --- 359,368 ---- checkContent( CppTL::Enum::keys( map1_ ) ); + checkContent( CppTL::Enum::keys( map1_, CppTL::Type<int>() ) ); + checkContent( CppTL::Enum::keysRange( map1_.begin(), map1_.end() ) ); + checkContent( CppTL::Enum::keysRange( map1_.begin(), map1_.end(), CppTL::Type<int>() ) ); + checkContent( CppTL::Enum::anyKeys( map1_ ) ); *************** *** 365,368 **** --- 378,387 ---- checkStringContent( CppTL::Enum::valuesRange( map1_.begin(), map1_.end() ) ); + checkStringContent( CppTL::Enum::values( map1_, CppTL::Type<std::string>() ) ); + + checkStringContent( CppTL::Enum::valuesRange( map1_.begin(), + map1_.end(), + CppTL::Type<std::string>() ) ); + checkStringContent( CppTL::Enum::anyValues( map1_ ) ); |