commit f1053e7acb81373ddd470c313fd1c17867c14f8b
author Aaron Jacobs <aaronjjacobs@gmail.com> Tue May 24 03:18:02 2011 +0000
committer Aaron Jacobs <aaronjjacobs@gmail.com> Tue May 24 03:18:02 2011 +0000
tree b72e308066160a906389f8c81b9de3e37375bb2c
parent e3d0eca9f44a747d6a030b26944782501333ebd9

Fixed a bunch of compilation errors when JSON_HAS_INT64 is set.

include/json/value.h

diff --git a/include/json/value.h b/include/json/value.h
index 32e3455..e3869e5 100644
--- a/include/json/value.h
+++ b/include/json/value.h
@@ -151,12 +151,14 @@
       /// Maximum unsigned int value that can be stored in a Json::Value.
       static const UInt maxUInt;
 
+# if defined(JSON_HAS_INT64)
       /// Minimum signed 64 bits int value that can be stored in a Json::Value.
       static const Int64 minInt64;
       /// Maximum signed 64 bits int value that can be stored in a Json::Value.
       static const Int64 maxInt64;
       /// Maximum unsigned 64 bits int value that can be stored in a Json::Value.
       static const UInt64 maxUInt64;
+#endif // defined(JSON_HAS_INT64)
 
    private:
 #ifndef JSONCPP_DOC_EXCLUDE_IMPLEMENTATION
@@ -265,8 +267,10 @@
 # endif
       Int asInt() const;
       UInt asUInt() const;
+#if defined(JSON_HAS_INT64)
       Int64 asInt64() const;
       UInt64 asUInt64() const;
+#endif // if defined(JSON_HAS_INT64)
       LargestInt asLargestInt() const;
       LargestUInt asLargestUInt() const;
       float asFloat() const;

src/lib_json/json_value.cpp

diff --git a/src/lib_json/json_value.cpp b/src/lib_json/json_value.cpp
index f314ba3..d4a2a65 100644
--- a/src/lib_json/json_value.cpp
+++ b/src/lib_json/json_value.cpp
@@ -29,9 +29,11 @@
 const Int Value::minInt = Int( ~(UInt(-1)/2) );
 const Int Value::maxInt = Int( UInt(-1)/2 );
 const UInt Value::maxUInt = UInt(-1);
+# if defined(JSON_HAS_INT64)
 const Int64 Value::minInt64 = Int64( ~(UInt64(-1)/2) );
 const Int64 Value::maxInt64 = Int64( UInt64(-1)/2 );
 const UInt64 Value::maxUInt64 = UInt64(-1);
+#endif // defined(JSON_HAS_INT64)
 const LargestInt Value::minLargestInt = LargestInt( ~(LargestUInt(-1)/2) );
 const LargestInt Value::maxLargestInt = LargestInt( LargestUInt(-1)/2 );
 const LargestUInt Value::maxLargestUInt = LargestUInt(-1);
@@ -281,7 +283,6 @@
 }
 
 
-#if defined(JSON_HAS_INT64)
 Value::Value( UInt value )
    : type_( uintValue )
 # ifdef JSON_VALUE_USE_INTERNAL_MAP
@@ -302,9 +303,8 @@
    value_.int_ = value;
 }
 
-#endif // if defined(JSON_HAS_INT64)
 
-
+# if defined(JSON_HAS_INT64)
 Value::Value( Int64 value )
    : type_( intValue )
 # ifdef JSON_VALUE_USE_INTERNAL_MAP
@@ -325,6 +325,7 @@
 {
    value_.uint_ = value;
 }
+#endif // defined(JSON_HAS_INT64)
 
 Value::Value( double value )
    : type_( realValue )