Skip to content

Json::Value constructor: Accept any arithmetic type. #66

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 8 commits into from
Closed

Json::Value constructor: Accept any arithmetic type. #66

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e384e49
Merge pull request #63 from dreifachstein/master
cdunn2001 Nov 5, 2014
021f7de
Json::Value constructor: Accept any arithmetic type.
Nov 7, 2014
7ba2c54
Improve comments on arithmetic type constructor and helper traits.
Nov 8, 2014
1787b6d
Make 64-bit int work with 'long int' and 'int64_t' for 64 bit builds …
orodbhen Nov 7, 2014
7e29d49
Only use fix-width types for C++11 (Issue #64)
orodbhen Nov 9, 2014
337b0d2
Json::Value constructor: Accept any arithmetic type.
Nov 7, 2014
e555666
Improve comments on arithmetic type constructor and helper traits.
Nov 8, 2014
5512aaa
Merge branch 'accept_all_arithmetic_types' of https://github.com/open…
Nov 10, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Make 64-bit int work with 'long int' and 'int64_t' for 64 bit builds … 
…(Issue #64)
  • Loading branch information
@orodbhen @cdunn2001
orodbhen authored and cdunn2001 committed Nov 9, 2014
commit 1787b6d122ee903a64be7f0f7eab902f1875b091
5 changes: 3 additions & 2 deletions include/json/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@
#define JSONCPP_DEPRECATED(message)
#endif // if !defined(JSONCPP_DEPRECATED)

#include <stdint.h>
namespace Json {
typedef int Int;
typedef unsigned int UInt;
Expand All @@ -100,8 +101,8 @@ typedef unsigned int LargestUInt;
typedef __int64 Int64;
typedef unsigned __int64 UInt64;
#else // if defined(_MSC_VER) // Other platforms, use long long
typedef long long int Int64;
typedef unsigned long long int UInt64;
typedef int64_t Int64;
typedef uint64_t UInt64;
#endif // if defined(_MSC_VER)
typedef Int64 LargestInt;
typedef UInt64 LargestUInt;
Expand Down