798 Commits

Author SHA1 Message Date
Christopher Dunn
3cde9a9912 Merge pull request #604 from AbigailBuccaneer/gcc6-unique-ptr
Use std::unique_ptr correctly across compiler and language versions
2017-04-23 01:12:31 -05:00
AbigailBuccaneer
347e1ae46b Use unique_ptr instead of auto_ptr when possible
Previously we only used it on GCC 6 to avoid deprecated declaration
warnings. Now we are proactive and use it whenever compiling as C++11
(or MSVC2010+).

It also moves the logic for deciding between unique_ptr and auto_ptr
into a single location in config.h.

This fixes some use cases that were previously broken, including:
* CXX=clang++ -std=c++11 -Werror=deprecated-declarations
* CXX=g++-6 -std=c++03 -Werror=deprecated-declarations
2017-04-21 15:50:11 +01:00
AbigailBuccaneer
1335f70bbb Use std::unique_ptr instead of std::scoped_ptr
scoped_ptr has never been a part of the C++ standard - perhaps it's been
confused with boost::scoped_ptr. Anyhow, std::unique_ptr is the
replacement for the now-deprecated std::auto_ptr.
2017-04-21 15:44:02 +01:00
Christopher Dunn
3eda8a63ca Merge pull request #491 from mwiesenberger/0.y.z
workaround for cuda 7.5 nvcc compiler
2016-06-27 18:44:51 -05:00
Matthias
0e3fffd242 workaround for cuda 7.5 nvcc compiler 2016-06-27 15:38:56 +02:00
Christopher Dunn
5ec82e482c 0.10.6 <- 0.10.5 0.10.6 2016-04-22 00:28:53 -05:00
Christopher Dunn
b84332249b Merge pull request #463 from jmealins/fix-errors-as-warnings
Fix JSONCPP_WITH_WARNING_AS_ERROR
2016-04-21 04:12:43 -05:00
jmealins
cb3b38c3ea fix if alignment 2016-04-20 15:04:27 -07:00
jmealins
226f7a2b6b Fix JSONCPP_WITH_WARNING_AS_ERROR
in 0.y.z branch -Werror was always being added regardless of the
what JSONCPP_WITH_WARNING_AS_ERROR was set to. Additionally,
-std=c++11 was being set on Clang builds.
2016-04-20 14:31:46 -07:00
Christopher Dunn
d2fc18af7f Merge pull request #446 from ya1gaurav/patch-37
NORETURN for throw functions in 0.x.y branch
2016-03-17 20:54:48 -05:00
Gaurav
aec261a899 NORETURN for throw functions in 0.x.y branch
Added in definition also.
2016-03-16 11:23:36 +05:30
Gaurav
20564b3f0c NORETURN for throw functions in 0.x.y branch
Resolve issue - https://github.com/open-source-parsers/jsoncpp/issues/389
2016-03-16 11:22:18 +05:30
Benjamin Knecht
0fc51120c0 Add test code for precision
Conflicts:
	src/test_lib_json/main.cpp
2016-02-06 09:32:31 -06:00
Benjamin Knecht
4a984c24b5 making precision unsigned int
adding precision as settings value for StreamBuilder

Conflicts:
	src/lib_json/json_writer.cpp
2016-02-06 09:32:30 -06:00
Benjamin Knecht
2f9a6a682c Create format string with sprintf.
For now use hardcoded precision '17' for now
2016-02-06 09:32:30 -06:00
Christopher Dunn
26159b96f1 Merge pull request #413 from cdunn2001/debian-patches
Debian patches - 0.y.z branch

See #411.
  http://anonscm.debian.org/cgit/collab-maint/libjsoncpp.git/tree/debian/patches
