Christopher Dunn
56650e83c5
swap docs for default vs. strictMode
2015-04-20 13:10:31 -07:00
Christopher Dunn
441f8cdfa1
Merge pull request #244 from cdunn2001/appveyor
...
New `appveyor.yml`: All tests pass, in both Appveyor and Travis!
Henceforth, GitHub will run both for any pull-request, so this file will be needed in the `0.y.z` branch too.
2015-04-18 17:14:33 -07:00
Christopher Dunn
a658759039
maybe fix an error
2015-04-16 18:33:39 -07:00
Christopher Dunn
0eb0e502c8
add a comment, to force a build
2015-04-16 18:30:24 -07:00
Marek Kotewicz
e983204906
appveyor deploy init
2015-04-16 18:12:18 -07:00
Marek Kotewicz
fe06acb587
fixed version on appveyor build
2015-04-16 18:12:17 -07:00
Marek Kotewicz
1b49a55ea1
appveyor multiple platforms
2015-04-16 18:12:17 -07:00
Marek Kotewicz
13c36e9807
appveyor.yml
2015-04-16 18:12:17 -07:00
Christopher Dunn
50069d72da
prefer std::string for setComment()
...
in case of embedded nulls
2015-04-11 14:49:28 -05:00
Christopher Dunn
24682e37bf
1.6.2 <- 1.6.1
...
Fix UTF-8 for old (deprecated) Writers.
* Do not truncate at embedded zeroes.
2015-04-11 14:45:33 -05:00
Christopher Dunn
c2b988ee74
Merge pull request #241 from cdunn2001/fix-more-utf8
...
support UTF-8 (specifically, embedded zeroes) in old Writers
2015-04-11 14:44:41 -05:00
Christopher Dunn
e255ce31a4
support UTF-8 in old Writers
...
We had already fixed Value to hold UTF-8 properly, but only the newer
StreamWriter was writing UTF-8 properly.
Old FasterWriter etc. were using asCString() instead of asString() in
Value::writeValue().
Hopefully this change does not break any existing code. Seems unlikely.
issue #240
2015-04-11 14:41:30 -05:00
Christopher Dunn
779b5bc5ba
Merge pull request #239 from sbc100/copyright
...
Add copyright information to .py files
2015-04-11 14:41:03 -05:00
Sam Clegg
63860617b3
Add copyright information to .py files
...
This change adds explicit copyright information too python
files files. The copyright year used in each case is the
date of the first git commit of each file.
The goal is to allow jsoncpp to be integrated into the
chromium source tree which requires license information in
each source file.
fixes #234
2015-04-09 18:05:47 -07:00
Christopher Dunn
9cb88d2ca6
1.6.1 <- 1.6.0
2015-03-31 15:07:14 -05:00
Christopher Dunn
363e51c0a9
Merge pull request #232 from cdunn2001/fix-snprintf
...
Fix snprintf
Well, it passes Travis. But when we have time, we should clean up how snprintf is used in both reader and writer.
2015-03-31 15:06:11 -05:00
Christopher Dunn
240ddb6a1b
use std::snprintf for C++11
2015-03-31 15:04:24 -05:00
Baruch Siach
9dd77dc0ef
Revert "Use std namespace for snprintf."
...
This reverts commit 1c58876185d2a4ed87dac4a54b82f607e74f55fd.
std::snprintf() is only available in C++11, which is not provided by
all compilers. Since the C library snprintf() can easily be used as a
replacement on Linux systems, this patch changes jsoncpp to use the C
library snprintf() instead of C++11 std::snprintf(), fixing the build error
below:
src/lib_json/json_writer.cpp:33:18: error: 'snprintf' is not a member of 'std'
See #231 , #224 , and #218 .
2015-03-31 15:04:24 -05:00
Christopher Dunn
244b1496e1
Merge pull request #225 from selaselah/master
...
fix find_program() bug: no result in not-win sys
2015-03-31 11:32:06 -05:00
selaselah
c083835261
fix find_program() bug: no result in not-win sys
2015-03-19 19:18:58 +08:00
Christopher Dunn
cbe7e7c9cb
Merge pull request #221 from btolfa/forgotten-virtual-dtor
...
Added forgotten virtual dtor for `Json::CharReader::Factory`.
(Without this, the destructor of the derived `CharReaderBuilder` would not be called, which is a small memory leak.)
2015-03-15 13:49:24 -05:00
Tengiz Sharafiev
be183def8f
Update reader.h
2015-03-14 21:30:00 +03:00
Christopher Dunn
951bd3d05d
Merge pull request #219 from cdunn2001/c-std-headers
...
Close #218 . Fix #214 .
2015-03-11 21:36:51 -05:00
Connor Manning
1c58876185
Use std namespace for snprintf.
2015-03-11 21:33:08 -05:00
Connor Manning
2f2034629e
Constrain MSVC _isfinite to before 2013, remove duplicate includes.
2015-03-11 21:33:08 -05:00
Dani-Hub
7020451b44
Fix isfinite for MSVC.
2015-03-11 21:32:59 -05:00
Connor Manning
80497f102e
Use C++ standard headers.
2015-03-10 18:48:45 -05:00
Dani-Hub
f9feb66be2
Change exception data member
...
from "reference to string" to "string" (Resolves the most serious part of issue #216 )
2015-03-09 18:42:16 -05:00
Christopher Dunn
ed495edcc1
prefer ValueIterator::name() to ::memberName()
...
in case of embedded nulls
2015-03-08 14:35:00 -05:00
Christopher Dunn
3c0a383877
Merge pull request #212 from cdunn2001/macro-deprec
...
close #210
2015-03-08 13:10:37 -05:00
Dani-Hub
5003983029
Make preprocessor query robust against older gcc versions
2015-03-08 13:07:27 -05:00
Dani-Hub
871b311e7e
Provide JSONCPP_DEPRECATED definitions for clang and gcc
2015-03-08 13:07:27 -05:00
Christopher Dunn
cdbc35f6ac
1.6.0
2015-03-08 12:57:13 -05:00
Christopher Dunn
4e30c4fcdb
comments
2015-03-08 12:56:32 -05:00
Christopher Dunn
0d33cb3639
Merge pull request #211 from cdunn2001/except
...
* Add Json::Exception and derivatives.
* Clarify when exceptions are thrown, to avoid crashes caused by malicious input.
* Use our own type (derived fro std::exception) so they are trappable.
2015-03-08 12:50:34 -05:00
Christopher Dunn
2250b3c29d
use Json::RuntimeError
2015-03-08 12:44:55 -05:00
Christopher Dunn
9376368d86
use Json::LogicError in macros
2015-03-08 12:42:53 -05:00
Christopher Dunn
5383794cc9
Runtime/LogicError and throwers
2015-03-08 12:31:57 -05:00
Christopher Dunn
75279ccec2
base Json::Exception
2015-03-08 12:20:06 -05:00
Christopher Dunn
717b08695e
clarify errors
...
* use macros for logic errors, not input errors
* throw on parsing failure in `operator>>()`, not assert
* throw on malloc, not assert
2015-03-08 12:06:22 -05:00
Christopher Dunn
ee4ea0ec3f
delete debug code from test
2015-03-07 15:47:39 -06:00
Christopher Dunn
ce19001238
require length
...
Ugh! I meant to do this long ago. It would have caught my blunder.
2015-03-07 15:12:52 -06:00
Christopher Dunn
078f991c57
1.5.4 <- 1.5.3
...
important bug-fix (thx to datadiode@)
2015-03-07 14:52:01 -06:00
Christopher Dunn
72b5293695
Merge pull request #207 from cdunn2001/fix_CZString_copy_constructor
...
Fix czstring copy constructor
2015-03-07 14:49:54 -06:00
Christopher Dunn
a63d82d78a
drop unused CString ctor case
...
`Value::CZString::CZString(char const* str, unsigned length, DuplicationPolicy allocate)` with `allocate == duplicate` does not happen.
2015-03-07 14:43:37 -06:00
datadiode
ee83f8891c
Trivial fixes in CZString constructors.
2015-03-07 14:43:07 -06:00
Christopher Dunn
5c448687e1
fix ValueTest/zeroes*
2015-03-07 14:41:15 -06:00
Christopher Dunn
401e98269e
old-style enum namespacing
2015-03-06 16:11:55 -06:00
Christopher Dunn
b2a7438d08
Merge pull request #205 from open-source-parsers/reject-dup-keys
...
[Shekhar (shakers007) wrote](https://sourceforge.net/p/jsoncpp/bugs/22/ ):
> As per RFC4627 (section 2.2), names within an object should be unique. When using JSONCPP's strict mode, parsing such an object should fail.
2015-03-06 12:58:55 -06:00
Christopher Dunn
62ad140d18
rejectDupKeys
2015-03-06 12:39:05 -06:00
