github.com/coronalabs/external-metalangle-jsoncpp-source commits

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

Introduce 'allowSpecialFloats' for readers and 'useSpecialFloats' for writers, use consistent ma...

2084563efb186636e02a5313ec9c7f6d32f6cc7b authored over 9 years ago

Merge pull request #337 from AMDmi3/patch-1

Specify float constant as float

6329975e6dc2df101386add8d6f3f1409c48ed4d authored over 9 years ago

Specify float constant as float

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

...

7acfd599f011bdf5182e814b3c8d1ff2b3374832 authored over 9 years ago

Clean up cmake END* (again)

(I missed a couple. ~cd)

63a961a752dc5f6f256c8498f85179c18f8f37b6 authored over 9 years ago

Merge pull request #332 from cdunn2001/END

Clean up cmake END*

cb2378fa41e793f00a40fe4a9735cfaccfcb4fb4 authored over 9 years ago

Clean up cmake END*

* Clean up closing statements for if conditions, functions, macros,
and other entities. Newer ...

37aaaec70e917fb9956d0131900d937802a617b3 authored over 9 years ago

Merge pull request #327 from cdunn2001/more-gitattributes

More gitattributes

585446e6b3474ccf2a5168248c9c91223bccac7a authored over 9 years ago

add .gitattributes

helps #325

7f4be39e9fe5192aaa7b2473f75e4ffd3d3a2f7a authored over 9 years ago

normalized some windows VS stuff

47595e922b119110da432a9e27591a1b78ce1eaf authored over 9 years ago

Merge pull request #326 from rcdailey/git-attributes

Introduce .gitattributes file and normalize line endings

9f7dbcb19b16f2f257ab8d53a69455fe298fe700 authored over 9 years ago

Normalize line endings

This commit contains nothing but line ending normalization
changes. These changes were performed...

c1996256d6b1066edced60908e127ef6b6716988 authored over 9 years ago

Add .gitattributes file

25e4adc4e11a763748c0437dc8334968199017b1 authored over 9 years ago

Remove undefined behavior from a left shift of a negative value.

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

(Credit: Richard Trieu)

cc2c15c3eb03ad633a053b37fc28d6e6b0c640c1 authored over 9 years ago

Merge pull request #323 from joerg-krause/master

Remove -Werror

912d55094d2f3b777bcb48a76c2ed32447c7795e authored over 9 years ago

Remove Werror

-Werror shouldn't be used in released code since it can cause random build
failures on moderate ...

d7b84f69c5e92178e110552cce27f900744e1779 authored over 9 years ago

Merge pull request #320 from shields/negation-overflow

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

9dad198af619e9e01ea866b6067cc162e1daafdd authored over 9 years ago

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

undefined behavior.

7f06e9dc28413224edf9974e2990e4af03418986 authored over 9 years ago

1.6.5

d84702c9036505d0906b2f3d222ce5498ec65bc6 authored over 9 years ago

Exceptions declared in header

resolves #272

949babd7b0924910564aef46aacbedaf29e1866e authored over 9 years ago

correction for #316

6ed877c77cde496a915c584343d16397df25c6ff authored over 9 years ago

Merge pull request #316 from filipjs/master

Update json_tool.h

typo in a comment

1c69568f8dcb8052c6a4d179f10f1db79e69f5ca authored over 9 years ago

Update json_tool.h

Fix a typo in comment.

770fdda28b1a4a4418ee1af3aaacdb6c7ffd7ec4 authored over 9 years ago

Merge pull request #314 from cdunn2001/master

-Werror

plus small bug-fix

81cf237917b6873decd27e15b7fe8473003a2762 authored over 9 years ago

1.6.4

minor bug-fix

cac79543f8c7cf8dab7ffcaff77e10284f173ed4 authored over 9 years ago

-Werror

d8186f36a683a70143e7e1870d9d6727820b8a22 authored over 9 years ago

fixed a bug found by -Wshadow

7f240623d333bac4be4f791f5354cb95da744c16 authored over 9 years ago

fix some warnings

784433ac72c0864600655c29607df716f2259186 authored over 9 years ago

drop -Wsign-conversion

7275e3ce3c1139c350df20b3c3b19881148bb757 authored over 9 years ago

-Wconversion

* https://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html
* http://programmers.stackexchange.com...

46aa9d75fa9b633124025e5b85c37e25fe039d62 authored over 9 years ago

auto-generated file with minor update

f94a0e8989150d2224e731a037e9546580a2924b authored over 9 years ago

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 n...

e22a2f36f7e8e9ec7598d1b58c1c7992b1b5b02e authored over 9 years ago

-std=c++11 for gcc builds too

fac87108a49fb1b2640eff5d8e4cc7a12723a510 authored over 9 years ago

Merge pull request #312 from cdunn2001/master

gcc-4.9, clang (3.0)

14fc9f124edb76a5426c1a166e984947a26c437e authored over 9 years ago

gcc-4.9, clang (3.0)

658fa37e638732325eac9f46c37da82a11fbe38e authored over 9 years ago

Merge pull request #309 from cdunn2001/master

dockerize the Travis build, and allow C++11

056e5f9b640771d156c500be038e50547214c862 authored over 9 years ago

valgrind in Travis

d8e8c14ffc54d9926da184dd666d95ed6c3a9603 authored over 9 years ago

dockerize the Travis build

Docker builds are *much* faster in Travis.

Also, we prepare to enable C++11.

f4e6fccd46cd39a07ec7ef381f159bb8cb5e3938 authored over 9 years ago

