From 60057a4728ac4a7a9826d14d3c15aba5213289e9 Mon Sep 17 00:00:00 2001 From: Niels Lohmann Date: Wed, 29 Mar 2017 07:54:26 +0200 Subject: [PATCH] :hammer: fixed bugs introduced by merging from develop --- src/json.hpp | 4 ++-- test/src/unit-regression.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/json.hpp b/src/json.hpp index 903f3178b..d2dbb7feb 100644 --- a/src/json.hpp +++ b/src/json.hpp @@ -7390,7 +7390,7 @@ class basic_json JSON_DEPRECATED friend std::istream& operator<<(basic_json& j, std::istream& i) { - j = parser(i).parse(); + j = parser(i).parse(true); return i; } @@ -7422,7 +7422,7 @@ class basic_json */ friend std::istream& operator>>(std::istream& i, basic_json& j) { - j = parser(i).parse(false); + j = parser(i).parse(true); return i; } diff --git a/test/src/unit-regression.cpp b/test/src/unit-regression.cpp index e8eae0f8d..c221b1abc 100644 --- a/test/src/unit-regression.cpp +++ b/test/src/unit-regression.cpp @@ -596,7 +596,7 @@ TEST_CASE("regression tests") // a parse error because of the EOF. CHECK_THROWS_AS(ss >> j, json::parse_error); CHECK_THROWS_WITH(ss >> j, - "[json.exception.parse_error.101] parse error at 1: parse error - unexpected end of input"); + "[json.exception.parse_error.101] parse error at 1: syntax error - unexpected end of input"); } SECTION("issue #389 - Integer-overflow (OSS-Fuzz issue 267)")