j3d1/json
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

tidy up

Browse source
This commit is contained in:
Niels 2015-01-04 19:05:46 +01:00
parent 0019c85b85
commit 4d00105e5c
2 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
README.md
View file

@ -1,6 +1,6 @@
# JSON for Modern C++ # JSON for Modern C++
*What if JSON was party of modern C++?* *What if JSON was part of modern C++?*
[![Build Status](https://travis-ci.org/nlohmann/json.png?branch=master)](https://travis-ci.org/nlohmann/json) [![Build Status](https://travis-ci.org/nlohmann/json.png?branch=master)](https://travis-ci.org/nlohmann/json)
[![Coverage Status](https://img.shields.io/coveralls/nlohmann/json.svg)](https://coveralls.io/r/nlohmann/json) [![Coverage Status](https://img.shields.io/coveralls/nlohmann/json.svg)](https://coveralls.io/r/nlohmann/json)
@ -166,6 +166,9 @@ j.empty(); // false
j.type(); // JSON::value_type::array j.type(); // JSON::value_type::array
j.clear(); // the array is empty again j.clear(); // the array is empty again
// comparison
j == "[\"foo\", 1, true]"_json; // true
// create an object // create an object
JSON o; JSON o;
o["foo"] = 23; o["foo"] = 23;
@ -235,15 +238,18 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
To compile the unit tests, you need to execute To compile the unit tests, you need to execute
```sh ```sh
autoreconf -i $ autoreconf -i
./configure $ ./configure
make $ make
``` ```
The unit tests can then be executed with The unit tests can then be executed with
```sh ```sh
./json_unit $ ./json_unit
===============================================================================
All tests passed (863 assertions in 10 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
src/JSON.cc
View file

@ -1832,7 +1832,6 @@ JSON JSON::Parser::parse()
// process nonempty array // process nonempty array
if (_current != ']') if (_current != ']')
{ {
size_t element_count = 0;
do do
{ {
result.push_back(parse()); result.push_back(parse());