generic-library/jsoncpp
1
0
Fork 0
mirror of https://github.com/open-source-parsers/jsoncpp.git synced 2025-05-01 23:31:00 +02:00
Code Issues Projects Releases Wiki Activity
563 Commits 4 Branches 55 Tags
Commit Graph

563 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christopher Dunn
1ec069c974 partially revert 'Added features that allow the reader to accept common non-standard JSON.' 
revert '642befc836ac5093b528e7d8b4fd66b66735a98c',
but keep the *added* methods for `decodedNumber()` and `decodedDouble()`.
0.8.4 		2015-03-03 09:04:10 -06:00
Christopher Dunn
525c8950c5 test Json::Value::null 2015-03-03 09:03:00 -06:00
Christopher Dunn
75665630c3 partially revert 'fix bug for static init' 
re: 28836b8acc2c002b0488c13dba28fd5be864970a

A global instance of a Value (viz. 'null') was a mistake,
but dropping it breaks binary-compatibility. So we will keep it
everywhere except the one platform where it was crashing, ARM.
 2015-03-03 09:02:53 -06:00
Christopher Dunn
fd709f6885 revert 'Made it possible to drop null placeholders from array output.' 
revert ae3c7a7aabfb345968a65001ea9bc25f1e2bb405
 2015-03-03 09:02:14 -06:00
Christopher Dunn
e1ed392e7c Revert "added option to FastWriter which omits the trailing new line character" 
This reverts commit 5bf16105b5a90f9fa7d5d4d43452feee46603a52.
 2015-03-03 09:02:14 -06:00
Christopher Dunn
e6ba425a73 revert 'Added structured error reporting to Reader.' 
revert 68db6553471bb9cb050b1bb888b5933ee758b82d
issue #147
 2015-03-03 09:02:14 -06:00
Christopher Dunn
48a617179a revert 'Add public semantic error reporting' 
for binary-compatibility with 0.6.0
issue #147
was #57
 2015-03-03 09:02:14 -06:00
Christopher Dunn
5d9eb1f3dc Revert "Switch to copy-and-swap idiom for operator=." 
This reverts commit 45cd9490cd261da31cef84a44d2c587be7e26e99.

Ignored ValueInternal* changes, since those did not produce symbols for
Debian build. (They must not have used the INTERNAL stuff.)

  https://github.com/open-source-parsers/jsoncpp/issues/78

Conflicts:
	include/json/value.h
	src/lib_json/json_internalarray.inl
	src/lib_json/json_internalmap.inl
	src/lib_json/json_value.cpp
 2015-03-03 09:02:13 -06:00
Christopher Dunn
fbe9157981 NOT C++11 2015-03-03 09:02:13 -06:00
Christopher Dunn
c92bad4a5e 0.8.z 2015-03-03 09:02:09 -06:00
Christopher Dunn
f9db82af17 1.4.4 < 1.4.3 
* fixed Readers when `allowDropNullPlaceholders`
1.4.4 		2015-02-19 15:37:57 -06:00
Christopher Dunn
ae71879549 Merge pull request #179 from cdunn2001/drop-null 
Fix failures for `allowDroppedNullPlaceholders`.
 2015-02-19 12:38:16 -06:00
Christopher Dunn
7b3683ccd1 apply fix to old Reader 2015-02-19 11:37:17 -06:00
Christopher Dunn
58499031a4 fix all cases from issue -- all pass! 2015-02-19 11:35:28 -06:00
Christopher Dunn
2c8c1ac0ec all 8 failing cases from issue 2015-02-19 11:35:20 -06:00
Christopher Dunn
c58e93b014 fix failing object case 2015-02-19 11:34:35 -06:00
Christopher Dunn
eed193e151 object cases; 1st passes, 2nd fails 2015-02-19 11:34:35 -06:00
Christopher Dunn
4382a7b585 cases 0,1,5,9,12 from issue -- passing 2015-02-19 11:32:42 -06:00
Christopher Dunn
30d923f155 1.4.3 <- 1.4.2 1.4.3 2015-02-18 09:20:28 -06:00
Christopher Dunn
2f4e40bc95 fix typo: issue #177 2015-02-18 09:17:06 -06:00
Christopher Dunn
505e086ebc Merge pull request #173 from cdunn2001/fix-include-amal 
help use of amalgamated header

Reviewed by "Lightness Races in Orbit" at StackOverflow.
 2015-02-15 13:11:38 -06:00
Christopher Dunn
c6582415d8 fix typos 2015-02-15 13:06:48 -06:00
Christopher Dunn
0ee7e2426f help use of amalgamated header 
* Include from same-directory first, so `-I DIR` is rarely needed.
* Double-check that proper header has been included.

