generic-library/jsoncpp
1
0
Fork 0
mirror of https://github.com/open-source-parsers/jsoncpp.git synced 2025-10-23 00:07:58 +02:00
Code Issues Projects Releases Wiki Activity

Fixed unit tests execution on MSVC 6 by removing usage of std::numeric_limits. It was returning 0 value in some max cases. Fixed Value::asFloat() to use integerToDouble().

Browse Source
This commit is contained in:
Baptiste Lepilleur
2011-05-27 08:12:41 +00:00
parent f587e6a420
commit d496e044b1
2 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/lib_json/json_value.cpp
View File

@@ -56,7 +56,7 @@ static inline bool InRange(double d, T min, U max) {
#else // if !defined(JSON_USE_INT64_DOUBLE_CONVERSION)
static inline double integerToDouble( Json::UInt64 value )
{
return static_cast<double>( UInt(value >> 32) ) * (UInt64(1)<<32) + UInt(value & 0xffffffff);
return static_cast<double>( Int64(value/2) ) * 2.0 + Int64(value & 1);
}
template<typename T>
@@ -878,7 +878,7 @@ Value::asFloat() const
#if !defined(JSON_USE_INT64_DOUBLE_CONVERSION)
return static_cast<float>( value_.uint_ );
#else // if !defined(JSON_USE_INT64_DOUBLE_CONVERSION)
return static_cast<float>( Int(value_.uint_/2) ) * 2 + Int(value_.uint_ & 1);
return integerToDouble( value_.uint_ );
#endif // if !defined(JSON_USE_INT64_DOUBLE_CONVERSION)
case realValue:
return static_cast<float>( value_.real_ );