Update of /cvsroot/cppunit/cppunit2/include/cpptl
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13392/include/cpptl
Modified Files:
any.h enumerator.h
Log Message:
Fixed compilation issue on mingw platform.
Index: enumerator.h
===================================================================
RCS file: /cvsroot/cppunit/cppunit2/include/cpptl/enumerator.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** enumerator.h 7 Nov 2005 22:43:07 -0000 1.8
--- enumerator.h 10 Nov 2005 08:03:09 -0000 1.9
***************
*** 43,47 ****
typedef CPPTL_TYPENAME Fn1::result_type result_type;
! ComposeFn( Fn1 = Fn1(), Fn2 = Fn2() )
: fn1_( fn1 )
, fn2_( fn2 )
--- 43,47 ----
typedef CPPTL_TYPENAME Fn1::result_type result_type;
! ComposeFn( Fn1 fn1= Fn1(), Fn2 fn2= Fn2() )
: fn1_( fn1 )
, fn2_( fn2 )
***************
*** 1015,1018 ****
--- 1015,1019 ----
typedef AddressOfAdaptor<CPPTL_TYPENAME EnumeratorType::value_type> Adaptor;
typedef TransformEnumerator< Adaptor, EnumeratorType > EnumType;
+ Adaptor adaptor;
return EnumType( enumerator, adaptor );
}
Index: any.h
===================================================================
RCS file: /cvsroot/cppunit/cppunit2/include/cpptl/any.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** any.h 3 Mar 2005 08:11:33 -0000 1.1
--- any.h 10 Nov 2005 08:03:09 -0000 1.2
***************
*** 285,291 ****
const ValueType *get( const CppTL::Any *value, CppTL::Type<ValueType> )
{
! if ( value.type() != CppTL::typeId( CppTL::Type<ValueType>() ) )
return 0;
! return static_cast<CppTL::Impl::AnyHolderImpl<ValueType> *>( value.holder_ )->value();
}
--- 285,291 ----
const ValueType *get( const CppTL::Any *value, CppTL::Type<ValueType> )
{
! if ( value->type() != CppTL::typeId( CppTL::Type<ValueType>() ) )
return 0;
! return static_cast<CppTL::Impl::AnyHolderImpl<ValueType> *>( value->holder_ )->value();
}
|
