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

removed unused code and fixed includes

Browse source
This commit is contained in:
Niels 2015-02-16 22:47:30 +01:00
parent db91140156
commit 5ca84052a7
4 changed files with 12 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.gitignore vendored
View file

@ -1,6 +1,2 @@
.deps
utf8_test
json_unit json_unit
html html

16
src/json.hpp
View file

@ -14,11 +14,13 @@
#include <cmath> #include <cmath>
#include <functional> #include <functional>
#include <initializer_list> #include <initializer_list>
#include <iomanip>
#include <iostream> #include <iostream>
#include <iterator> #include <iterator>
#include <limits> #include <limits>
#include <map> #include <map>
#include <memory> #include <memory>
#include <sstream>
#include <string> #include <string>
#include <type_traits> #include <type_traits>
#include <utility> #include <utility>
@ -139,12 +141,6 @@ class basic_json
/// default constructor (for null values) /// default constructor (for null values)
json_value() = default; 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 /// constructor for booleans
json_value(boolean_t v) : boolean(v) {} json_value(boolean_t v) : boolean(v) {}
/// constructor for numbers (integer) /// constructor for numbers (integer)
@ -556,10 +552,10 @@ class basic_json
Serialization function for JSON objects. The function tries to mimick Python's Serialization function for JSON objects. The function tries to mimick Python's
@p json.dumps() function, and currently supports its @p indent parameter. @p json.dumps() function, and currently supports its @p indent parameter.
@param indent if indent is nonnegative, then array elements and object members @param indent sif indent is nonnegative, then array elements and object
will be pretty-printed with that indent level. An indent level members will be pretty-printed with that indent level. An indent level of 0
of 0 will only insert newlines. -1 (the default) selects the will only insert newlines. -1 (the default) selects the most compact
most compact representation representation
@see https://docs.python.org/2/library/json.html#json.dump @see https://docs.python.org/2/library/json.html#json.dump
*/ */

16
src/json.hpp.re2c
View file

@ -14,11 +14,13 @@
#include <cmath> #include <cmath>
#include <functional> #include <functional>
#include <initializer_list> #include <initializer_list>
#include <iomanip>
#include <iostream> #include <iostream>
#include <iterator> #include <iterator>
#include <limits> #include <limits>
#include <map> #include <map>
#include <memory> #include <memory>
#include <sstream>
#include <string> #include <string>
#include <type_traits> #include <type_traits>
#include <utility> #include <utility>
@ -139,12 +141,6 @@ class basic_json
/// default constructor (for null values) /// default constructor (for null values)
json_value() = default; 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 /// constructor for booleans
json_value(boolean_t v) : boolean(v) {} json_value(boolean_t v) : boolean(v) {}
/// constructor for numbers (integer) /// constructor for numbers (integer)
@ -556,10 +552,10 @@ class basic_json
Serialization function for JSON objects. The function tries to mimick Python's Serialization function for JSON objects. The function tries to mimick Python's
@p json.dumps() function, and currently supports its @p indent parameter. @p json.dumps() function, and currently supports its @p indent parameter.
@param indent if indent is nonnegative, then array elements and object members @param indent sif indent is nonnegative, then array elements and object
will be pretty-printed with that indent level. An indent level members will be pretty-printed with that indent level. An indent level of 0
of 0 will only insert newlines. -1 (the default) selects the will only insert newlines. -1 (the default) selects the most compact
most compact representation representation
@see https://docs.python.org/2/library/json.html#json.dump @see https://docs.python.org/2/library/json.html#json.dump
*/ */

1
test/unit.cpp
View file

@ -16,7 +16,6 @@ using nlohmann::json;
#include <array> #include <array>
#include <deque> #include <deque>
#include <forward_list> #include <forward_list>
#include <iomanip>
#include <list> #include <list>
#include <map> #include <map>
#include <set> #include <set>