some cleanup

This commit is contained in:
Niels 2015-06-08 16:35:38 +02:00
parent d3b0f207b0
commit 2d26d85c2b
3 changed files with 6 additions and 7 deletions

View file

@ -62,7 +62,7 @@ Though it's 2015 already, the support for C++11 is still a bit sparse. Currently
I would be happy to learn about other compilers/versions. I would be happy to learn about other compilers/versions.
Unfortunately, Microsoft Visual C++ support at the moment. MSVC 2013 and MSVC 2014 have been reported not to be able to compile class. Note that I will not accept pull requests that "fix" the code by polluting it with preprocessor directives to mitigate MSVC's lacking C++11 support. Unfortunately, Microsoft Visual C++ support at the moment. MSVC 2013 and MSVC 2014 have been reported not to be able to compile the class. Note that I will not accept pull requests that "fix" the code by polluting it with preprocessor directives to mitigate MSVC's lacking C++11 support.
## Examples ## Examples

View file

@ -185,7 +185,7 @@ class basic_json
array_t* array; array_t* array;
/// string (stored with pointer to save storage) /// string (stored with pointer to save storage)
string_t* string; string_t* string;
/// bolean /// boolean
boolean_t boolean; boolean_t boolean;
/// number (integer) /// number (integer)
number_integer_t number_integer; number_integer_t number_integer;
@ -1983,15 +1983,14 @@ class basic_json
o.width(0); o.width(0);
// do the actual serialization // do the actual serialization
j.dump(o, prettyPrint, indentation); j.dump(o, prettyPrint, static_cast<unsigned int>(indentation));
return o; return o;
} }
/// serialize to stream /// serialize to stream
friend std::ostream& operator>>(const basic_json& j, std::ostream& o) friend std::ostream& operator>>(const basic_json& j, std::ostream& o)
{ {
o << j; return o << j;
return o;
} }

View file

@ -185,7 +185,7 @@ class basic_json
array_t* array; array_t* array;
/// string (stored with pointer to save storage) /// string (stored with pointer to save storage)
string_t* string; string_t* string;
/// bolean /// boolean
boolean_t boolean; boolean_t boolean;
/// number (integer) /// number (integer)
number_integer_t number_integer; number_integer_t number_integer;
@ -1983,7 +1983,7 @@ class basic_json
o.width(0); o.width(0);
// do the actual serialization // do the actual serialization
j.dump(o, prettyPrint, static_cast<int>(indentation)); j.dump(o, prettyPrint, static_cast<unsigned int>(indentation));
return o; return o;
} }