2016-02-06 09:31:31 -06:00
Christopher Dunn
e105003bb5 gcc-6 lacks auto_ptr<> 2016-02-06 08:24:20 -06:00
Christopher Dunn
dde8426ded 0001-multiarch-path-support.patch 2016-02-06 08:10:54 -06:00
Christopher Dunn
ecfd658e6a 0003-fix-arm.patch
Already applied to 0.y.x branch.
2016-02-06 08:04:11 -06:00
Christopher Dunn
eec6794106 fix-double-parsing.patch 2016-02-06 08:03:34 -06:00
Christopher Dunn
0ea25978d5 0004-fix-include-path.patch 2016-02-06 07:58:50 -06:00
Christopher Dunn
9297822cde Merge pull request #349 from cdunn2001/special-floats
Merge pull request #339 from Dani-Hub/master
2015-09-05 12:22:37 -05:00
Christopher Dunn
a4354d782b Merge pull request #339 from Dani-Hub/master
Floating-point NaN or Infinity values should be allowed as a feature …
2015-09-05 12:16:28 -05:00
Christopher Dunn
a7b80fea65 Merge pull request #337 from AMDmi3/patch-1
Specify float constant as float
2015-09-05 12:08:45 -05:00
Robert Dailey
8bdb07dd52 Clean up cmake END* (again)
(I missed a couple. ~cd)
2015-08-14 14:48:45 -07:00
Robert Dailey
22dade5c97 Clean up cmake END*
* Clean up closing statements for if conditions, functions, macros,
  and other entities. Newer versions of CMake do not require you to
  redundantly respecify the parameters to the opening arguments.
2015-08-14 14:42:55 -07:00
Christopher Dunn
1380aff595 add .gitattributes
helps #325
2015-08-09 17:11:16 -07:00
Christopher Dunn
8644269675 normalized some windows VS stuff 2015-08-09 17:11:00 -07:00
Robert Dailey
28dcc3589a Normalize line endings
This commit contains nothing but line ending normalization
changes. These changes were performed after the introduction
of .gitattributes into the repository.
2015-08-09 17:10:47 -07:00
Robert Dailey
aaf3417654 Add .gitattributes file 2015-08-09 17:10:28 -07:00
Aaron Jacobs
22ec823cc7 Remove undefined behavior from a left shift of a negative value.
Fixed by shifting a positive value, then negating the result.

(Credit: Richard Trieu)
2015-08-09 11:05:22 -07:00
Jörg Krause
ffea45bbe1 Remove Werror
-Werror shouldn't be used in released code since it can cause random build
failures on moderate warnings. It also depends on the used toolchain since
different toolchains may or may not print the same warnings.
2015-08-09 11:05:22 -07:00
Michael Shields
1b32e3e869 Fix cases where the most negative signed integer was negated, causing
undefined behavior.
2015-08-09 11:04:09 -07:00
Christopher Dunn
18e4d04e8e merged from 1.6.5 0.10.5 2015-07-23 00:32:47 -05:00
Christopher Dunn
d84702c903 1.6.5 1.6.5 2015-07-23 00:26:13 -05:00
Christopher Dunn
949babd7b0 Exceptions declared in header
resolves #272
2015-07-23 00:26:13 -05:00
Christopher Dunn
6ed877c77c correction for #316 2015-07-23 00:26:13 -05:00
Christopher Dunn
1c69568f8d Merge pull request #316 from filipjs/master
Update json_tool.h

typo in a comment
2015-07-17 06:44:33 -05:00
filipjs
770fdda28b Update json_tool.h
Fix a typo in comment.
2015-07-14 14:34:07 +02:00
Christopher Dunn
d48bff5fcb gcc-4.6 in Travis
and clang-3.0, the default
0.10.4
2015-07-12 15:02:28 -05:00
Christopher Dunn
93d74678da Merge pull request #315 from cdunn2001/0.y.z
-Werror

and fixed a minor bug found by -Wshadow
2015-07-12 14:52:00 -05:00
Christopher Dunn
ed5d73fe1d 0.6.4 2015-07-12 14:47:59 -05:00
Christopher Dunn
b97e624ac1 -Werror 2015-07-12 14:47:58 -05:00
Christopher Dunn
542354902e fixed a bug found by -Wshadow 2015-07-12 14:47:37 -05:00
Christopher Dunn
17360f3d4b fix some warnings 2015-07-12 14:47:37 -05:00
Christopher Dunn
75747db30c -Wshadow
* https://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html
* http://programmers.stackexchange.com/questions/122608/clang-warning-flags-for-objective-c-development/124574#124574

