platform/upstream/jsoncpp.git
8 years ago[TVPRDCM-7] Add "/usr/include/jsoncpp/json" link 44/64944/1 accepted/tizen_3.0_common accepted/tizen/3.0/common/20161114.110855 accepted/tizen/3.0/ivi/20161011.044312 accepted/tizen/3.0/mobile/20161015.033421 accepted/tizen/3.0/tv/20161016.004506 accepted/tizen/3.0/wearable/20161015.082711 accepted/tizen/common/20160406.145124 accepted/tizen/ivi/20160406.105823 accepted/tizen/mobile/20160406.105735 accepted/tizen/tv/20160406.105751 accepted/tizen/wearable/20160406.105806 submit/tizen/20160406.093320 submit/tizen_3.0_common/20161104.104000 submit/tizen_3.0_ivi/20161010.000003 submit/tizen_3.0_mobile/20161015.000003 submit/tizen_3.0_tv/20161015.000002 submit/tizen_3.0_wearable/20161015.000002
DongHun Kwak [Wed, 6 Apr 2016 09:27:23 +0000 (18:27 +0900)]
[TVPRDCM-7] Add "/usr/include/jsoncpp/json" link

    - Fix vd build error.

Change-Id: I5cc05681278fd55ae77341e6e45a0e9a983e57f1
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>
8 years agopackaging for Tizen & adjust Cmake options accepted/tizen/ivi/20160218.024703 accepted/tizen/mobile/20160122.030025 accepted/tizen/tv/20160122.030118 accepted/tizen/wearable/20160122.030155 submit/tizen/20160119.054212 submit/tizen_common/20160218.142243 submit/tizen_ivi/20160217.000000 submit/tizen_ivi/20160217.000005
MyoungJune Park [Tue, 19 Jan 2016 02:11:27 +0000 (11:11 +0900)]
packaging for Tizen & adjust Cmake options

8 years agoMerge pull request #387 from joerg-krause/cmake-option-strict-iso upstream-git upstream/1.6.5
Christopher Dunn [Fri, 30 Oct 2015 06:16:49 +0000 (01:16 -0500)]
Merge pull request #387 from joerg-krause/cmake-option-strict-iso

Disable -pedantic conditionally; add -pedantic-errors and -Werror conditionally

8 years agoEnable -Werror with JSONCPP_WITH_WARNING_AS_ERROR
Jörg Krause [Thu, 29 Oct 2015 08:19:41 +0000 (09:19 +0100)]
Enable -Werror with JSONCPP_WITH_WARNING_AS_ERROR

Commit 912d55094d2f3b777bcb48a76c2ed32447c7795e disabled '-Werror'. Enable it
if jsoncpp is build with JSONCPP_WITH_WARNING_AS_ERROR=ON.

8 years agoAdd option JSONCPP_WITH_STRICT_ISO
Jörg Krause [Tue, 27 Oct 2015 21:45:17 +0000 (22:45 +0100)]
Add option JSONCPP_WITH_STRICT_ISO

'-pedantic' issues all warnings demanded by strict ISO C/C++; rejecting
extensions that do not follow ISO C/C++. Without this option, certain GNU
extensions and traditional C/C++ features are supported as well.

With this option enabled building jsoncpp fails with the musl toolchain on
x86 because of an incompatible posix_memalign declaration [1]. Without
'-pedantic' there is no error anymore and jsoncpp builds fine.

Add an option JSONCPP_WITH_STRICT_ISO to disable compilation with '-pedantic'
with GCC. If jsoncpp is build with the JSONCPP_WITH_WARNING_AS_ERROR option
'-pedantic-errors' is used instead.

[1] https://gcc.gnu.org/ml/gcc-patches/2015-05/msg01425.html

8 years agoMerge pull request #384 from EvinceMoi/master
Christopher Dunn [Tue, 27 Oct 2015 20:48:05 +0000 (15:48 -0500)]
Merge pull request #384 from EvinceMoi/master

json_reader throwRuntimeError return error details

8 years agojson_reader throwRuntimeError return error details instead of hard-coded message
Evince [Tue, 27 Oct 2015 16:22:46 +0000 (00:22 +0800)]
json_reader throwRuntimeError return error details instead of hard-coded message

Signed-off-by: Evince <baneyue@gmail.com>
8 years agoMerge pull request #267 from cdunn2001/moveSemantics
Christopher Dunn [Wed, 21 Oct 2015 06:13:59 +0000 (01:13 -0500)]
Merge pull request #267 from cdunn2001/moveSemantics

