This commit is contained in:
Niels
2016-09-14 22:48:12 +02:00
parent 7b6cba23f3
commit 6bbcdc1ec5
7 changed files with 3000025 additions and 3 deletions
+1 -1
View File
@@ -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).
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
+16
View File
@@ -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);
}
}
} }