cleaned up code

- removed unnecessary assertions - simplified simple if/return patterns

cleaned up code
- removed unnecessary assertions - simplified simple if/return patterns
a7f8c47f · Niels · bdaade91 · a7f8c47f · a7f8c47f · a7f8c47f
Commit a7f8c47f authored Jul 27, 2016 by Niels
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 121 additions and 350 deletions

ChangeLog.md ChangeLog.md +3 -0

src/json.hpp src/json.hpp +59 -175

src/json.hpp.re2c src/json.hpp.re2c +59 -175

No files found.
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -5,6 +5,9 @@ All notable changes to this project will be documented in this file. This projec

 [Full Changelog](https://github.com/nlohmann/json/compare/v2.0.1...HEAD)

+- value\(\) does not work with \_json\_pointer types [\#283](https://github.com/nlohmann/json/issues/283)
+- Easy serialization of classes [\#280](https://github.com/nlohmann/json/issues/280)
+
 - Build error for std::int64 [\#282](https://github.com/nlohmann/json/issues/282)

 - hexify\(\) function emits conversion warning [\#270](https://github.com/nlohmann/json/issues/270)

--- a/src/json.hpp
+++ b/src/json.hpp
--- a/src/json.hpp.re2c
+++ b/src/json.hpp.re2c