lib/json
1
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2025-07-22 15:21:52 +03:00
Code Activity

🔨 fixed bugs introduced by merging from develop

Browse Source
This commit is contained in:
Niels Lohmann
2017-03-29 07:54:26 +02:00
parent a690a9f2d2
commit 60057a4728
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/json.hpp
View File

@ -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;
}