Commit 6bbcdc1e by Niels

fixes #310

parent 7b6cba23
...@@ -512,7 +512,7 @@ To compile and run the tests, you need to execute ...@@ -512,7 +512,7 @@ To compile and run the tests, you need to execute
$ make check $ make check
=============================================================================== ===============================================================================
All tests passed (8905158 assertions in 35 test cases) All tests passed (8905161 assertions in 35 test cases)
``` ```
For more information, have a look at the file [.travis.yml](https://github.com/nlohmann/json/blob/master/.travis.yml). For more information, have a look at the file [.travis.yml](https://github.com/nlohmann/json/blob/master/.travis.yml).
...@@ -8614,7 +8614,7 @@ basic_json_parser_63: ...@@ -8614,7 +8614,7 @@ basic_json_parser_63:
std::string line; std::string line;
std::getline(*m_stream, line); std::getline(*m_stream, line);
// add line with newline symbol to the line buffer // add line with newline symbol to the line buffer
m_line_buffer += "\n" + line; m_line_buffer += line + "\n";
} }
// set pointers // set pointers
......
...@@ -7911,7 +7911,7 @@ class basic_json ...@@ -7911,7 +7911,7 @@ class basic_json
std::string line; std::string line;
std::getline(*m_stream, line); std::getline(*m_stream, line);
// add line with newline symbol to the line buffer // add line with newline symbol to the line buffer
m_line_buffer += "\n" + line; m_line_buffer += line + "\n";
} }
// set pointers // set pointers
......
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -466,4 +466,20 @@ TEST_CASE("regression tests") ...@@ -466,4 +466,20 @@ TEST_CASE("regression tests")
CHECK_NOTHROW(j << f); CHECK_NOTHROW(j << f);
} }
} }
SECTION("issue #310 - make json_benchmarks no longer working in 2.0.4")
{
for (auto filename :
{
"test/data/regression/floats.json",
"test/data/regression/signed_ints.json",
"test/data/regression/unsigned_ints.json"
})
{
CAPTURE(filename);
json j;
std::ifstream f(filename);
CHECK_NOTHROW(j << f);
}
}
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment