generic-library/jsoncpp
1
0
Fork 0
mirror of https://github.com/open-source-parsers/jsoncpp.git synced 2024-12-12 18:10:27 +01:00
Code Issues Projects Releases Wiki Activity
871 Commits 2 Branches 55 Tags 9 MiB
b9afdf190d
Commit Graph

871 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christopher Dunn
b9afdf190d Use int64_t for 64bit ints 
resolves #509
 2016-08-21 19:58:43 -05:00
Christopher Dunn
80a82ea269 Optional space after comma 
resolves #513
 2016-08-21 16:35:19 -05:00
Christopher Dunn
f78f685bab Remove needless if. 
resolves #516
 2016-08-21 16:31:14 -05:00
Christopher Dunn
7d8eddb98c Merge pull request #519 from open-source-parsers/fix-517 
Avoid null for stringValue
 2016-08-21 16:30:28 -05:00
Christopher Dunn
7e0571b444 Avoid null for stringValue 
fixes #517
 2016-08-21 16:25:29 -05:00
Christopher Dunn
b14c8c1423 Merge pull request #502 from open-source-parsers/null-object 
Allow dtor for nullSingleton
 2016-07-20 22:28:44 -07:00
Christopher Dunn
b299d3581f Allow dtor for nullSingleton 
re #488 and #490
 2016-07-20 11:31:41 -07:00
Christopher Dunn
48d2a69d47 1.7.4 <- 1.7.3 2016-07-09 13:27:28 -05:00
Christopher Dunn
772e257fc9 Merge pull request #493 from zorun/master 
Fix compilation errors for downstream projects caused by incorrect pkconfig paths
 2016-07-08 17:02:30 -05:00
