DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

switch from boost int types to <stdint.h>

Browse Source
This commit is contained in:
Kamil Domanski
2014-05-05 20:08:13 +02:00
parent 29c1fbbb97
commit 4b61a6a478
9 changed files with 80 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/json/json_spirit_value.h
View File

@@ -17,7 +17,6 @@
#include <sstream>
#include <stdexcept>
#include <boost/config.hpp>
#include <boost/cstdint.hpp>
#include <boost/shared_ptr.hpp>
#include <boost/variant.hpp>
@@ -45,8 +44,8 @@ namespace json_spirit
Value_impl( const Array& value );
Value_impl( bool value );
Value_impl( int value );
Value_impl( boost::int64_t value );
Value_impl( boost::uint64_t value );
Value_impl( int64_t value );
Value_impl( uint64_t value );
Value_impl( double value );
Value_impl( const Value_impl& other );
@@ -65,8 +64,8 @@ namespace json_spirit
const Array& get_array() const;
bool get_bool() const;
int get_int() const;
boost::int64_t get_int64() const;
boost::uint64_t get_uint64() const;
int64_t get_int64() const;
uint64_t get_uint64() const;
double get_real() const;
Object& get_obj();
@@ -83,7 +82,7 @@ namespace json_spirit
typedef boost::variant< String_type,
boost::recursive_wrapper< Object >, boost::recursive_wrapper< Array >,
bool, boost::int64_t, double > Variant;
bool, int64_t, double > Variant;
Value_type type_;
Variant v_;
@@ -258,13 +257,13 @@ namespace json_spirit
template< class Config >
Value_impl< Config >::Value_impl( int value )
: type_( int_type )
, v_( static_cast< boost::int64_t >( value ) )
, v_( static_cast< int64_t >( value ) )
, is_uint64_( false )
{
}
template< class Config >
Value_impl< Config >::Value_impl( boost::int64_t value )
Value_impl< Config >::Value_impl( int64_t value )
: type_( int_type )
, v_( value )
, is_uint64_( false )
@@ -272,9 +271,9 @@ namespace json_spirit
}
template< class Config >
Value_impl< Config >::Value_impl( boost::uint64_t value )
Value_impl< Config >::Value_impl( uint64_t value )
: type_( int_type )
, v_( static_cast< boost::int64_t >( value ) )
, v_( static_cast< int64_t >( value ) )
, is_uint64_( true )
{
}
@@ -390,19 +389,19 @@ namespace json_spirit
}
template< class Config >
boost::int64_t Value_impl< Config >::get_int64() const
int64_t Value_impl< Config >::get_int64() const
{
check_type( int_type );
return boost::get< boost::int64_t >( v_ );
return boost::get< int64_t >( v_ );
}
template< class Config >
boost::uint64_t Value_impl< Config >::get_uint64() const
uint64_t Value_impl< Config >::get_uint64() const
{
check_type( int_type );
return static_cast< boost::uint64_t >( get_int64() );
return static_cast< uint64_t >( get_int64() );
}
template< class Config >
@@ -481,13 +480,13 @@ namespace json_spirit
}
template< class Value >
boost::int64_t get_value( const Value& value, Type_to_type< boost::int64_t > )
int64_t get_value( const Value& value, Type_to_type< int64_t > )
{
return value.get_int64();
}
template< class Value >
boost::uint64_t get_value( const Value& value, Type_to_type< boost::uint64_t > )
uint64_t get_value( const Value& value, Type_to_type< uint64_t > )
{
return value.get_uint64();
}