Update of /cvsroot/cppunit/cppunit2/include/cpptl
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18007/include/cpptl
Modified Files:
enumerator.h
Log Message:
* removed include/cpput/enumerator.h which has been replaced by include/cpptl/enumerator.h
* added explicit type passing to any*() generator functions.
Index: enumerator.h
===================================================================
RCS file: /cvsroot/cppunit/cppunit2/include/cpptl/enumerator.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** enumerator.h 19 Nov 2004 19:30:16 -0000 1.5
--- enumerator.h 23 Feb 2005 08:54:04 -0000 1.6
***************
*** 1046,1049 ****
--- 1046,1058 ----
template<class ForwardItType
+ ,class ValueType>
+ AnyEnumerator<CPPTL_TYPENAME ValueType::type>
+ anyRange( ForwardItType begin, ForwardItType end, ValueType type )
+ {
+ return any( range( begin, end, type ) );
+ }
+
+
+ template<class ForwardItType
,class Adaptor >
AnyEnumerator<CPPTL_TYPENAME Adaptor::result_type>
***************
*** 1060,1063 ****
--- 1069,1080 ----
}
+ template<class ContainerType
+ ,class ValueType>
+ AnyEnumerator<CPPTL_TYPENAME ValueType::type>
+ anyContainer( const ContainerType &enumeratedContainer, ValueType type )
+ {
+ return any( container( enumeratedContainer, type ) );
+ }
+
template<class ForwardItType>
AnyEnumerator<CPPTL_TYPENAME RemoveConst<
***************
*** 1068,1071 ****
--- 1085,1104 ----
}
+ template<class ForwardItType
+ ,class ValueType>
+ AnyEnumerator<CPPTL_TYPENAME ValueType::type>
+ anyKeysRange( ForwardItType begin, ForwardItType end, ValueType type )
+ {
+ return any( keysRange( begin, end, type ) );
+ }
+
+ template<class ContainerType
+ ,class ValueType>
+ AnyEnumerator<CPPTL_TYPENAME ValueType::type>
+ anyKeys( const ContainerType &container, ValueType type )
+ {
+ return any( keys( container, type ) );
+ }
+
template<class ContainerType>
AnyEnumerator<CPPTL_TYPENAME RemoveConst<
***************
*** 1084,1087 ****
--- 1117,1128 ----
}
+ template<class ForwardItType
+ ,class ValueType>
+ AnyEnumerator<CPPTL_TYPENAME ValueType::type>
+ anyValuesRange( ForwardItType begin, ForwardItType end, ValueType type )
+ {
+ return any( valuesRange( begin, end, type ) );
+ }
+
template<class ContainerType>
AnyEnumerator<CPPTL_TYPENAME RemoveConst<
***************
*** 1092,1095 ****
--- 1133,1144 ----
}
+ template<class ContainerType
+ ,class ValueType>
+ AnyEnumerator<CPPTL_TYPENAME ValueType::type>
+ anyValues( const ContainerType &container, ValueType type )
+ {
+ return any( values( container, type ) );
+ }
+
template<class EnumeratorType
|