1.6.3

24288898137d874d2ddb57e28de093c3f349062c authored over 9 years ago

minor doc fix, for #302

89704039a030d150651ef32e9c5a9b78953b4a5a authored over 9 years ago

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.

6ca8ffcb91104acfaf42d33c554e957817f619da authored over 9 years ago

Fix undefined name "sys"

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

b5e70f950e8e01d5830f4d969b2703b5cc6cd289 authored over 9 years ago

Merge pull request #304 from cdunn2001/297

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

b26804d1c217eced84ab57cbffe8a0baf4db8f9f authored over 9 years ago

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 ...

702a53976260608c4497d99f00f01ff55aff7791 authored over 9 years ago

Warn about implicit 64 to 32 bit conversions when using clang

81cb7e5c5b95ac0677c3381d46d05ddb9b25ad5d authored over 9 years ago

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 fa...

d259f608fd2a52f94f9e5fa470cc8dc98dde8bb9 authored over 9 years ago

fix appveyor 32-bit windows build

* http://help.appveyor.com/discussions/problems/2229-v140-not-found-on-vs2105rc
```
Done Buildin...

4652f818fee737005eff731c6d1d285772b8f061 authored over 9 years ago

Merge pull request #295 from martyngigg/master

Allow an optional suffix on the debug library name in CMake

ce32274ba53858e5e53618467b9c9582b41f5567 authored over 9 years ago

Allow an optional suffix on the debug library name in CMake.

717c791d4e40c3f923e79ff8d4a72111f079eaa5 authored over 9 years ago

Merge pull request #294 from cdunn2001/master

fix ,/. problem in reader

6e52e272da5e1434d6735f2b5d194724f85458ae authored over 9 years ago

fix ,/. problem in reader

fixes #293

6416350438ed90d29d3b4baa847f51c480943a9e authored over 9 years ago

fix doxybuild.py for Windows

issue #287 (tylerknott@)

bcb83b921c9f94d569ba4ce1fb2f0dd8b087efaf authored over 9 years ago

Merge pull request #276 from bmyerz/master

make the unix cmake example work

3f05b1a89708381c6f42b3f62cb4203557cb7f35 authored over 9 years ago

Merge pull request #282 from keithkml/patch-1

Clarify which parts of README for users vs devs

de2c85f5768e35b98119a3ffb2ca537b1064afea authored over 9 years ago

Merge pull request #280 from mgorny/pkg-config-fix

Fix custom includedir & libdir substitution in pkg-config

b389d81bf95837b4f52cf0a177355d883973d7f9 authored over 9 years ago

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 ...

89c51f345799b233e104585d5e139b10aa43dd1c authored over 9 years ago

Fix custom includedir & libdir substitution in pkg-config

Do not prepend ${prefix} to substituted includedir & libdir
in the pkg-config file -- if the pat...

e6f1cffdd3fb04a0ed96319e6f8df6a7cbdd1557 authored over 9 years ago

Merge pull request #275 from stefan-it/stefan/cmake-generator-fix

[Documentation][Markdown] Use correct help option for cmake.

64441486ace99abee0371a3481632fe0d1400cca authored over 9 years ago

Merge pull request #277 from gogo40/master

fix compile error on android

But note that we do not have continuous integration testing for ...

d5e54d2609046ecdef5458f36dbad963808c88bb authored over 9 years ago

fix compile error on android

97e093a361d7235e414807bdad2c41cc4d75f804 authored over 9 years ago

make the unix make example work

...by setting the archive directory variable

d57ac97db8c8a1480639b42ab8c95a9a79be0493 authored over 9 years ago

[Documentation][Markdown] Use correct help option for cmake.

31e99627546a84946a8571d129933fbc025ab7f6 authored over 9 years ago

address compilation probs for C++ Builder

BORLANDC compiler strangeness. Thanks to:

* Dan Liu
* Victor Chen

close #269
close #252

5256551b0307d3e85f453faf1b1822b1d859f949 authored almost 10 years ago

another fix for BORLANDC

6649009ffa0724f949c684f1f1d7954d42e7372b authored almost 10 years ago

move ctors for BORLAND

2a10f4a3b8bb647636b559e7628e4447966f107b authored almost 10 years ago

Merge pull request #266 from cdunn2001/issue-252

Use unsigned for DuplicationPolicy, to fix a problem with "C++ Builder"
IDE.

Fixes #252.

Thank...

28d086e1d991e86a8ea0b3a40a52ba908f77992b authored almost 10 years ago

a little test for issue 252, but does not fail for me

a0a7c5f6def1bcdcd0716af0d7dfa413c30cd005 authored almost 10 years ago

fix crash for "C++ Builder" IDE

http://blog.csdn.net/gzliudan/article/details/45264201

fcbab02e4a2d17ce775eed21a3e7de6dba8690ab authored almost 10 years ago

Merge pull request #265 from cdunn2001/valgrind

run valgrind in Travis CI

f4ee48bc213a37a5847d53f14f82d5136d5d15cf authored almost 10 years ago

run valgrind in Travis CI

Because this runs apt-get, it will not work as-is for OSX. So when
we have OSX in Travis, we wil...

88184d142bc4a61aa47102345218470873d1de8d authored almost 10 years ago

Merge pull request #263 from cdunn2001/static-shared

Use standard **cmake** variables, to support superprojects better.

- `JSONCPP_LIB_BUILD_SHARE...

ae177fd901c10953ebb042bf5922185b917a3071 authored almost 10 years ago