http://stackoverflow.com/questions/28510109/linking-problems-with-jsoncpp
 2015-02-15 13:06:48 -06:00
Christopher Dunn
1522e4dfb1 Merge pull request #174 from kobigurk/kobigurk-patch-asserts 
only throws exceptions JSON_USE_EXCEPTION
 2015-02-15 12:05:28 -06:00
Kobi Gurkan
09b8670536 only throws exceptions JSON_USE_EXCEPTION 
JSON_ASSERT now throws a runtime_error
 2015-02-15 18:00:31 +02:00
Christopher Dunn
f164288646 help rebasing 1.4.2 2015-02-15 03:01:26 -06:00
Christopher Dunn
3bfd215938 1.4.2 < 1.4.1 
* Bug-fix for ValueIterator::operator-() (issue #169)
 2015-02-15 02:49:34 -06:00
Christopher Dunn
400b744195 Merge pull request #172 from cdunn2001/master 
Fix bug in ValueIteratorBase::operator- 

Fixes #169.
 2015-02-15 02:44:17 -06:00
Christopher Dunn
bd55164089 reverse sense for CPPTL too 2015-02-15 02:38:31 -06:00
Kevin Grant
4c5832a0be Fix bug in ValueIteratorBase::operator- 2015-02-15 02:38:31 -06:00
Christopher Dunn
8ba9875962 IteratorTest 2015-02-15 02:38:31 -06:00
Christopher Dunn
9c91b995dd rules for signing and doc-generation 2015-02-14 10:20:45 -06:00
Christopher Dunn
e7233bf056 1.4.1 <- 1.4.0 1.4.1 2015-02-13 10:00:38 -06:00
Christopher Dunn
9c90456890 Merge pull request #167 from cdunn2001/fail-if-extra 
Add `failIfExtra` feature to `CharReaderBuilder`.
 2015-02-13 09:55:11 -06:00
Christopher Dunn
f4be815c86 failIfExtra 
1. failing regression tests, from #164 and #107
2. implemented; tests pass
3. allow trailing comments
 2015-02-13 09:39:08 -06:00
Christopher Dunn
aa13a8ba40 comments/minor typos 2015-02-13 09:38:49 -06:00
Christopher Dunn
da0fcfbaa2 link web docs 2015-02-12 11:45:21 -06:00
Christopher Dunn
3ebba5cea8 stop calling validate() in newReader/Writer() 
By not calling validate(), we can add
non-invasive features which will be simply ignored when user-code
is compiled against an old version. That way, we can often
avoid a minor version-bump.

The user can call validate() himself if he prefers that behavior.
1.4.0 		2015-02-11 11:15:32 -06:00
Christopher Dunn
acbf4eb2ef Merge pull request #166 from cdunn2001/stackLimit 
Fixes #88 and #56.
 2015-02-11 10:35:16 -06:00
Christopher Dunn
56df206847 limit stackDepth for old (deprecated) Json::Reader too 
This is an improper solution. If multiple Readers exist,
then the effect stackLimit is reduced because of side-effects.
But our options are limited. We need to address the security
hole without breaking binary-compatibility.

However, this is not likely to cause any practical problems because:

* Anyone using `operator>>(istream, Json::Value)` will be using the
new code already
* Multiple Readers are uncommon.
* The stackLimit is quite high.
* Deeply nested JSON probably would have hit the system limits anyway.
 2015-02-11 10:20:53 -06:00
Christopher Dunn
4dca80da49 limit stackDepth 2015-02-11 10:20:47 -06:00
Christopher Dunn
249ad9f47f stackLimit 2015-02-11 10:01:58 -06:00
Christopher Dunn
99b8e856f6 stackLimit_ 2015-02-11 10:01:58 -06:00
Christopher Dunn
89b72e1653 test stackLimit 2015-02-11 10:01:58 -06:00
Christopher Dunn
2474989f24 Old -> Our 2015-02-11 09:48:24 -06:00
Christopher Dunn
315b8c9f2c 1st StreamWriterTest 2015-02-10 23:29:14 -06:00
Christopher Dunn
29501c4d9f clarify comments 
And throw instead of return null for invalid settings.
 2015-02-10 23:03:27 -06:00
Christopher Dunn
7796f20eab Merge pull request #165 from cdunn2001/master 
Remove some experimental classes that are not needed for 1.4.0. This also helps 0.8.0 binary compatibility with 0.6.0-rc2.
 2015-02-10 22:45:32 -06:00
Christopher Dunn
20d09676c2 drop experimental OldCompressingStreamWriterBuilder 2015-02-10 21:29:35 -06:00
Christopher Dunn
5a744708fc enableYAMLCompatibility and dropNullPlaceholders for StreamWriterBuilder 2015-02-10 21:28:13 -06:00