Baptiste Jonglez
101fcf0806 Fix compilation errors for downstream projects caused by incorrect pkgconfig paths 
Recent commit 911e2b0fea ("By default use <prefix> relative paths when
installing") introduced relative install paths in CMake.  But this
interacts badly with commit e6f1cffdd3 from a year ago: now, the paths in
`pkgconfig/jsoncpp.pc` are relative, which is incorrect.

Before 911e2b0fea (1.7.2 on Archlinux), this was correct:

    $ head -4 /usr/lib/pkgconfig/jsoncpp.pc
    prefix=/usr
    exec_prefix=${prefix}
    libdir=/usr/lib
    includedir=/usr/include

After 911e2b0fea (1.7.3 on Archlinux), this is now incorrect:

    $ head -4 /usr/lib/pkgconfig/jsoncpp.pc
    prefix=/usr
    exec_prefix=${prefix}
    libdir=lib
    includedir=include

This change causes hard-to-debug compilation errors for projects that
depend on jsoncpp, for instance:

    CXXLD    libring.la
    /tmp/ring-daemon/src/ring-daemon/src/../libtool: line 7486: cd: lib: No such file or directory
    libtool:   error: cannot determine absolute directory name of 'lib'
    make[3]: *** [Makefile:679: libring.la] Error 1

This is because jsoncpp contributes `-Llib -ljsoncpp` to the LDFLAGS, via
the pkg-config machinery.  Notice the relative path in `-Llib`.

To fix this, simply revert commit e6f1cffdd3 ("Fix custom includedir &
libdir substitution in pkg-config").  The change in 911e2b0fea should have
the same effect.

See #279, #470 for references.
 2016-07-08 00:46:04 +02:00
Christopher Dunn
7e4df50d17 Merge pull request #490 from open-source-parsers/null-singleton 
Use a Myers Singleton for null
 2016-06-27 00:12:23 -05:00
Christopher Dunn
318f30357c 1.7.3 2016-06-26 19:40:43 -05:00
Christopher Dunn
0f288aecdd Use a Myers Singleton for null 
Avoid some static initialization problems.

From @marklakata
See #488
 2016-06-26 19:36:40 -05:00
Christopher Dunn
e0f9aab0bf Make internal func anon 
fixes #489
 2016-06-26 17:54:15 -05:00
Christopher Dunn
43203f1d09 Merge pull request #478 from quantumsteve/msvc_override 
Use override keyword with Visual Studio.
 2016-05-28 10:01:46 -05:00
Steven Hahn
55176b2bdd Use override keyword with Visual Studio. 2016-05-25 18:29:34 -04:00
Christopher Dunn
4356d9bba1 Merge pull request #474 from cdunn2001/fix-warning 
Fix some warnings
 2016-05-15 23:35:02 -05:00
Christopher Dunn
ea4af18317 Fix int->char conv warn 
resolves #473
 2016-05-15 23:13:56 -05:00
Christopher Dunn
b999616df8 fix warning 2016-05-15 23:13:47 -05:00
Christopher Dunn
660307d357 Merge pull request #470 from aboseley/relative_install_paths 
By default use <prefix> relative paths when installing
 2016-05-05 13:59:20 -05:00
Adam Boseley
911e2b0fea By default use <prefix> relative paths when installing 
This allows the config file to keep working
when it is installed to a non-standard location
from a make DESTDIR=<location> install
 2016-05-04 23:41:18 -07:00
Christopher Dunn
d4a49cf511 Merge pull request #466 from bkuhls/buildroot 
CMakeLists.txt: Treat conversion warning as error only with JSONCPP_W…
 2016-05-02 20:40:08 -05:00
Christopher Dunn
8bd4f943da Merge pull request #467 from jcfr/generalize-setting-of-JSONCPP_OVERRIDE 
json/config.h: Generalize setting of JSONCPP_OVERRIDE to all compilers
 2016-04-27 02:45:32 -05:00
Christopher Dunn
4018422a05 Merge pull request #465 from ds283/intel-compiler 
Add CMAKE_CXX_FLAGS for Intel compiler
 2016-04-27 02:28:41 -05:00
Jean-Christophe Fillion-Robin
ba6fa48d31 json/config.h: Generalize setting of JSONCPP_OVERRIDE to all compilers 
This commit has been adapted from InsightSoftwareConsortium/ITK@1c86090
 2016-04-25 17:35:12 -04:00
Bernd Kuhls
17fc9b1a80 CMakeLists.txt: Treat conversion warning as error only with JSONCPP_WITH_WARNING_AS_ERROR=On 
Fixes errors when building with buildroot:
http://autobuild.buildroot.net/?reason=jsoncpp-1.7.2

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
 2016-04-25 19:47:13 +02:00
ds283
6f22b0e076 Add CMAKE_CXX_FLAGS for Intel compiler 2016-04-25 14:47:05 +01:00
Christopher Dunn
980cdf0fb5 Exclude allocator.h from amalgamated header 
Nobody using SecureAllocator really needs the amalgamated header.

resolves #461
 2016-04-22 00:45:18 -05:00
Christopher Dunn
45da594e71 Merge pull request #454 from cbeiraod/master 
Small fix for strict compilers (using the flag -Werror for instance)
 2016-03-26 15:07:55 -05:00
Cristóvão B da Cruz e Silva
c8a7b445ea Small fix for strict compilers (using the flag -Werror for instance) 2016-03-26 18:41:46 +00:00
Christopher Dunn
c8054483f8 1.7.2 <- 1.7.1 
This only fixes a clang warning, but we have already
seen more than one report for it.
 2016-03-25 15:09:15 -05:00
Christopher Dunn
96d32b37ea Merge pull request #452 from cdunn2001/fix-451 
Fix a clang warning
 2016-03-24 00:27:13 -05:00
Christopher Dunn
ef2ff8754a Fix a clang warning 
Resolves #451.
 2016-03-23 22:33:18 -05:00
Christopher Dunn
b58c844579 1.7.1 <- 1.7.0 
And 1.7.0 is recalled b/c we accidentally
had SecureAlloc by default.
 2016-03-21 21:17:56 -05:00
Christopher Dunn
b803b92d11 Merge pull request #449 from cdunn2001/override-keyword 
Use macro for `override`
 2016-03-21 21:16:00 -05:00
Christopher Dunn
98e981dff9 Use macro for override 
b/c MS VS2010 is supposed to be C++11 but does not fulfull
the entire standard.

Resolves #410.
Re: #430.
 2016-03-21 21:00:24 -05:00
Christopher Dunn
1c47796479 JSONCPP_USING_SECURE_MEMORY default is 0 
Re: #410
 2016-03-21 20:44:16 -05:00
Christopher Dunn
12c67e810d Fix amalgamate.py 
Fixes #448.
 2016-03-21 20:33:34 -05:00
Christopher Dunn
c018d9fc3a Merge pull request #442 from open-source-parsers/JSONCPP_STRING 
Secure allocator available for wiping memory.

Resolves #437.
Resolves #152.
 2016-03-19 19:30:30 -05:00
dawesc
ae564653c4 -DJSONCPP_USE_SECURE_MEMORY=1 for cmake 
Add allocator.h to amalgamated header
Test JSONCPP_USE_SECURE_MEMORY in Travis
 2016-03-19 19:21:15 -05:00
dawesc
f8674c63b1 allocator.h 2016-03-19 14:37:30 -05:00
dawesc
b50a124fa6 .gitignore for eclipse 2016-03-19 14:37:30 -05:00
Christopher Dunn
59e327f50b Merge pull request #445 from ya1gaurav/patch-36 
Added NORETURN for throw functions.
 2016-03-17 20:54:26 -05:00
Gaurav
0b597b4b48 Added NORETURN for throw functions. 
Fix in definition also.
 2016-03-16 11:17:21 +05:30
Gaurav
d97ea5bf8d Added NORETURN for throw functions. 
Resolve Issue - https://github.com/open-source-parsers/jsoncpp/issues/389
 2016-03-16 11:15:09 +05:30
Christopher Dunn
e29b671ed5 Merge pull request #444 from ya1gaurav/patch-35 
Supporting GCC 6.0

Resolves #411.
 2016-03-15 19:23:17 -05:00
Gaurav
fbe1cf3916 Supporting GCC 6.0 
Fixes test with GCC-6.0
 2016-03-15 18:33:34 +05:30
Gaurav
cf86c473a5 Supporting GCC 6.0 
This patch is also needed to build success for GCC 6.0.
Refer issue - https://github.com/open-source-parsers/jsoncpp/issues/411
 2016-03-15 18:31:44 +05:30
Christopher Dawes
75570d7068 Fixing up for #define instead of typedef in secure allocators 2016-03-14 19:15:17 -05:00
Christopher Dunn
5da29e2707 Another shot at #411 2016-03-14 18:35:53 -05:00