cleanup after #234
This commit is contained in:
parent
6f0053a254
commit
76a5a776eb
4 changed files with 398 additions and 428 deletions
4
Makefile
4
Makefile
|
@ -66,7 +66,7 @@ cppcheck:
|
|||
|
||||
# create scanner with re2c
|
||||
re2c: src/json.hpp.re2c
|
||||
$(RE2C) -b -s -i --no-generation-date $< | $(SED) '1d' > src/json.hpp
|
||||
$(RE2C) --bit-vectors --nested-ifs --no-debug-info $< | $(SED) '1d' > src/json.hpp
|
||||
|
||||
# pretty printer
|
||||
pretty:
|
||||
|
@ -74,7 +74,7 @@ pretty:
|
|||
--indent-switches --indent-preproc-block --indent-preproc-define \
|
||||
--indent-col1-comments --pad-oper --pad-header --align-pointer=type \
|
||||
--align-reference=type --add-brackets --convert-tabs --close-templates \
|
||||
--lineend=linux --preserve-date --suffix=none \
|
||||
--lineend=linux --preserve-date --suffix=none --formatted \
|
||||
src/json.hpp src/json.hpp.re2c test/unit.cpp test/fuzz.cpp benchmarks/benchmarks.cpp doc/examples/*.cpp
|
||||
|
||||
|
||||
|
|
|
@ -410,6 +410,7 @@ I deeply appreciate the help of the following people.
|
|||
- [Lv Zheng](https://github.com/lv-zheng) fixed a namespace issue with `int64_t` and `uint64_t`.
|
||||
- [abc100m](https://github.com/abc100m) analyzed the issues with GCC 4.8 and proposed a [partial solution](https://github.com/nlohmann/json/pull/212).
|
||||
- [zewt](https://github.com/zewt) added useful notes to the README file about Android.
|
||||
- [Róbert Márki](https://github.com/robertmrk) added a fix to use move iterators.
|
||||
|
||||
Thanks a lot for helping out!
|
||||
|
||||
|
@ -427,7 +428,7 @@ $ make
|
|||
$ ./json_unit "*"
|
||||
|
||||
===============================================================================
|
||||
All tests passed (3344278 assertions in 29 test cases)
|
||||
All tests passed (3344299 assertions in 29 test cases)
|
||||
```
|
||||
|
||||
For more information, have a look at the file [.travis.yml](https://github.com/nlohmann/json/blob/master/.travis.yml).
|
||||
|
|
817
src/json.hpp
817
src/json.hpp
File diff suppressed because it is too large
Load diff
|
@ -12410,7 +12410,7 @@ TEST_CASE("regression tests")
|
|||
|
||||
SECTION("issue #233 - Can't use basic_json::iterator as a base iterator for std::move_iterator")
|
||||
{
|
||||
json source = {"a", "b", "c"};
|
||||
json source = {"a", "b", "c"};
|
||||
json expected = {"a", "b"};
|
||||
json dest;
|
||||
|
||||
|
|
Loading…
Reference in a new issue