open-source-parsers/jsoncpp
1
0
Fork 0
mirror of https://github.com/open-source-parsers/jsoncpp.git synced 2025-10-25 05:15:41 +08:00
Code Issues Releases Wiki Activity

Merge branch 'master' into 0.y.z

Browse Source 
- fix for "C++ Builder" IDE
- Travis CI/AppVeyor
- **cmake** tweak
- fix memory leak in unit-test

See #268 and #252.
This commit is contained in:
Christopher Dunn
2015-04-27 18:31:32 -07:00
parent c66cc277f5 28d086e1d9
commit c334ac0376
13 changed files with 84 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/json/reader.h
View File

@@ -302,13 +302,13 @@ public:
/** Called by ctor, but you can use this to reset settings_.
* \pre 'settings' != NULL (but Json::null is fine)
* \remark Defaults:
* \snippet src/lib_json/json_reader.cpp CharReaderBuilderStrictMode
* \snippet src/lib_json/json_reader.cpp CharReaderBuilderDefaults
*/
static void setDefaults(Json::Value* settings);
/** Same as old Features::strictMode().
* \pre 'settings' != NULL (but Json::null is fine)
* \remark Defaults:
* \snippet src/lib_json/json_reader.cpp CharReaderBuilderDefaults
* \snippet src/lib_json/json_reader.cpp CharReaderBuilderStrictMode
*/
static void strictMode(Json::Value* settings);
};