open-source-parsers/jsoncpp
1
0
Fork 0
mirror of https://github.com/open-source-parsers/jsoncpp.git synced 2025-10-23 18:58:44 +08:00
Code Issues Releases Wiki Activity

Centralized assertion macros and made them obey JSON_USE_EXCEPTION.

Browse Source
This commit is contained in:
Aaron Jacobs
2011-05-24 01:03:22 +00:00
parent a77a803c85
commit e3d0eca9f4
4 changed files with 28 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/lib_json/json_reader.cpp
View File

@@ -4,6 +4,7 @@
// See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
#if !defined(JSON_IS_AMALGAMATION)
# include <json/assertions.h>
# include <json/reader.h>
# include <json/value.h>
# include "json_tool.h"
@@ -884,8 +885,7 @@ std::istream& operator>>( std::istream &sin, Value &root )
{
Json::Reader reader;
bool ok = reader.parse(sin, root, true);
//JSON_ASSERT( ok );
if (!ok) throw std::runtime_error(reader.getFormattedErrorMessages());
if (!ok) JSON_FAIL_MESSAGE(reader.getFormattedErrorMessages());
return sin;
}