move ctors

8 years agoMinor
Christopher Dunn [Tue, 20 Oct 2015 04:49:07 +0000 (23:49 -0500)]
Minor

adjustments, based on comments in PR.

8 years agomove ctors
Motti [Mon, 20 Apr 2015 14:44:47 +0000 (17:44 +0300)]
move ctors

* Add move constructor to Value::CZString
* Add unit test for Value move constructor
* Allow includer to specify in advance the value for
JSON_HAS_RVALUE_REFERENCES

8 years agoSome indentation
Christopher Dunn [Tue, 20 Oct 2015 04:40:47 +0000 (23:40 -0500)]
Some indentation

in anticipation of another change.

8 years agoMerge pull request #382 from cdunn2001/ccache
Christopher Dunn [Tue, 20 Oct 2015 03:50:41 +0000 (22:50 -0500)]
Merge pull request #382 from cdunn2001/ccache

Support ccache

8 years agoSupport ccache
Christopher Dunn [Mon, 19 Oct 2015 17:10:58 +0000 (12:10 -0500)]
Support ccache

http://stackoverflow.com/a/24305849/263998

8 years agoMerge pull request #381 from bknecht/precision
Christopher Dunn [Thu, 15 Oct 2015 21:15:15 +0000 (16:15 -0500)]
Merge pull request #381 from bknecht/precision

Resolves #284

8 years agoAdd test code for precision
Benjamin Knecht [Thu, 15 Oct 2015 16:32:24 +0000 (18:32 +0200)]
Add test code for precision

8 years agomaking precision unsigned int
Benjamin Knecht [Thu, 15 Oct 2015 16:00:42 +0000 (18:00 +0200)]
making precision unsigned int
adding precision as settings value for StreamBuilder

8 years agoCreate format string with sprintf.
Benjamin Knecht [Thu, 15 Oct 2015 15:28:56 +0000 (17:28 +0200)]
Create format string with sprintf.

For now use hardcoded precision '17' for now

8 years agoMerge pull request #379 from cdunn2001/issue-377
Christopher Dunn [Sat, 10 Oct 2015 22:20:37 +0000 (17:20 -0500)]
Merge pull request #379 from cdunn2001/issue-377

Iterator conversions

8 years agofix
ycqiu [Tue, 6 Oct 2015 08:46:19 +0000 (16:46 +0800)]
fix

In value.h, ValueConstIterator can convert to ValueIterator, I think that is a bug. the correct way is ValueIterator can convert to ValueConstIterator.

8 years agoadd test code
ycqiu [Thu, 8 Oct 2015 13:53:14 +0000 (21:53 +0800)]
add test code

does not compile

8 years agoMerge pull request #373 from antonindrawan/QNX_support
Christopher Dunn [Sun, 4 Oct 2015 19:54:09 +0000 (14:54 -0500)]
Merge pull request #373 from antonindrawan/QNX_support

Compiles jsoncpp with QNX 6.6

8 years agoMerge pull request #375 from Dani-Hub/issue-374-remove-defaulted-ctor
Christopher Dunn [Sat, 3 Oct 2015 21:03:27 +0000 (16:03 -0500)]
Merge pull request #375 from Dani-Hub/issue-374-remove-defaulted-ctor

Remove defaulted default constructor

8 years agoRemove defaulted default constructor
drgler [Sat, 3 Oct 2015 17:40:23 +0000 (19:40 +0200)]
Remove defaulted default constructor

8 years agoCompiles jsoncpp with QNX 6.6
Anton Indrawan [Fri, 2 Oct 2015 15:49:02 +0000 (17:49 +0200)]
Compiles jsoncpp with QNX 6.6

8 years agoMerge pull request #371 from mathstuf/more-platform-support
Christopher Dunn [Sat, 3 Oct 2015 08:58:20 +0000 (03:58 -0500)]
Merge pull request #371 from mathstuf/more-platform-support

json_writer: improve isfinite support on *nix

8 years agojson_writer: improve isfinite support on *nix
Ben Boeckel [Thu, 1 Oct 2015 17:20:37 +0000 (13:20 -0400)]
json_writer: improve isfinite support on *nix

Based on a patches to CMake by:

Ådne Hovda <ahovda@openit.com>:

    commit 7b1cdb00279908cacabada92f8a53e4986465423

    jsoncpp: Provide 'isfinite' implementation on older AIX and HP-UX

    Newer AIX and HP-UX platforms provide 'isfinite' as a <math.h> macro.
    Older versions do not, so add the definition if it is not provided.

