open-source-parsers/jsoncpp
1
0
Fork 0
mirror of https://github.com/open-source-parsers/jsoncpp.git synced 2025-10-23 10:28:11 +08:00
Code Issues Releases Wiki Activity

Fixed compilation warnings. Added -Wall to linux-gcc compilation. JSON_ASSERT_MESSAGE now throws exception (but JSON_ASSERT does not).

Browse Source
This commit is contained in:
Christopher Dunn
2007-05-09 19:35:15 +00:00
parent 842d64e8d7
commit a44cffb342
5 changed files with 25 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/lib_json/json_value.cpp
View File

@@ -2,6 +2,7 @@
#include <json/value.h>
#include <json/writer.h>
#include <utility>
#include <stdexcept>
#include "assert.h"
#ifdef JSON_USE_CPPTL
# include <cpptl/conststring.h>
@@ -13,7 +14,7 @@
#define JSON_ASSERT_UNREACHABLE assert( false )
#define JSON_ASSERT( condition ) assert( condition ); // @todo <= change this into an exception throw
#define JSON_ASSERT_MESSAGE( condition, message ) assert( condition && message ); // @todo <= change this into an exception throw
#define JSON_ASSERT_MESSAGE( condition, message ) if (!( condition )) throw std::runtime_error( message );
namespace Json {
@@ -265,8 +266,8 @@ Value::CZString::isStaticString() const
*/
Value::Value( ValueType type )
: type_( type )
, comments_( 0 )
, allocated_( 0 )
, comments_( 0 )
# ifdef JSON_VALUE_USE_INTERNAL_MAP
, itemIsUsed_( 0 )
#endif
@@ -680,7 +681,7 @@ Value::asString() const
case realValue:
case arrayValue:
case objectValue:
JSON_ASSERT( "Type is not convertible to double" && false );
JSON_ASSERT_MESSAGE( false, "Type is not convertible to string" );
default:
JSON_ASSERT_UNREACHABLE;
}
@@ -705,17 +706,17 @@ Value::asInt() const
case intValue:
return value_.int_;
case uintValue:
JSON_ASSERT( value_.uint_ < maxInt && "integer out of signed integer range" );
JSON_ASSERT_MESSAGE( value_.uint_ < (unsigned)maxInt, "integer out of signed integer range" );
return value_.uint_;
case realValue:
JSON_ASSERT( value_.real_ >= minInt && value_.real_ <= maxInt && "Real out of signed integer range" );
JSON_ASSERT_MESSAGE( value_.real_ >= minInt && value_.real_ <= maxInt, "Real out of signed integer range" );
return Int( value_.real_ );
case booleanValue:
return value_.bool_ ? 1 : 0;
case stringValue:
case arrayValue:
case objectValue:
JSON_ASSERT( "Type is not convertible to double" && false );
JSON_ASSERT_MESSAGE( false, "Type is not convertible to int" );
default:
JSON_ASSERT_UNREACHABLE;
}
@@ -730,19 +731,19 @@ Value::asUInt() const
case nullValue:
return 0;
case intValue:
JSON_ASSERT( value_.int_ >= 0 && "Negative integer can not be converted to unsigned integer" );
JSON_ASSERT_MESSAGE( value_.int_ >= 0, "Negative integer can not be converted to unsigned integer" );
return value_.int_;
case uintValue:
return value_.uint_;
case realValue:
JSON_ASSERT( value_.real_ >= 0 && value_.real_ <= maxUInt && "Real out of unsigned integer range" );
JSON_ASSERT_MESSAGE( value_.real_ >= 0 && value_.real_ <= maxUInt, "Real out of unsigned integer range" );
return UInt( value_.real_ );
case booleanValue:
return value_.bool_ ? 1 : 0;
case stringValue:
case arrayValue:
case objectValue:
JSON_ASSERT( "Type is not convertible to double" && false );
JSON_ASSERT_MESSAGE( false, "Type is not convertible to uint" );
default:
JSON_ASSERT_UNREACHABLE;
}
@@ -767,7 +768,7 @@ Value::asDouble() const
case stringValue:
case arrayValue:
case objectValue:
JSON_ASSERT( "Type is not convertible to double" && false );
JSON_ASSERT_MESSAGE( false, "Type is not convertible to double" );
default:
JSON_ASSERT_UNREACHABLE;
}
@@ -816,7 +817,7 @@ Value::isConvertibleTo( ValueType other ) const
|| other == booleanValue;
case uintValue:
return ( other == nullValue && value_.uint_ == 0 )
|| ( other == intValue && value_.uint_ <= maxInt )
|| ( other == intValue && value_.uint_ <= (unsigned)maxInt )
|| other == uintValue
|| other == realValue
|| other == stringValue
@@ -1499,22 +1500,22 @@ PathArgument::PathArgument()
PathArgument::PathArgument( Value::UInt index )
: kind_( kindIndex )
, index_( index )
: index_( index )
, kind_( kindIndex )
{
}
PathArgument::PathArgument( const char *key )
: kind_( kindKey )
, key_( key )
: key_( key )
, kind_( kindKey )
{
}
PathArgument::PathArgument( const std::string &key )
: kind_( kindKey )
, key_( key.c_str() )
: key_( key.c_str() )
, kind_( kindKey )
{
}