In clang: `-Wconversion` implies `-Wshorten-64-to-32`, but we cannot use
`-Wconversion` yet.
2015-07-12 14:47:35 -05:00
Christopher Dunn
81cf237917 Merge pull request #314 from cdunn2001/master
-Werror

plus small bug-fix
2015-07-12 14:38:02 -05:00
Christopher Dunn
cac79543f8 1.6.4
minor bug-fix
2015-07-12 14:29:53 -05:00
Christopher Dunn
d8186f36a6 -Werror 2015-07-12 14:28:55 -05:00
Christopher Dunn
7f240623d3 fixed a bug found by -Wshadow 2015-07-12 14:28:55 -05:00
Christopher Dunn
784433ac72 fix some warnings 2015-07-12 14:28:37 -05:00
Christopher Dunn
7275e3ce3c drop -Wsign-conversion 2015-07-12 12:49:57 -05:00
Christopher Dunn
46aa9d75fa -Wconversion
* https://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html
* http://programmers.stackexchange.com/questions/122608/clang-warning-flags-for-objective-c-development/124574#124574

In clang: `-Wconversion` implies `-Wshorten-64-to-32`
2015-07-12 12:39:04 -05:00
Christopher Dunn
f94a0e8989 auto-generated file with minor update 2015-07-12 12:31:43 -05:00
Christopher Dunn
e22a2f36f7 Merge pull request #313 from cdunn2001/master
`-std=c++11` for gcc builds too

There was an issue with Travis, but we seem to be past that now.

We were using only -std=c++0x for gcc, as you can see in the diff.

resolves #134
2015-07-12 12:18:28 -05:00
Christopher Dunn
fac87108a4 -std=c++11 for gcc builds too 2015-07-12 12:08:34 -05:00
Christopher Dunn
14fc9f124e Merge pull request #312 from cdunn2001/master
gcc-4.9, clang (3.0)
2015-07-12 12:04:41 -05:00
Christopher Dunn
658fa37e63 gcc-4.9, clang (3.0) 2015-07-12 11:53:49 -05:00
Christopher Dunn
02839ef5b1 Merge pull request #310 from cdunn2001/0.y.z
gcc-4.6, clang-3.3
2015-07-12 09:55:20 -05:00
Christopher Dunn
138c48b7e8 gcc-4.6, clang-3.3 2015-07-12 09:50:14 -05:00
Christopher Dunn
72fb4a5b08 valgrind in Travis 2015-07-11 14:26:11 -05:00
Christopher Dunn
c6fa959318 dockerize the Travis build
Docker builds are *much* faster in Travis.

Also, we prepare to enable C++11.
2015-07-11 14:26:11 -05:00
Christopher Dunn
056e5f9b64 Merge pull request #309 from cdunn2001/master
dockerize the Travis build, and allow C++11
2015-07-11 14:19:02 -05:00
Christopher Dunn
d8e8c14ffc valgrind in Travis 2015-07-11 14:11:45 -05:00
Christopher Dunn
fb1301274f Merge pull request #308 from cdunn2001/0.y.z
0.10.3

No significant changes.
2015-07-11 14:07:55 -05:00
Christopher Dunn
f4e6fccd46 dockerize the Travis build
Docker builds are *much* faster in Travis.

Also, we prepare to enable C++11.
2015-07-11 14:06:18 -05:00
Christopher Dunn
7670e5151b 0.10.3 2015-07-11 13:53:05 -05:00
Mike Naberezny
2e185081b2 Fix undefined name "sys"
Same as #299 (bca0eff81a1c5ef160d9858b8e89b1c919b71c1f), but an earlier
commit needed to be rebased.
2015-07-11 13:52:27 -05:00
Stuart Eichert
cb8259f545 Fix #296: Explicitly cast size_t results to unsigned when needed
This is rebased from #297, where AppVeyor had been failing, and which
was not properly based on the master branch.
2015-07-11 13:52:27 -05:00
Stuart Eichert
bb5d0249ed Warn about implicit 64 to 32 bit conversions when using clang 2015-07-11 13:52:08 -05:00
Martyn Gigg
710260d070 Allow an optional suffix on the debug library name in CMake. 2015-07-11 13:51:40 -05:00
Christopher Dunn
2428889813 1.6.3 2015-07-11 13:41:13 -05:00
Christopher Dunn
89704039a0 minor doc fix, for #302 2015-07-11 12:11:00 -05:00
Christopher Dunn
dbda2aa36f Merge pull request #307 from cdunn2001/gaurav-fix-warnings
fix warnings (-Wno-long-long and unused tokenStart)