Michael Scott <michael.scott@gbgplc.com>:

    commit 9217b678b305d7df7471ba476a81bf28961fdfa3

    jsoncpp: Provide 'isfinite' impl on more HP-UX versions (#15576)

    Some versions of HP-UX do not define 'isfinite' or 'finite' in math.h
    for Itanium when preprocessing with C++, so we have to add the
    definition ourselves instead to map to the internal version.

Joerg Sonnenberger <joerg@bec.de>:

    commit 75644dafe54c21902f14cfe58cb8338b553b69d8

    jsoncpp: Fix compilation as C99 on Solaris

    In C99 mode, Solaris variants may already define isfinite, so check for
    the existence first.

8 years agoMerge pull request #368 from mathstuf/export-factory-inner-class
Christopher Dunn [Mon, 28 Sep 2015 22:06:34 +0000 (17:06 -0500)]
Merge pull request #368 from mathstuf/export-factory-inner-class

reader: export CharReader::Factory

8 years agoFix VS warnings
Christopher Dunn [Mon, 28 Sep 2015 22:04:23 +0000 (17:04 -0500)]
Fix VS warnings

These don't really need to be const.

resolves #369

8 years agoreader: export CharReader::Factory
Ben Boeckel [Mon, 28 Sep 2015 19:45:11 +0000 (15:45 -0400)]
reader: export CharReader::Factory

8 years agoMerge pull request #367 from Dani-Hub/issue-350-unique_ptr-2
Christopher Dunn [Mon, 28 Sep 2015 16:27:29 +0000 (11:27 -0500)]
Merge pull request #367 from Dani-Hub/issue-350-unique_ptr-2

__cplusplus value should not be used to decide for std::unique_ptr

resolves #350

8 years ago__cplusplus value should not be used to decide for std::unique_ptr #350:
drgler [Sun, 6 Sep 2015 14:13:06 +0000 (16:13 +0200)]
__cplusplus value should not be used to decide for std::unique_ptr #350:

In addition to the C++ language version define __cplusplus also check _CPPLIB_VER for better Dinkumware support.

8 years agoFully init OurReader
Christopher Dunn [Wed, 23 Sep 2015 14:44:58 +0000 (09:44 -0500)]
Fully init OurReader

See #363, similar to #364.

8 years agoMerge pull request #364 from ya1gaurav/patch-28
Christopher Dunn [Wed, 23 Sep 2015 14:41:17 +0000 (09:41 -0500)]
Merge pull request #364 from ya1gaurav/patch-28

Have default ctor for OurFeatures

8 years agoMake OurFeatures ctor as default.
Gaurav [Wed, 23 Sep 2015 04:12:26 +0000 (09:42 +0530)]
Make OurFeatures ctor as default.

Please review suggested changes.

8 years agoMerge pull request #366 from ya1gaurav/patch-30
Christopher Dunn [Tue, 22 Sep 2015 10:09:33 +0000 (05:09 -0500)]
Merge pull request #366 from ya1gaurav/patch-30

parseCommandLine also throws

8 years agoMerge pull request #365 from ya1gaurav/patch-29
Christopher Dunn [Tue, 22 Sep 2015 10:08:56 +0000 (05:08 -0500)]
Merge pull request #365 from ya1gaurav/patch-29

Remove conditional check for isMultiLine

8 years agoparseCommandLine also throws
Gaurav [Tue, 22 Sep 2015 08:23:19 +0000 (13:53 +0530)]
parseCommandLine also throws

Catching exceptions thrown by parseCommandLine (std::bad_alloc & std::length_error) also.

8 years agoRemove conditional check for isMultiLine
Gaurav [Tue, 22 Sep 2015 04:18:54 +0000 (09:48 +0530)]
Remove conditional check for isMultiLine

At all 3 places isMultiLine is checked in for loop :
for (int index = 0; index < size && !isMultiLine; ++index) {
It means !isMultiLine is always true (otherwise do not enter loop), so || condition does not depend on isMultiLine, so removed that.

8 years agoAdd default value of stackLimit couple of places
Gaurav [Mon, 21 Sep 2015 12:35:15 +0000 (18:05 +0530)]
Add default value of stackLimit couple of places

stackLimit default value is missing at two places.Adding them.

8 years agoMerge pull request #348 from cdunn2001/override-keyword
Christopher Dunn [Sat, 5 Sep 2015 17:12:37 +0000 (12:12 -0500)]
Merge pull request #348 from cdunn2001/override-keyword

C++11: override keyword

8 years agoC++11: override keyword
Gaurav [Fri, 4 Sep 2015 08:34:43 +0000 (14:04 +0530)]
C++11: override keyword

Source : http://en.cppreference.com/w/cpp/language/override

8 years agoMerge pull request #339 from Dani-Hub/master
Christopher Dunn [Sat, 5 Sep 2015 16:59:54 +0000 (11:59 -0500)]
Merge pull request #339 from Dani-Hub/master

Floating-point NaN or Infinity values should be allowed as a feature …

8 years agoFix number reading in the presence of Infinity: Only check for infinity if we have...
drgler [Sat, 5 Sep 2015 12:49:33 +0000 (14:49 +0200)]
Fix number reading in the presence of Infinity: Only check for infinity if we have a leading sign character.

8 years agoAdjust whitespace formatting
drgler [Sat, 5 Sep 2015 12:48:29 +0000 (14:48 +0200)]
Adjust whitespace formatting

8 years agoMerge pull request #2 from BillyDonahue/billy_danihub_fix
Daniel Krügler [Sat, 5 Sep 2015 11:38:04 +0000 (13:38 +0200)]
Merge pull request #2 from BillyDonahue/billy_danihub_fix

Billy danihub fix

8 years agodon't need out field of TestData
Billy Donahue [Sat, 5 Sep 2015 08:22:18 +0000 (04:22 -0400)]
don't need out field of TestData

8 years agoprettier test
Billy Donahue [Sat, 5 Sep 2015 08:07:56 +0000 (04:07 -0400)]
prettier test

8 years agoexpanded Infinity test
Billy Donahue [Sat, 5 Sep 2015 07:48:38 +0000 (03:48 -0400)]
expanded Infinity test

8 years agoFloating-point NaN or Infinity values should be allowed as a feature #209
drgler [Thu, 3 Sep 2015 20:19:22 +0000 (22:19 +0200)]
Floating-point NaN or Infinity values should be allowed as a feature #209

Introduce 'allowSpecialFloats' for readers and 'useSpecialFloats' for writers, use consistent macro snprintf definition for writers and readers, provide new unit tests for #209

8 years agoFloating-point NaN or Infinity values should be allowed as a feature #209
drgler [Thu, 3 Sep 2015 20:19:22 +0000 (22:19 +0200)]
Floating-point NaN or Infinity values should be allowed as a feature #209

Introduce 'allowSpecialFloats' for readers and 'useSpecialFloats' for writers, use consistent macro snprintf definition for writers and readers, provide new unit tests for #209

8 years agoMerge pull request #337 from AMDmi3/patch-1
Christopher Dunn [Sat, 22 Aug 2015 01:45:37 +0000 (20:45 -0500)]
Merge pull request #337 from AMDmi3/patch-1

Specify float constant as float

8 years agoSpecify float constant as float
Dmitry Marakasov [Fri, 21 Aug 2015 18:19:26 +0000 (21:19 +0300)]
Specify float constant as float

Otherwise, on some 32 bit platforms this may not fit into long and compilation will fail:

    src/test_lib_json/main.cpp:1260: error: integer constant is too large for 'long' type

8 years agoClean up cmake END* (again)
Robert Dailey [Thu, 6 Aug 2015 15:17:09 +0000 (10:17 -0500)]
Clean up cmake END* (again)

(I missed a couple. ~cd)

8 years agoMerge pull request #332 from cdunn2001/END
Christopher Dunn [Fri, 14 Aug 2015 21:40:42 +0000 (14:40 -0700)]
Merge pull request #332 from cdunn2001/END

Clean up cmake END*

8 years agoClean up cmake END*
Robert Dailey [Thu, 6 Aug 2015 15:17:09 +0000 (10:17 -0500)]
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.

8 years agoMerge pull request #327 from cdunn2001/more-gitattributes
Christopher Dunn [Sun, 9 Aug 2015 23:38:21 +0000 (16:38 -0700)]
Merge pull request #327 from cdunn2001/more-gitattributes

More gitattributes

8 years agoadd .gitattributes
Christopher Dunn [Sun, 9 Aug 2015 22:42:06 +0000 (15:42 -0700)]
add .gitattributes

helps #325

8 years agonormalized some windows VS stuff
Christopher Dunn [Sun, 9 Aug 2015 22:53:23 +0000 (15:53 -0700)]
normalized some windows VS stuff

8 years agoMerge pull request #326 from rcdailey/git-attributes
Christopher Dunn [Sun, 9 Aug 2015 23:23:20 +0000 (16:23 -0700)]
Merge pull request #326 from rcdailey/git-attributes

Introduce .gitattributes file and normalize line endings

8 years agoNormalize line endings
Robert Dailey [Sun, 9 Aug 2015 22:58:59 +0000 (17:58 -0500)]
Normalize line endings

This commit contains nothing but line ending normalization
changes. These changes were performed after the introduction
of .gitattributes into the repository.

8 years agoAdd .gitattributes file
Robert Dailey [Sun, 9 Aug 2015 22:56:16 +0000 (17:56 -0500)]
Add .gitattributes file

8 years agoRemove undefined behavior from a left shift of a negative value.
Aaron Jacobs [Mon, 3 Aug 2015 00:58:29 +0000 (10:58 +1000)]
Remove undefined behavior from a left shift of a negative value.

Fixed by shifting a positive value, then negating the result.

(Credit: Richard Trieu)

8 years agoMerge pull request #323 from joerg-krause/master
Christopher Dunn [Sun, 2 Aug 2015 20:48:38 +0000 (15:48 -0500)]
Merge pull request #323 from joerg-krause/master

Remove -Werror

8 years agoRemove Werror
Jörg Krause [Thu, 30 Jul 2015 21:47:05 +0000 (23:47 +0200)]
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.

8 years agoMerge pull request #320 from shields/negation-overflow
Christopher Dunn [Tue, 28 Jul 2015 16:35:52 +0000 (11:35 -0500)]
Merge pull request #320 from shields/negation-overflow

Fix cases where the most negative signed integer was negated, causing undefined behavior.

8 years agoFix cases where the most negative signed integer was negated, causing
Michael Shields [Mon, 27 Jul 2015 23:35:19 +0000 (16:35 -0700)]
Fix cases where the most negative signed integer was negated, causing
undefined behavior.

8 years ago1.6.5 1.6.5
Christopher Dunn [Thu, 23 Jul 2015 05:20:35 +0000 (00:20 -0500)]
1.6.5

8 years agoExceptions declared in header
Christopher Dunn [Thu, 23 Jul 2015 05:19:12 +0000 (00:19 -0500)]
Exceptions declared in header

resolves #272

8 years agocorrection for #316
Christopher Dunn [Thu, 23 Jul 2015 05:25:56 +0000 (00:25 -0500)]
correction for #316

8 years agoMerge pull request #316 from filipjs/master
Christopher Dunn [Fri, 17 Jul 2015 11:44:33 +0000 (06:44 -0500)]
Merge pull request #316 from filipjs/master

Update json_tool.h

typo in a comment

8 years agoUpdate json_tool.h
filipjs [Tue, 14 Jul 2015 12:34:07 +0000 (14:34 +0200)]
Update json_tool.h

Fix a typo in comment.

8 years agoMerge pull request #314 from cdunn2001/master
Christopher Dunn [Sun, 12 Jul 2015 19:38:02 +0000 (14:38 -0500)]
Merge pull request #314 from cdunn2001/master

-Werror

plus small bug-fix

8 years ago1.6.4
Christopher Dunn [Sun, 12 Jul 2015 19:29:51 +0000 (14:29 -0500)]
1.6.4

minor bug-fix

8 years ago-Werror
Christopher Dunn [Sun, 12 Jul 2015 19:25:21 +0000 (14:25 -0500)]
-Werror

8 years agofixed a bug found by -Wshadow
Christopher Dunn [Sun, 12 Jul 2015 17:58:54 +0000 (12:58 -0500)]
fixed a bug found by -Wshadow

8 years agofix some warnings
Christopher Dunn [Sun, 12 Jul 2015 17:55:18 +0000 (12:55 -0500)]
fix some warnings

8 years agodrop -Wsign-conversion
Christopher Dunn [Sun, 12 Jul 2015 17:49:57 +0000 (12:49 -0500)]
drop -Wsign-conversion

8 years ago-Wconversion
Christopher Dunn [Sun, 12 Jul 2015 17:32:33 +0000 (12:32 -0500)]
-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`

8 years agoauto-generated file with minor update
Christopher Dunn [Sun, 12 Jul 2015 17:31:43 +0000 (12:31 -0500)]
auto-generated file with minor update

8 years agoMerge pull request #313 from cdunn2001/master
Christopher Dunn [Sun, 12 Jul 2015 17:18:28 +0000 (12:18 -0500)]
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

8 years ago-std=c++11 for gcc builds too
Christopher Dunn [Sun, 12 Jul 2015 17:08:34 +0000 (12:08 -0500)]
-std=c++11 for gcc builds too

8 years agoMerge pull request #312 from cdunn2001/master
Christopher Dunn [Sun, 12 Jul 2015 17:04:41 +0000 (12:04 -0500)]
Merge pull request #312 from cdunn2001/master

gcc-4.9, clang (3.0)

8 years agogcc-4.9, clang (3.0)
Christopher Dunn [Sun, 12 Jul 2015 14:53:40 +0000 (09:53 -0500)]
gcc-4.9, clang (3.0)

8 years agoMerge pull request #309 from cdunn2001/master
Christopher Dunn [Sat, 11 Jul 2015 19:19:02 +0000 (14:19 -0500)]
Merge pull request #309 from cdunn2001/master

dockerize the Travis build, and allow C++11

8 years agovalgrind in Travis
Christopher Dunn [Sat, 11 Jul 2015 19:09:52 +0000 (14:09 -0500)]
valgrind in Travis

8 years agodockerize the Travis build
Christopher Dunn [Sat, 11 Jul 2015 19:06:18 +0000 (14:06 -0500)]
dockerize the Travis build

Docker builds are *much* faster in Travis.

Also, we prepare to enable C++11.

8 years ago1.6.3
Christopher Dunn [Sat, 11 Jul 2015 18:41:13 +0000 (13:41 -0500)]
1.6.3

8 years agominor doc fix, for #302
Christopher Dunn [Sat, 11 Jul 2015 17:09:59 +0000 (12:09 -0500)]
minor doc fix, for #302

8 years agoMerge pull request #305 from cdunn2001/fix-fixeol-undefined-name-sys
Christopher Dunn [Sat, 11 Jul 2015 16:17:09 +0000 (11:17 -0500)]
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.

8 years agoFix undefined name "sys"
Mike Naberezny [Fri, 3 Jul 2015 22:47:00 +0000 (15:47 -0700)]
Fix undefined name "sys"

Same as #299 (bca0eff81a1c5ef160d9858b8e89b1c919b71c1f), but an earlier
commit needed to be rebased.

8 years agoMerge pull request #304 from cdunn2001/297
Christopher Dunn [Sat, 11 Jul 2015 16:08:47 +0000 (11:08 -0500)]
Merge pull request #304 from cdunn2001/297

Same as #297 (1c4f274ab32594d717fc442a0f8a68d9e7633637), but properly rebased

8 years agoFix #296: Explicitly cast size_t results to unsigned when needed
Stuart Eichert [Wed, 1 Jul 2015 21:18:15 +0000 (14:18 -0700)]
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.

8 years agoWarn about implicit 64 to 32 bit conversions when using clang
Stuart Eichert [Wed, 1 Jul 2015 21:05:54 +0000 (14:05 -0700)]
Warn about implicit 64 to 32 bit conversions when using clang

8 years agoMerge pull request #303 from cdunn2001/appveyor-14.0
Christopher Dunn [Sat, 11 Jul 2015 15:58:59 +0000 (10:58 -0500)]
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.

8 years agofix appveyor 32-bit windows build
Christopher Dunn [Sat, 11 Jul 2015 15:46:24 +0000 (10:46 -0500)]
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]
```

8 years agoMerge pull request #295 from martyngigg/master
Christopher Dunn [Wed, 1 Jul 2015 08:18:33 +0000 (03:18 -0500)]
Merge pull request #295 from martyngigg/master

Allow an optional suffix on the debug library name in CMake

8 years agoAllow an optional suffix on the debug library name in CMake.
Martyn Gigg [Mon, 29 Jun 2015 18:20:08 +0000 (19:20 +0100)]
Allow an optional suffix on the debug library name in CMake.

8 years agoMerge pull request #294 from cdunn2001/master
Christopher Dunn [Fri, 19 Jun 2015 05:10:32 +0000 (00:10 -0500)]
Merge pull request #294 from cdunn2001/master

fix ,/. problem in reader

8 years agofix ,/. problem in reader
Christopher Dunn [Fri, 19 Jun 2015 03:41:49 +0000 (22:41 -0500)]
fix ,/. problem in reader

fixes #293

8 years agofix doxybuild.py for Windows
Christopher Dunn [Fri, 5 Jun 2015 04:57:29 +0000 (21:57 -0700)]
fix doxybuild.py for Windows

issue #287 (tylerknott@)