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
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
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.
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
Christopher Dunn
07f0e9308d
nullRef, since we had to add that kludge to 0.8.0
2015-02-10 21:28:13 -06:00
Christopher Dunn
052050df07
copy Features to OldFeatures
2015-02-10 17:01:08 -06:00
Christopher Dunn
435d2a2f8d
passes
2015-02-10 17:01:08 -06:00
Christopher Dunn
6123bd1505
copy Reader impl to OldReader
2015-02-10 17:01:08 -06:00
Christopher Dunn
7477bcfa3a
renames for OldReader
2015-02-10 17:01:08 -06:00
Christopher Dunn
5e3e68af2e
OldReader copied from Reader
2015-02-10 17:01:08 -06:00
Christopher Dunn
04a607d95b
Merge pull request #163 from cdunn2001/master
...
Reimplement the new Builders.
Issue #131 .
2015-02-09 18:55:55 -06:00
Christopher Dunn
db75cdf21e
mv CommentStyle to .cpp
2015-02-09 18:54:58 -06:00
Christopher Dunn
c41609b9f9
set output stream in write(), not in builder
2015-02-09 18:44:53 -06:00
Christopher Dunn
b56381a636
<stdexcept>
2015-02-09 18:29:11 -06:00
Christopher Dunn
f757c18ca0
add all features
2015-02-09 18:24:56 -06:00
Christopher Dunn
3cf9175bde
remark defaults via doxygen snippet
2015-02-09 18:16:24 -06:00
Christopher Dunn
a9e1ab302d
Builder::settings_
...
We use Json::Value to configure the builders so we can maintain
binary-compatibility easily.
2015-02-09 17:30:11 -06:00
Christopher Dunn
694dbcb328
update docs, writeString()
2015-02-09 15:25:57 -06:00
Christopher Dunn
732abb80ef
Merge pull request #162 from cdunn2001/master
...
Deprecate the new Builders.
2015-02-09 11:55:54 -06:00
Christopher Dunn
f3b3358a0e
deprecate current Builders
2015-02-09 11:51:06 -06:00
Christopher Dunn
1357cddf1e
deprecate Builders
...
see issue #131
2015-02-09 11:46:27 -06:00
Christopher Dunn
8df98f6112
deprecate old Reader; separate Advanced Usage section
2015-02-09 11:15:39 -06:00
Christopher Dunn
16bdfd8af3
--in=doc/web_doxyfile.in
2015-02-09 11:15:11 -06:00
Christopher Dunn
ce799b3aa3
copy doxyfile.in
2015-02-09 10:36:55 -06:00
