[Cppunit-cvs] cppunit2/include/opentest properties.h,1.1,1.2
Brought to you by:
blep
From: Baptiste L. <bl...@us...> - 2004-11-15 08:45:38
|
Update of /cvsroot/cppunit/cppunit2/include/opentest In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3886 Modified Files: properties.h Log Message: * removed conversion loss of data warning Index: properties.h =================================================================== RCS file: /cvsroot/cppunit/cppunit2/include/opentest/properties.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** properties.h 15 Nov 2004 08:33:30 -0000 1.1 --- properties.h 15 Nov 2004 08:45:24 -0000 1.2 *************** *** 515,519 **** case vtSignedInteger: case vtUnsignedInteger: ! return guts_.intValue_; case vtReal: return int( guts_.realValue_ ); --- 515,519 ---- case vtSignedInteger: case vtUnsignedInteger: ! return int(guts_.intValue_); case vtReal: return int( guts_.realValue_ ); *************** *** 534,540 **** case vtSignedInteger: case vtUnsignedInteger: ! return guts_.uintValue_; case vtReal: ! return int( guts_.realValue_ ); default: throwBadCast(); --- 534,540 ---- case vtSignedInteger: case vtUnsignedInteger: ! return (unsigned int)(guts_.uintValue_); case vtReal: ! return (unsigned int)( guts_.realValue_ ); default: throwBadCast(); *************** *** 593,599 **** return guts_.boolValue_ ? 1.0 : 0.0; case vtSignedInteger: ! return guts_.intValue_; case vtUnsignedInteger: ! return guts_.uintValue_; case vtReal: return guts_.realValue_; --- 593,599 ---- return guts_.boolValue_ ? 1.0 : 0.0; case vtSignedInteger: ! return (long double)(guts_.intValue_); case vtUnsignedInteger: ! return (long double)(guts_.uintValue_); case vtReal: return guts_.realValue_; |