* closes #300
* closes #301
2015-07-11 12:02:22 -05:00
Gaurav
ef38374e99 Gcc warning unused "tokenStart"
(was #301)

In `0.y.z` branch, `tokenStart` is not used.
Comment it as done in other cases.
2015-07-11 11:57:21 -05:00
Gaurav
f1cafb6ded GCC warning removal for long long
(was #300)

I got below warning message on x86 linux machine :
```
"jsoncpp-0.10.2-p1/include/json/config.h💯 warning: ISO C++ 1998 does not support ‘long long’"
gcc version 4.4.7 20120313 (Red Hat 4.4.7-4) (GCC)
```
In reference to

* https://github.com/open-source-parsers/jsoncpp/pull/292

**long long** is supported in c++-11; for old compilers i.e `0.y.z` branch this patch should be merged.
2015-07-11 11:55:13 -05:00
Christopher Dunn
a13303e456 Merge pull request #306 from cdunn2001/0.y.z
fix appveyor 32-bit windows build
2015-07-11 11:52:16 -05:00
Christopher Dunn
7bc97db496 fix appveyor 32-bit windows build
* http://help.appveyor.com/discussions/problems/2229-v140-not-found-on-vs2105rc
```
Done Building Project "C:\projects\jsoncpp\jsoncpp.sln" (default targets) -- FAILED.

Build FAILED.

"C:\projects\jsoncpp\jsoncpp.sln" (default target) (1) ->
"C:\projects\jsoncpp\ALL_BUILD.vcxproj.metaproj" (default target) (2) ->
"C:\projects\jsoncpp\ZERO_CHECK.vcxproj" (default target) (3) ->
(PlatformPrepareForBuild target) ->
  C:\Program Files (x86)\MSBuild\Microsoft.Cpp\v4.0\V120\Microsoft.Cpp.Platform.targets(64,5): error MSB8020: The build tools for v140 (Platform Toolset = 'v140') cannot be found. To build using the v140 build tools, please install v140 build tools.  Alternatively, you may upgrade to the current Visual Studio tools by selecting the Project menu or right-click the solution, and then selecting "Upgrade Solution...". [C:\projects\jsoncpp\ZERO_CHECK.vcxproj]
```
2015-07-11 11:36:28 -05:00
Christopher Dunn
6ca8ffcb91 Merge pull request #305 from cdunn2001/fix-fixeol-undefined-name-sys
Fix undefined name "sys"

Same as #299 (bca0eff), but an earlier commit needed to be rebased.
2015-07-11 11:17:09 -05:00
Mike Naberezny
b5e70f950e Fix undefined name "sys"
Same as #299 (bca0eff81a1c5ef160d9858b8e89b1c919b71c1f), but an earlier
commit needed to be rebased.
2015-07-11 11:15:43 -05:00
Christopher Dunn
b26804d1c2 Merge pull request #304 from cdunn2001/297
Same as #297 (1c4f274ab32594d717fc442a0f8a68d9e7633637), but properly rebased
2015-07-11 11:08:47 -05:00
Stuart Eichert
702a539762 Fix #296: Explicitly cast size_t results to unsigned when needed
This is rebased from #297, where AppVeyor had been failing, and which
was not properly based on the master branch.
2015-07-11 11:00:18 -05:00
Stuart Eichert
81cb7e5c5b Warn about implicit 64 to 32 bit conversions when using clang 2015-07-11 10:59:56 -05:00
Christopher Dunn
d259f608fd Merge pull request #303 from cdunn2001/appveyor-14.0
fix appveyor 32-bit windows build

I've backed rebased under #297 because AppVeyor has been failing since there, and because that was not properly based on master anyway.
2015-07-11 10:58:59 -05:00
Christopher Dunn
4652f818fe fix appveyor 32-bit windows build
* http://help.appveyor.com/discussions/problems/2229-v140-not-found-on-vs2105rc
```
Done Building Project "C:\projects\jsoncpp\jsoncpp.sln" (default targets) -- FAILED.

Build FAILED.

"C:\projects\jsoncpp\jsoncpp.sln" (default target) (1) ->
"C:\projects\jsoncpp\ALL_BUILD.vcxproj.metaproj" (default target) (2) ->
"C:\projects\jsoncpp\ZERO_CHECK.vcxproj" (default target) (3) ->
(PlatformPrepareForBuild target) ->
  C:\Program Files (x86)\MSBuild\Microsoft.Cpp\v4.0\V120\Microsoft.Cpp.Platform.targets(64,5): error MSB8020: The build tools for v140 (Platform Toolset = 'v140') cannot be found. To build using the v140 build tools, please install v140 build tools.  Alternatively, you may upgrade to the current Visual Studio tools by selecting the Project menu or right-click the solution, and then selecting "Upgrade Solution...". [C:\projects\jsoncpp\ZERO_CHECK.vcxproj]
```
2015-07-11 10:53:13 -05:00
Christopher Dunn
ce32274ba5 Merge pull request #295 from martyngigg/master
Allow an optional suffix on the debug library name in CMake
2015-07-01 03:18:33 -05:00
Martyn Gigg
717c791d4e Allow an optional suffix on the debug library name in CMake. 2015-06-29 19:20:08 +01:00
Christopher Dunn
17181acf74 Merge remote-tracking branch 'up/master' into 0.y.z
fix ,/. problem in #294
2015-06-19 00:11:52 -05:00
Christopher Dunn
6e52e272da Merge pull request #294 from cdunn2001/master
fix ,/. problem in reader
2015-06-19 00:10:32 -05:00
Christopher Dunn
6416350438 fix ,/. problem in reader
fixes #293
2015-06-18 22:45:36 -05:00
Christopher Dunn
07623b71f2 Merge branch 'master' into 0.y.z 2015-06-18 22:34:40 -05:00
Christopher Dunn
bcb83b921c fix doxybuild.py for Windows
issue #287 (tylerknott@)
2015-06-18 22:26:44 -05:00
Christopher Dunn
f1ff13767c Merge pull request #291 from cdunn2001/0.y.z
fix #290
2015-06-10 22:05:45 -05:00
Christopher Dunn
2760c7902a fix #290 0.10.2-p1 2015-06-10 21:22:24 -05:00
Christopher Dunn
3f05b1a897 Merge pull request #276 from bmyerz/master
make the unix cmake example work
2015-05-21 00:47:35 -05:00
Christopher Dunn
de2c85f576 Merge pull request #282 from keithkml/patch-1
Clarify which parts of README for users vs devs
2015-05-20 20:33:31 -05:00
Christopher Dunn
b389d81bf9 Merge pull request #280 from mgorny/pkg-config-fix
Fix custom includedir & libdir substitution in pkg-config
2015-05-20 20:24:37 -05:00
Keith Lea
89c51f3457 Clarify which parts of README for users vs devs
When I arrived at the JsonCpp GitHub page, as an intermediate C++ developer, I could not figure out how to include JsonCpp into my project. The changes I propose to the README make this much clearer, and define a clear distinction between which instructions are for those developing and contributing to JsonCpp, and those who are just using it.
2015-05-20 09:43:47 -07:00
Michał Górny
e6f1cffdd3 Fix custom includedir & libdir substitution in pkg-config
Do not prepend ${prefix} to substituted includedir & libdir
in the pkg-config file -- if the paths are overriden by user, CMake puts
absolute paths there (even if user specifies a relative path). Instead,
use the absolute path provided by CMake and appropriately default
LIBRARY_INSTALL_DIR & INCLUDE_INSTALL_DIR to absolute paths with
${CMAKE_INSTALL_PREFIX} prepended.

Fixes: https://github.com/open-source-parsers/jsoncpp/issues/279
Signed-off-by: Michał Górny <mgorny@gentoo.org>
2015-05-19 17:32:31 +02:00
Christopher Dunn
64441486ac Merge pull request #275 from stefan-it/stefan/cmake-generator-fix
[Documentation][Markdown] Use correct help option for cmake.
2015-05-19 01:53:11 -05:00