X-Git-Url: https://git.novaco.in/?p=novacoin.git;a=blobdiff_plain;f=src%2Fjson%2Fjson_spirit_value.h;h=3b864f68f9b03b695a5977ae5fc4f0373048ca69;hp=7e83a2a7e3e618acda406b6e51fd6ac44a83d70a;hb=6cea4ed3fed2259f8800d8ecb45c691c0df0cdd1;hpb=d29f04586acae759da475306cfd72320afe92535

diff --git a/src/json/json_spirit_value.h b/src/json/json_spirit_value.h
index 7e83a2a..3b864f6 100644
--- a/src/json/json_spirit_value.h
+++ b/src/json/json_spirit_value.h
@@ -16,10 +16,9 @@
 #include <cassert>
 #include <sstream>
 #include <stdexcept>
-#include <boost/config.hpp> 
-#include <boost/cstdint.hpp> 
-#include <boost/shared_ptr.hpp> 
-#include <boost/variant.hpp> 
+#include <boost/config.hpp>
+#include <boost/shared_ptr.hpp>
+#include <boost/variant.hpp>
 
 namespace json_spirit
 {
@@ -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 );
@@ -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,7 +271,7 @@ 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 ) )
     ,   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();
         }