From 2d26d85c2bef680bd53e4e78a29d24487b79e815 Mon Sep 17 00:00:00 2001
From: Niels <niels.lohmann@gmail.com>
Date: Mon, 8 Jun 2015 16:35:38 +0200
Subject: [PATCH] some cleanup
---
README.md | 2 +-
src/json.hpp | 7 +++----
src/json.hpp.re2c | 4 ++--
3 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/README.md b/README.md
index 7bc173b4..b78713ed 100644
--- a/README.md
+++ b/README.md
@@ -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.
-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
diff --git a/src/json.hpp b/src/json.hpp
index a99bb2eb..d8fe43ec 100644
--- a/src/json.hpp
+++ b/src/json.hpp
@@ -185,7 +185,7 @@ class basic_json
array_t* array;
/// string (stored with pointer to save storage)
string_t* string;
- /// bolean
+ /// boolean
boolean_t boolean;
/// number (integer)
number_integer_t number_integer;
@@ -1983,15 +1983,14 @@ class basic_json
o.width(0);
// do the actual serialization
- j.dump(o, prettyPrint, indentation);
+ j.dump(o, prettyPrint, static_cast<unsigned int>(indentation));
return o;
}
/// serialize to stream
friend std::ostream& operator>>(const basic_json& j, std::ostream& o)
{
- o << j;
- return o;
+ return o << j;
}
diff --git a/src/json.hpp.re2c b/src/json.hpp.re2c
index d6e2744a..b7f1e7c9 100644
--- a/src/json.hpp.re2c
+++ b/src/json.hpp.re2c
@@ -185,7 +185,7 @@ class basic_json
array_t* array;
/// string (stored with pointer to save storage)
string_t* string;
- /// bolean
+ /// boolean
boolean_t boolean;
/// number (integer)
number_integer_t number_integer;
@@ -1983,7 +1983,7 @@ class basic_json
o.width(0);
// do the actual serialization
- j.dump(o, prettyPrint, static_cast<int>(indentation));
+ j.dump(o, prettyPrint, static_cast<unsigned int>(indentation));
return o;
}