diff options
| author | chriseth <chris@ethereum.org> | 2018-12-03 22:48:03 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-03 22:48:03 +0800 |
| commit | c8a2cb62832afb2dc09ccee6fd42c1516dfdb981 (patch) | |
| tree | 7977e9dcbbc215088c05b847f849871ef5d4ae66 /libdevcore/JSON.cpp | |
| parent | 1d4f565a64988a3400847d2655ca24f73f234bc6 (diff) | |
| parent | 590be1d84cea9850ce69b68be3dc5294b39041e5 (diff) | |
| download | dexon-solidity-c8a2cb62832afb2dc09ccee6fd42c1516dfdb981.tar dexon-solidity-c8a2cb62832afb2dc09ccee6fd42c1516dfdb981.tar.gz dexon-solidity-c8a2cb62832afb2dc09ccee6fd42c1516dfdb981.tar.bz2 dexon-solidity-c8a2cb62832afb2dc09ccee6fd42c1516dfdb981.tar.lz dexon-solidity-c8a2cb62832afb2dc09ccee6fd42c1516dfdb981.tar.xz dexon-solidity-c8a2cb62832afb2dc09ccee6fd42c1516dfdb981.tar.zst dexon-solidity-c8a2cb62832afb2dc09ccee6fd42c1516dfdb981.zip | |
Merge pull request #5571 from ethereum/develop
Version 0.5.1
Diffstat (limited to 'libdevcore/JSON.cpp')
| -rw-r--r-- | libdevcore/JSON.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/libdevcore/JSON.cpp b/libdevcore/JSON.cpp index 6317cc89..086fae50 100644 --- a/libdevcore/JSON.cpp +++ b/libdevcore/JSON.cpp @@ -21,6 +21,8 @@ #include "JSON.h" +#include "CommonIO.h" + #include <sstream> #include <map> #include <memory> @@ -111,4 +113,10 @@ bool jsonParse(string const& _input, Json::Value& _json, string *_errs /* = null return parse(readerBuilder, _input, _json, _errs); } +bool jsonParseFile(string const& _fileName, Json::Value& _json, string *_errs /* = nullptr */) +{ + return jsonParse(readFileAsString(_fileName), _json, _errs); +} + + } // namespace dev |