diff --git a/.gitignore b/.gitignore index 71c7e865e..a434324f0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,2 @@ -.deps -utf8_test - json_unit - html diff --git a/src/json.hpp b/src/json.hpp index 390f2a4b9..709231bfa 100644 --- a/src/json.hpp +++ b/src/json.hpp @@ -14,11 +14,13 @@ #include #include #include +#include #include #include #include #include #include +#include #include #include #include @@ -139,12 +141,6 @@ class basic_json /// default constructor (for null values) json_value() = default; - /// constructor for objects - json_value(object_t* v) : object(v) {} - /// constructor for arrays - json_value(array_t* v) : array(v) {} - /// constructor for strings - json_value(string_t* v) : string(v) {} /// constructor for booleans json_value(boolean_t v) : boolean(v) {} /// constructor for numbers (integer) @@ -556,10 +552,10 @@ class basic_json Serialization function for JSON objects. The function tries to mimick Python's @p json.dumps() function, and currently supports its @p indent parameter. - @param indent if indent is nonnegative, then array elements and object members - will be pretty-printed with that indent level. An indent level - of 0 will only insert newlines. -1 (the default) selects the - most compact representation + @param indent sif indent is nonnegative, then array elements and object + members will be pretty-printed with that indent level. An indent level of 0 + will only insert newlines. -1 (the default) selects the most compact + representation @see https://docs.python.org/2/library/json.html#json.dump */ diff --git a/src/json.hpp.re2c b/src/json.hpp.re2c index d093dfd83..04d281d56 100644 --- a/src/json.hpp.re2c +++ b/src/json.hpp.re2c @@ -14,11 +14,13 @@ #include #include #include +#include #include #include #include #include #include +#include #include #include #include @@ -139,12 +141,6 @@ class basic_json /// default constructor (for null values) json_value() = default; - /// constructor for objects - json_value(object_t* v) : object(v) {} - /// constructor for arrays - json_value(array_t* v) : array(v) {} - /// constructor for strings - json_value(string_t* v) : string(v) {} /// constructor for booleans json_value(boolean_t v) : boolean(v) {} /// constructor for numbers (integer) @@ -556,10 +552,10 @@ class basic_json Serialization function for JSON objects. The function tries to mimick Python's @p json.dumps() function, and currently supports its @p indent parameter. - @param indent if indent is nonnegative, then array elements and object members - will be pretty-printed with that indent level. An indent level - of 0 will only insert newlines. -1 (the default) selects the - most compact representation + @param indent sif indent is nonnegative, then array elements and object + members will be pretty-printed with that indent level. An indent level of 0 + will only insert newlines. -1 (the default) selects the most compact + representation @see https://docs.python.org/2/library/json.html#json.dump */ diff --git a/test/unit.cpp b/test/unit.cpp index 8110691d2..83a797298 100644 --- a/test/unit.cpp +++ b/test/unit.cpp @@ -16,7 +16,6 @@ using nlohmann::json; #include #include #include -#include #include #include #include