🔖 Merge branch 'release/2.0.8' into develop

🔖 version 2.0.8
📝 updated ChangeLog
2026-02-17 17:14:00 +00:00 · 2016-12-02 20:07:43 +01:00 · 2016-12-02 20:05:53 +01:00 · 2016-12-02 19:04:36 +01:00 · 2016-12-02 18:39:35 +01:00 · 2016-12-02 18:02:38 +01:00
393 changed files with 3003166 additions and 706 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,7 @@ doc/html
 me.nlohmann.json.docset

 benchmarks/files/numbers/*.json
+
+.idea
+cmake-build-debug
+
--- a/.travis.yml
+++ b/.travis.yml
@@ -84,50 +84,41 @@ matrix:
  # Coverity (only for branch coverity_scan)

  - os: linux
-    compiler: gcc
+    compiler: clang
    before_install: echo -n | openssl s_client -connect scan.coverity.com:443 | sed -ne '/-BEGIN CERTIFICATE-/,/-END CERTIFICATE-/p' | sudo tee -a /etc/ssl/certs/ca-certificates.crt
    addons:
      apt:
        sources: ['ubuntu-toolchain-r-test']
-        packages: ['g++-5', 'valgrind']
+        packages: ['valgrind']
      coverity_scan:
        project:
          name: "nlohmann/json"
          description: "Build submitted via Travis CI"
        notification_email: niels.lohmann@gmail.com
-        build_command_prepend: "make clean ; sudo cp $(which g++-5) $(which g++)"
+        build_command_prepend: "make clean"
        build_command: "make"
        branch_pattern: coverity_scan
    env:
-      - COMPILER=g++-5
+      - LLVM_VERSION=3.6.0
      - SPECIAL=coverity

  # OSX / Clang

-  - os: osx
-    osx_image: beta-xcode6.1
-
-  - os: osx
-    osx_image: beta-xcode6.2
-
-  - os: osx
-    osx_image: beta-xcode6.3
-
  - os: osx
    osx_image: xcode6.4

-  - os: osx
-    osx_image: xcode7.1
-
-  - os: osx
-    osx_image: xcode7.2
-
  - os: osx
    osx_image: xcode7.3

  - os: osx
    osx_image: xcode8

+  - os: osx
+    osx_image: xcode8.1
+
+  - os: osx
+    osx_image: xcode8.2
+
  # Linux / GCC

  - os: linux
@@ -213,6 +204,10 @@ install:
     if [[ "${LLVM_VERSION}" != "" ]]; then
       LLVM_DIR=${DEPS_DIR}/llvm-${LLVM_VERSION}
       if [[ -z "$(ls -A ${LLVM_DIR})" ]]; then
+         travis_retry wget --quiet https://cmake.org/files/v3.6/cmake-3.6.1.tar.gz
+         tar xfz cmake-3.6.1.tar.gz
+         (cd cmake-3.6.1 && ./configure --prefix=${LLVM_DIR}/cmake && make install)
+         export PATH="${LLVM_DIR}/cmake/bin:${PATH}"
         LLVM_URL="http://llvm.org/releases/${LLVM_VERSION}/llvm-${LLVM_VERSION}.src.tar.xz"
         LIBCXX_URL="http://llvm.org/releases/${LLVM_VERSION}/libcxx-${LLVM_VERSION}.src.tar.xz"
         LIBCXXABI_URL="http://llvm.org/releases/${LLVM_VERSION}/libcxxabi-${LLVM_VERSION}.src.tar.xz"
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.0)

 # define the project
-project(nlohmann_json VERSION 2.0.3 LANGUAGES CXX)
+project(nlohmann_json VERSION 2.0.8 LANGUAGES CXX)

 enable_testing()

@@ -31,7 +31,8 @@ endif()
 include(CMakePackageConfigHelpers)
 configure_package_config_file("cmake/config.cmake.in"
    "${CMAKE_CURRENT_BINARY_DIR}/${JSON_CONFIG_FILENAME}"
-    INSTALL_DESTINATION ${JSON_CONFIG_DESTINATION})
+    INSTALL_DESTINATION ${JSON_CONFIG_DESTINATION}
+    PATH_VARS JSON_INCLUDE_DESTINATION)
 write_basic_package_version_file("${CMAKE_CURRENT_BINARY_DIR}/${JSON_CONFIGVERSION_FILENAME}"
    VERSION ${PROJECT_VERSION}
    COMPATIBILITY SameMajorVersion)
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -1,24 +1,114 @@
 # Change Log
 All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/).

+## [v2.0.8](https://github.com/nlohmann/json/releases/tag/v2.0.8) (2016-12-02)
+[Full Changelog](https://github.com/nlohmann/json/compare/v2.0.7...v2.0.8)
+
+- Reading from file [\#374](https://github.com/nlohmann/json/issues/374)
+- Compiler warnings? [\#372](https://github.com/nlohmann/json/issues/372)
+- docs: how to release a json object in memory? [\#371](https://github.com/nlohmann/json/issues/371)
+- crash in dump [\#370](https://github.com/nlohmann/json/issues/370)
+- Conversion operators not considered [\#369](https://github.com/nlohmann/json/issues/369)
+- Coverity issue \(FORWARD\_NULL\) in lexer\(std::istream& s\) [\#368](https://github.com/nlohmann/json/issues/368)
+- json::parse on failed stream gets stuck [\#366](https://github.com/nlohmann/json/issues/366)
+- Performance improvements [\#365](https://github.com/nlohmann/json/issues/365)
+- 'to\_string' is not a member of 'std'  [\#364](https://github.com/nlohmann/json/issues/364)
+- Optional comment support. [\#363](https://github.com/nlohmann/json/issues/363)
+- Loss of precision when serializing \<double\> [\#360](https://github.com/nlohmann/json/issues/360)
+- Crash in dump\(\) from a static object [\#359](https://github.com/nlohmann/json/issues/359)
+- json::parse\(...\) vs json j; j.parse\(...\) [\#357](https://github.com/nlohmann/json/issues/357)
+- Hi, is there any method to dump  json to string with the insert order rather than alphabets [\#356](https://github.com/nlohmann/json/issues/356)
+- Provide an example of reading from an json with only a key that has an array of strings. [\#354](https://github.com/nlohmann/json/issues/354)
+- Request: access with default value. [\#353](https://github.com/nlohmann/json/issues/353)
+- {} and \[\] causes parser error. [\#352](https://github.com/nlohmann/json/issues/352)
+- Reading a JSON file into a JSON object [\#351](https://github.com/nlohmann/json/issues/351)
+- Request: 'emplace\_back' [\#349](https://github.com/nlohmann/json/issues/349)
+- Is it possible to stream data through the json parser without storing everything in memory? [\#347](https://github.com/nlohmann/json/issues/347)
+- pure virtual conversion operator [\#346](https://github.com/nlohmann/json/issues/346)
+- Floating point precision lost [\#345](https://github.com/nlohmann/json/issues/345)
+- unit-conversions SIGSEGV on armv7hl [\#303](https://github.com/nlohmann/json/issues/303)
+- Coverity scan fails [\#299](https://github.com/nlohmann/json/issues/299)
+- Using QString as string type [\#274](https://github.com/nlohmann/json/issues/274)
+
+## [v2.0.7](https://github.com/nlohmann/json/releases/tag/v2.0.7) (2016-11-02)
+[Full Changelog](https://github.com/nlohmann/json/compare/v2.0.6...v2.0.7)
+
+- JSON5 [\#348](https://github.com/nlohmann/json/issues/348)
+- Check "Parsing JSON is a Minefield" [\#344](https://github.com/nlohmann/json/issues/344)
+- Allow hex numbers [\#342](https://github.com/nlohmann/json/issues/342)
+- Convert strings to numbers [\#341](https://github.com/nlohmann/json/issues/341)
+- ""-operators ignore the length parameter [\#340](https://github.com/nlohmann/json/issues/340)
+- JSON into std::tuple [\#339](https://github.com/nlohmann/json/issues/339)
+- JSON into vector [\#335](https://github.com/nlohmann/json/issues/335)
+- Installing with Homebrew on Mac Errors \(El Capitan\) [\#331](https://github.com/nlohmann/json/issues/331)
+- g++ make check results in error [\#312](https://github.com/nlohmann/json/issues/312)
+- Cannot convert from 'json' to 'char' [\#276](https://github.com/nlohmann/json/issues/276)
+- Please add a Pretty-Print option for arrays to stay always in one line [\#229](https://github.com/nlohmann/json/issues/229)
+- Conversion to STL map\<string, vector\<int\>\> gives error [\#220](https://github.com/nlohmann/json/issues/220)
+- std::unorderd\_map cannot be used as ObjectType [\#164](https://github.com/nlohmann/json/issues/164)
+
+- fix minor grammar/style issue in README.md [\#336](https://github.com/nlohmann/json/pull/336) ([seeekr](https://github.com/seeekr))
+
+## [v2.0.6](https://github.com/nlohmann/json/releases/tag/v2.0.6) (2016-10-15)
+[Full Changelog](https://github.com/nlohmann/json/compare/v2.0.5...v2.0.6)
+
+- How to handle json files? [\#333](https://github.com/nlohmann/json/issues/333)
+- This file requires compiler and library support .... [\#332](https://github.com/nlohmann/json/issues/332)
+- Segmentation fault on saving json to file [\#326](https://github.com/nlohmann/json/issues/326)
+- parse error - unexpected \<uninitialized\> with 2.0.5 [\#325](https://github.com/nlohmann/json/issues/325)
+- Add nested object capability to pointers [\#323](https://github.com/nlohmann/json/issues/323)
+- Fix usage examples' comments for std::multiset [\#322](https://github.com/nlohmann/json/issues/322)
+- json\_unit runs forever when executed in build directory [\#319](https://github.com/nlohmann/json/issues/319)
+- Visual studio 2015 update3 true != TRUE [\#317](https://github.com/nlohmann/json/issues/317)
+- releasing single header file in compressed format [\#316](https://github.com/nlohmann/json/issues/316)
+- json object from std::ifstream [\#315](https://github.com/nlohmann/json/issues/315)
+
+- make has\_mapped\_type struct friendly [\#324](https://github.com/nlohmann/json/pull/324) ([vpetrigo](https://github.com/vpetrigo))
+- Fix usage examples' comments for std::multiset [\#321](https://github.com/nlohmann/json/pull/321) ([vasild](https://github.com/vasild))
+- Include dir relocation [\#318](https://github.com/nlohmann/json/pull/318) ([ChristophJud](https://github.com/ChristophJud))
+- trivial documentation fix [\#313](https://github.com/nlohmann/json/pull/313) ([5tefan](https://github.com/5tefan))
+
+## [v2.0.5](https://github.com/nlohmann/json/releases/tag/v2.0.5) (2016-09-14)
+[Full Changelog](https://github.com/nlohmann/json/compare/v2.0.4...v2.0.5)
+
+- \[feature request\]: schema validator and comments [\#311](https://github.com/nlohmann/json/issues/311)
+- make json\_benchmarks no longer working in 2.0.4 [\#310](https://github.com/nlohmann/json/issues/310)
+- Segmentation fault \(core dumped\) [\#309](https://github.com/nlohmann/json/issues/309)
+- No matching member function for call to 'get\_impl' [\#308](https://github.com/nlohmann/json/issues/308)
+
+## [v2.0.4](https://github.com/nlohmann/json/releases/tag/v2.0.4) (2016-09-11)
+[Full Changelog](https://github.com/nlohmann/json/compare/v2.0.3...v2.0.4)
+
+- Parsing fails without space at end of file [\#306](https://github.com/nlohmann/json/issues/306)
+- json schema validator [\#305](https://github.com/nlohmann/json/issues/305)
+- Unused variable warning [\#304](https://github.com/nlohmann/json/issues/304)
+
 ## [v2.0.3](https://github.com/nlohmann/json/releases/tag/v2.0.3) (2016-08-31)
 [Full Changelog](https://github.com/nlohmann/json/compare/v2.0.2...v2.0.3)

- Support for iterator-range parsing [\#290](https://github.com/nlohmann/json/issues/290)
-
 - warning C4706: assignment within conditional expression [\#295](https://github.com/nlohmann/json/issues/295)
+- Strip comments / Minify [\#294](https://github.com/nlohmann/json/issues/294)
+- Q: Is it possible to build json tree from already UTF8 encoded values? [\#293](https://github.com/nlohmann/json/issues/293)
+- Equality operator results in array when assigned object [\#292](https://github.com/nlohmann/json/issues/292)
+- Support for integers not from the range \[-\(2\*\*53\)+1, \(2\*\*53\)-1\] in parser [\#291](https://github.com/nlohmann/json/issues/291)
+- Support for iterator-range parsing [\#290](https://github.com/nlohmann/json/issues/290)
 - Horribly inconsistent behavior between const/non-const reference in operator \[\] \(\) [\#289](https://github.com/nlohmann/json/issues/289)
+- Silently get numbers into smaller types [\#288](https://github.com/nlohmann/json/issues/288)
+- Incorrect parsing of large int64\_t numbers [\#287](https://github.com/nlohmann/json/issues/287)
+- \[question\]: macro to disable floating point support [\#284](https://github.com/nlohmann/json/issues/284)

 - unit-constructor1.cpp: Fix floating point truncation warning [\#300](https://github.com/nlohmann/json/pull/300) ([t-b](https://github.com/t-b))

 ## [v2.0.2](https://github.com/nlohmann/json/releases/tag/v2.0.2) (2016-07-31)
 [Full Changelog](https://github.com/nlohmann/json/compare/v2.0.1...v2.0.2)

+- can function dump\(\)  return string in the order I push in the json object ? [\#286](https://github.com/nlohmann/json/issues/286)
+- Error on the Mac: Undefined symbols for architecture x86\_64 [\#285](https://github.com/nlohmann/json/issues/285)
 - 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)
-
+- strings can't be accessed after dump\(\)-\>parse\(\) - type is lost [\#281](https://github.com/nlohmann/json/issues/281)
+- Easy serialization of classes [\#280](https://github.com/nlohmann/json/issues/280)
+- recursive data structures [\#277](https://github.com/nlohmann/json/issues/277)
 - hexify\(\) function emits conversion warning [\#270](https://github.com/nlohmann/json/issues/270)

 - let the makefile choose the correct sed [\#279](https://github.com/nlohmann/json/pull/279) ([murinicanor](https://github.com/murinicanor))
@@ -27,6 +117,7 @@ All notable changes to this project will be documented in this file. This projec
 ## [v2.0.1](https://github.com/nlohmann/json/releases/tag/v2.0.1) (2016-06-28)
 [Full Changelog](https://github.com/nlohmann/json/compare/v2.0.0...v2.0.1)

+- Compilation error. [\#273](https://github.com/nlohmann/json/issues/273)
 - dump\(\) performance degradation in v2 [\#272](https://github.com/nlohmann/json/issues/272)

 - fixed a tiny typo [\#271](https://github.com/nlohmann/json/pull/271) ([thelostt](https://github.com/thelostt))
@@ -34,43 +125,61 @@ All notable changes to this project will be documented in this file. This projec
 ## [v2.0.0](https://github.com/nlohmann/json/releases/tag/v2.0.0) (2016-06-23)
 [Full Changelog](https://github.com/nlohmann/json/compare/v1.1.0...v2.0.0)

- concatenate objects [\#252](https://github.com/nlohmann/json/issues/252)
- Unit test fails when doing a CMake out-of-tree build [\#241](https://github.com/nlohmann/json/issues/241)
- Additional integration options [\#237](https://github.com/nlohmann/json/issues/237)
- Can't use basic\_json::iterator as a base iterator for std::move\_iterator [\#233](https://github.com/nlohmann/json/issues/233)
- Provide a FAQ [\#163](https://github.com/nlohmann/json/issues/163)
- Create PULL\_REQUEST\_TEMPLATE.md [\#213](https://github.com/nlohmann/json/pull/213) ([whackashoe](https://github.com/whackashoe))
- fixed noexcept; added constexpr [\#208](https://github.com/nlohmann/json/pull/208) ([nlohmann](https://github.com/nlohmann))
- Add support for afl-fuzz testing [\#207](https://github.com/nlohmann/json/pull/207) ([mykter](https://github.com/mykter))
- Issue \#178 - Extending support to full uint64\_t/int64\_t range and unsigned type \(updated\) [\#193](https://github.com/nlohmann/json/pull/193) ([twelsby](https://github.com/twelsby))
-
 - json::diff generates incorrect patch when removing multiple array elements. [\#269](https://github.com/nlohmann/json/issues/269)
+- Docs - What does Json\[key\] return? [\#267](https://github.com/nlohmann/json/issues/267)
+- Compiler Errors With JSON.hpp [\#265](https://github.com/nlohmann/json/issues/265)
+- Throw exception instead of crashing my app [\#264](https://github.com/nlohmann/json/issues/264)
+- Ambiguous push\_back and operator+= overloads [\#263](https://github.com/nlohmann/json/issues/263)
+- Preseving order of items in json [\#262](https://github.com/nlohmann/json/issues/262)
+- '\' char problem in strings [\#261](https://github.com/nlohmann/json/issues/261)
+- VS2015 compile fail [\#260](https://github.com/nlohmann/json/issues/260)
 - -Wconversion warning [\#259](https://github.com/nlohmann/json/issues/259)
 - Maybe a bug [\#258](https://github.com/nlohmann/json/issues/258)
+- Few tests failed on Visual C++ 2015 [\#257](https://github.com/nlohmann/json/issues/257)
+- Access keys when iteration with new for loop C++11 [\#256](https://github.com/nlohmann/json/issues/256)
+- multiline text values [\#255](https://github.com/nlohmann/json/issues/255)
+- Error when using json in g++ [\#254](https://github.com/nlohmann/json/issues/254)
+- is the release 2.0? [\#253](https://github.com/nlohmann/json/issues/253)
+- concatenate objects [\#252](https://github.com/nlohmann/json/issues/252)
+- Encoding [\#251](https://github.com/nlohmann/json/issues/251)
+- Unable to build example for constructing json object with stringstreams [\#250](https://github.com/nlohmann/json/issues/250)
+- Hexadecimal support [\#249](https://github.com/nlohmann/json/issues/249)
+- Update long-term goals [\#246](https://github.com/nlohmann/json/issues/246)
+- Contribution To This Json Project [\#245](https://github.com/nlohmann/json/issues/245)
+- Trouble using parser with initial dictionary [\#243](https://github.com/nlohmann/json/issues/243)
+- Unit test fails when doing a CMake out-of-tree build [\#241](https://github.com/nlohmann/json/issues/241)
 - -Wconversion warnings [\#239](https://github.com/nlohmann/json/issues/239)
+- Additional integration options [\#237](https://github.com/nlohmann/json/issues/237)
+- .get\<std::string\>\(\) works for non spaced string but returns as array for spaced/longer strings [\#236](https://github.com/nlohmann/json/issues/236)
 - ambiguous overload for 'push\_back' and 'operator+=' [\#235](https://github.com/nlohmann/json/issues/235)
+- Can't use basic\_json::iterator as a base iterator for std::move\_iterator [\#233](https://github.com/nlohmann/json/issues/233)
+- json object's creation can freezes execution [\#231](https://github.com/nlohmann/json/issues/231)
 - Incorrect dumping of parsed numbers with exponents, but without decimal places [\#230](https://github.com/nlohmann/json/issues/230)
 - double values are serialized with commas as decimal points [\#228](https://github.com/nlohmann/json/issues/228)
 - Move semantics with std::initializer\_list [\#225](https://github.com/nlohmann/json/issues/225)
+- replace emplace [\#224](https://github.com/nlohmann/json/issues/224)
 - abort during getline in yyfill [\#223](https://github.com/nlohmann/json/issues/223)
+- free\(\): invalid pointer error in GCC 5.2.1 [\#221](https://github.com/nlohmann/json/issues/221)
+- Error compile Android NDK  error: 'strtof' is not a member of 'std' [\#219](https://github.com/nlohmann/json/issues/219)
 - Wrong link in the README.md [\#217](https://github.com/nlohmann/json/issues/217)
+- Wide character strings not supported [\#216](https://github.com/nlohmann/json/issues/216)
+- Memory allocations using range-based for loops [\#214](https://github.com/nlohmann/json/issues/214)
+- would you like to support gcc 4.8.1?  [\#211](https://github.com/nlohmann/json/issues/211)
+- Reading concatenated json's from an istream [\#210](https://github.com/nlohmann/json/issues/210)
+- Conflicting typedef of ssize\_t on Windows 32 bit when using Boost.Python [\#204](https://github.com/nlohmann/json/issues/204)
+- Inconsistency between operator\[\] and push\_back [\#203](https://github.com/nlohmann/json/issues/203)
 - Small bugs in json.hpp \(get\_number\) and unit.cpp \(non-standard integer type test\) [\#199](https://github.com/nlohmann/json/issues/199)
 - GCC/clang floating point parsing bug in strtod\(\) [\#195](https://github.com/nlohmann/json/issues/195)
+- What is within scope? [\#192](https://github.com/nlohmann/json/issues/192)
 - Bugs in miloyip/nativejson-benchmark: roundtrips [\#187](https://github.com/nlohmann/json/issues/187)
 - Floating point exceptions [\#181](https://github.com/nlohmann/json/issues/181)
- In basic\_json::basic\_json\(const CompatibleArrayType& val\), the requirement of CompatibleArrayType is not strict enough. [\#174](https://github.com/nlohmann/json/issues/174)
- Implicit assignment to std::string fails [\#144](https://github.com/nlohmann/json/issues/144)
- Fix Issue \#265 [\#266](https://github.com/nlohmann/json/pull/266) ([06needhamt](https://github.com/06needhamt))
- Issue \#195 - update Travis to Trusty due to gcc/clang strtod\(\) bug [\#196](https://github.com/nlohmann/json/pull/196) ([twelsby](https://github.com/twelsby))
-
- Compiler Errors With JSON.hpp [\#265](https://github.com/nlohmann/json/issues/265)
- VS2015 compile fail [\#260](https://github.com/nlohmann/json/issues/260)
- Error when using json in g++ [\#254](https://github.com/nlohmann/json/issues/254)
- Update long-term goals [\#246](https://github.com/nlohmann/json/issues/246)
- Error compile Android NDK  error: 'strtof' is not a member of 'std' [\#219](https://github.com/nlohmann/json/issues/219)
- Conflicting typedef of ssize\_t on Windows 32 bit when using Boost.Python [\#204](https://github.com/nlohmann/json/issues/204)
 - Integer conversion to unsigned [\#178](https://github.com/nlohmann/json/issues/178)
+- map string string fails to compile [\#176](https://github.com/nlohmann/json/issues/176)
+- In basic\_json::basic\_json\(const CompatibleArrayType& val\), the requirement of CompatibleArrayType is not strict enough. [\#174](https://github.com/nlohmann/json/issues/174)
+- Provide a FAQ [\#163](https://github.com/nlohmann/json/issues/163)
+- Implicit assignment to std::string fails [\#144](https://github.com/nlohmann/json/issues/144)

+- Fix Issue \#265 [\#266](https://github.com/nlohmann/json/pull/266) ([06needhamt](https://github.com/06needhamt))
 - Define CMake/CTest tests [\#247](https://github.com/nlohmann/json/pull/247) ([robertmrk](https://github.com/robertmrk))
 - Out of tree builds and a few other miscellaneous CMake cleanups. [\#242](https://github.com/nlohmann/json/pull/242) ([ChrisKitching](https://github.com/ChrisKitching))
 - Implement additional integration options [\#238](https://github.com/nlohmann/json/pull/238) ([robertmrk](https://github.com/robertmrk))
@@ -79,73 +188,81 @@ All notable changes to this project will be documented in this file. This projec
 - Use namespace std for int64\_t and uint64\_t [\#226](https://github.com/nlohmann/json/pull/226) ([lv-zheng](https://github.com/lv-zheng))
 - Added missing cerrno header to fix ERANGE compile error on android [\#222](https://github.com/nlohmann/json/pull/222) ([Teemperor](https://github.com/Teemperor))
 - Corrected readme [\#218](https://github.com/nlohmann/json/pull/218) ([Annihil](https://github.com/Annihil))
+- Create PULL\_REQUEST\_TEMPLATE.md [\#213](https://github.com/nlohmann/json/pull/213) ([whackashoe](https://github.com/whackashoe))
+- fixed noexcept; added constexpr [\#208](https://github.com/nlohmann/json/pull/208) ([nlohmann](https://github.com/nlohmann))
+- Add support for afl-fuzz testing [\#207](https://github.com/nlohmann/json/pull/207) ([mykter](https://github.com/mykter))
 - replaced ssize\_t occurrences with auto \(addresses \#204\) [\#205](https://github.com/nlohmann/json/pull/205) ([nlohmann](https://github.com/nlohmann))
 - Fixed issue \#199 - Small bugs in json.hpp \(get\_number\) and unit.cpp \(non-standard integer type test\) [\#200](https://github.com/nlohmann/json/pull/200) ([twelsby](https://github.com/twelsby))
 - Fix broken link [\#197](https://github.com/nlohmann/json/pull/197) ([vog](https://github.com/vog))
+- Issue \#195 - update Travis to Trusty due to gcc/clang strtod\(\) bug [\#196](https://github.com/nlohmann/json/pull/196) ([twelsby](https://github.com/twelsby))
+- Issue \#178 - Extending support to full uint64\_t/int64\_t range and unsigned type \(updated\) [\#193](https://github.com/nlohmann/json/pull/193) ([twelsby](https://github.com/twelsby))

 ## [v1.1.0](https://github.com/nlohmann/json/releases/tag/v1.1.0) (2016-01-24)
 [Full Changelog](https://github.com/nlohmann/json/compare/v1.0.0...v1.1.0)

- JSON performance benchmark comparision [\#177](https://github.com/nlohmann/json/issues/177)
- Since re2c is often ignored in pull requests, it may make sense to make a contributing.md file [\#175](https://github.com/nlohmann/json/issues/175)
- Add assertions [\#168](https://github.com/nlohmann/json/issues/168)
- range based for loop for objects [\#83](https://github.com/nlohmann/json/issues/83)
- Implementation of get\_ref\(\) [\#184](https://github.com/nlohmann/json/pull/184) ([dariomt](https://github.com/dariomt))
-
 - Small error in pull \#185 [\#194](https://github.com/nlohmann/json/issues/194)
 - Bugs in miloyip/nativejson-benchmark: floating-point parsing [\#186](https://github.com/nlohmann/json/issues/186)
- Cannot index by key of type static constexpr const char\* [\#171](https://github.com/nlohmann/json/issues/171)
- Fixed Issue \#171 - added two extra template overloads of operator\[\] for T\* arguments [\#189](https://github.com/nlohmann/json/pull/189) ([twelsby](https://github.com/twelsby))
- Fixed issue \#167 - removed operator ValueType\(\) condition for VS2015 [\#188](https://github.com/nlohmann/json/pull/188) ([twelsby](https://github.com/twelsby))
-
 - Floating point equality [\#185](https://github.com/nlohmann/json/issues/185)
 - Unused variables in catch [\#180](https://github.com/nlohmann/json/issues/180)
 - Typo in documentation [\#179](https://github.com/nlohmann/json/issues/179)
+- JSON performance benchmark comparision [\#177](https://github.com/nlohmann/json/issues/177)
+- Since re2c is often ignored in pull requests, it may make sense to make a contributing.md file [\#175](https://github.com/nlohmann/json/issues/175)
+- Question about exceptions [\#173](https://github.com/nlohmann/json/issues/173)
 - Android? [\#172](https://github.com/nlohmann/json/issues/172)
+- Cannot index by key of type static constexpr const char\* [\#171](https://github.com/nlohmann/json/issues/171)
+- Add assertions [\#168](https://github.com/nlohmann/json/issues/168)
 - MSVC 2015 build fails when attempting to compare object\_t [\#167](https://github.com/nlohmann/json/issues/167)
 - Member detector is not portable [\#166](https://github.com/nlohmann/json/issues/166)
 - Unnecessary const\_cast [\#162](https://github.com/nlohmann/json/issues/162)
+- Question about get\_ref\(\) [\#128](https://github.com/nlohmann/json/issues/128)
+- range based for loop for objects [\#83](https://github.com/nlohmann/json/issues/83)
 - Consider submitting this to the Boost Library Incubator [\#66](https://github.com/nlohmann/json/issues/66)

 - Fixed Issue \#186 - add strto\(f|d|ld\) overload wrappers, "-0.0" special case and FP trailing zero [\#191](https://github.com/nlohmann/json/pull/191) ([twelsby](https://github.com/twelsby))
 - Issue \#185 - remove approx\(\) and use \#pragma to kill warnings [\#190](https://github.com/nlohmann/json/pull/190) ([twelsby](https://github.com/twelsby))
+- Fixed Issue \#171 - added two extra template overloads of operator\[\] for T\* arguments [\#189](https://github.com/nlohmann/json/pull/189) ([twelsby](https://github.com/twelsby))
+- Fixed issue \#167 - removed operator ValueType\(\) condition for VS2015 [\#188](https://github.com/nlohmann/json/pull/188) ([twelsby](https://github.com/twelsby))
+- Implementation of get\_ref\(\) [\#184](https://github.com/nlohmann/json/pull/184) ([dariomt](https://github.com/dariomt))
 - Fixed some typos in CONTRIBUTING.md [\#182](https://github.com/nlohmann/json/pull/182) ([nibroc](https://github.com/nibroc))

 ## [v1.0.0](https://github.com/nlohmann/json/releases/tag/v1.0.0) (2015-12-27)
 [Full Changelog](https://github.com/nlohmann/json/compare/v1.0.0-rc1...v1.0.0)

 - add key name to exception [\#160](https://github.com/nlohmann/json/issues/160)
- prevent json.hpp from emitting compiler warnings [\#154](https://github.com/nlohmann/json/issues/154)
- json::parse\(string\) does not check utf8 bom [\#152](https://github.com/nlohmann/json/issues/152)
- unsigned 64bit values output as signed [\#151](https://github.com/nlohmann/json/issues/151)
- Wish feature: json5 [\#150](https://github.com/nlohmann/json/issues/150)
- overload of at\(\) with default value [\#133](https://github.com/nlohmann/json/issues/133)
- Memory leak in face of exceptions [\#118](https://github.com/nlohmann/json/issues/118)
- Find and Count for arrays [\#117](https://github.com/nlohmann/json/issues/117)
- dynamically constructing an arbitrarily nested object [\#114](https://github.com/nlohmann/json/issues/114)
- object field accessors [\#103](https://github.com/nlohmann/json/issues/103)
- v8pp and json [\#95](https://github.com/nlohmann/json/issues/95)
- Wishlist [\#65](https://github.com/nlohmann/json/issues/65)
- Windows/Visual Studio \(through 2013\) is unsupported [\#62](https://github.com/nlohmann/json/issues/62)
-
- Bug in basic\_json::operator\[\] const overload [\#135](https://github.com/nlohmann/json/issues/135)
- wrong enable\_if for const pointer \(instead of pointer-to-const\) [\#134](https://github.com/nlohmann/json/issues/134)
- Visual Studio 14 Debug assertion failed [\#125](https://github.com/nlohmann/json/issues/125)
- Compile error with g++ 4.9.3 cygwin 64-bit [\#112](https://github.com/nlohmann/json/issues/112)
- error: unterminated raw string [\#109](https://github.com/nlohmann/json/issues/109)
- \[clang-3.6.2\] string/sstream with number to json issue [\#107](https://github.com/nlohmann/json/issues/107)
-
 - Getting member discarding qualifyer [\#159](https://github.com/nlohmann/json/issues/159)
 - basic\_json::iterator::value\(\) output includes quotes while basic\_json::iterator::key\(\) doesn't [\#158](https://github.com/nlohmann/json/issues/158)
 - Indexing `const basic\_json\<\>` with `const basic\_string\<char\>` [\#157](https://github.com/nlohmann/json/issues/157)
 - token\_type\_name\(token\_type t\): not all control paths return a value [\#156](https://github.com/nlohmann/json/issues/156)
+- prevent json.hpp from emitting compiler warnings [\#154](https://github.com/nlohmann/json/issues/154)
+- json::parse\(string\) does not check utf8 bom [\#152](https://github.com/nlohmann/json/issues/152)
+- unsigned 64bit values output as signed [\#151](https://github.com/nlohmann/json/issues/151)
+- Wish feature: json5 [\#150](https://github.com/nlohmann/json/issues/150)
 - Unable to compile on MSVC 2015 with SDL checking enabled: This function or variable may be unsafe. [\#149](https://github.com/nlohmann/json/issues/149)
+- "Json Object" type does not keep object order [\#148](https://github.com/nlohmann/json/issues/148)
 - dump\(\)  convert strings encoded by utf-8 to shift-jis on windows 10.  [\#147](https://github.com/nlohmann/json/issues/147)
 - Unable to get field names in a json object [\#145](https://github.com/nlohmann/json/issues/145)
+- Question: Is the use of incomplete type correct? [\#138](https://github.com/nlohmann/json/issues/138)
 - json.hpp:5746:32: error: 'to\_string' is not a member of 'std' [\#136](https://github.com/nlohmann/json/issues/136)
+- Bug in basic\_json::operator\[\] const overload [\#135](https://github.com/nlohmann/json/issues/135)
+- wrong enable\_if for const pointer \(instead of pointer-to-const\) [\#134](https://github.com/nlohmann/json/issues/134)
+- overload of at\(\) with default value [\#133](https://github.com/nlohmann/json/issues/133)
+- Splitting source [\#132](https://github.com/nlohmann/json/issues/132)
+- Question about get\_ptr\(\) [\#127](https://github.com/nlohmann/json/issues/127)
+- Visual Studio 14 Debug assertion failed [\#125](https://github.com/nlohmann/json/issues/125)
+- Memory leak in face of exceptions [\#118](https://github.com/nlohmann/json/issues/118)
+- Find and Count for arrays [\#117](https://github.com/nlohmann/json/issues/117)
+- dynamically constructing an arbitrarily nested object [\#114](https://github.com/nlohmann/json/issues/114)
 - Returning any data type [\#113](https://github.com/nlohmann/json/issues/113)
+- Compile error with g++ 4.9.3 cygwin 64-bit [\#112](https://github.com/nlohmann/json/issues/112)
+- insert json array issue with gcc4.8.2 [\#110](https://github.com/nlohmann/json/issues/110)
+- error: unterminated raw string [\#109](https://github.com/nlohmann/json/issues/109)
 - vector\<json\> copy constructor really weird [\#108](https://github.com/nlohmann/json/issues/108)
+- \[clang-3.6.2\] string/sstream with number to json issue [\#107](https://github.com/nlohmann/json/issues/107)
 - maintaining order of keys during iteration [\#106](https://github.com/nlohmann/json/issues/106)
+- object field accessors [\#103](https://github.com/nlohmann/json/issues/103)
+- v8pp and json [\#95](https://github.com/nlohmann/json/issues/95)
+- Wishlist [\#65](https://github.com/nlohmann/json/issues/65)
+- Windows/Visual Studio \(through 2013\) is unsupported [\#62](https://github.com/nlohmann/json/issues/62)

 - Replace sprintf with hex function, this fixes \#149 [\#153](https://github.com/nlohmann/json/pull/153) ([whackashoe](https://github.com/whackashoe))
 - Fix character skipping after a surrogate pair [\#146](https://github.com/nlohmann/json/pull/146) ([robertmrk](https://github.com/robertmrk))
@@ -161,65 +278,71 @@ All notable changes to this project will be documented in this file. This projec
 - Use the right variable name in doc string [\#115](https://github.com/nlohmann/json/pull/115) ([whoshuu](https://github.com/whoshuu))

 ## [v1.0.0-rc1](https://github.com/nlohmann/json/releases/tag/v1.0.0-rc1) (2015-07-26)
+- Finish documenting the public interface in Doxygen [\#102](https://github.com/nlohmann/json/issues/102)
+- Binary string causes numbers to be dumped as hex [\#101](https://github.com/nlohmann/json/issues/101)
+- failed to iterator json object with reverse\_iterator [\#100](https://github.com/nlohmann/json/issues/100)
+- 'noexcept' : unknown override specifier [\#99](https://github.com/nlohmann/json/issues/99)
+- json float parsing problem [\#98](https://github.com/nlohmann/json/issues/98)
 - Adjust wording to JSON RFC [\#97](https://github.com/nlohmann/json/issues/97)
+- 17 MB / 90 MB repo size!? [\#96](https://github.com/nlohmann/json/issues/96)
+- static analysis warnings [\#94](https://github.com/nlohmann/json/issues/94)
+- reverse\_iterator operator inheritance problem [\#93](https://github.com/nlohmann/json/issues/93)
+- init error [\#92](https://github.com/nlohmann/json/issues/92)
 - access by \(const\) reference [\#91](https://github.com/nlohmann/json/issues/91)
 - is\_integer and is\_float tests [\#90](https://github.com/nlohmann/json/issues/90)
+- Nonstandard integer type [\#89](https://github.com/nlohmann/json/issues/89)
+- static library build [\#84](https://github.com/nlohmann/json/issues/84)
+- lexer::get\_number return NAN [\#82](https://github.com/nlohmann/json/issues/82)
 - MinGW have no std::to\_string [\#80](https://github.com/nlohmann/json/issues/80)
+- Incorrect behaviour of basic\_json::count method [\#78](https://github.com/nlohmann/json/issues/78)
+- Invoking is\_array\(\) function creates "null" value [\#77](https://github.com/nlohmann/json/issues/77)
+- dump\(\) / parse\(\) not idempotent [\#76](https://github.com/nlohmann/json/issues/76)
+- Handle infinity and NaN cases [\#70](https://github.com/nlohmann/json/issues/70)
+- errors in g++-4.8.1 [\#68](https://github.com/nlohmann/json/issues/68)
+- Keys when iterating over objects [\#67](https://github.com/nlohmann/json/issues/67)
+- Compilation results in tons of warnings [\#64](https://github.com/nlohmann/json/issues/64)
+- Complete brief documentation [\#61](https://github.com/nlohmann/json/issues/61)
+- Double quotation mark is not parsed correctly [\#60](https://github.com/nlohmann/json/issues/60)
+- Get coverage back to 100% [\#58](https://github.com/nlohmann/json/issues/58)
 - erase elements using iterators [\#57](https://github.com/nlohmann/json/issues/57)
 - Removing item from array [\#56](https://github.com/nlohmann/json/issues/56)
 - Serialize/Deserialize like PHP? [\#55](https://github.com/nlohmann/json/issues/55)
+- Numbers as keys [\#54](https://github.com/nlohmann/json/issues/54)
+- Why are elements alphabetized on key while iterating? [\#53](https://github.com/nlohmann/json/issues/53)
 - Document erase, count, and iterators key and value [\#52](https://github.com/nlohmann/json/issues/52)
+- Do not use std::to\_string [\#51](https://github.com/nlohmann/json/issues/51)
 - Supported compilers [\#50](https://github.com/nlohmann/json/issues/50)
+- Confused about iterating through json objects [\#49](https://github.com/nlohmann/json/issues/49)
 - Use non-member begin/end [\#48](https://github.com/nlohmann/json/issues/48)
 - Erase key [\#47](https://github.com/nlohmann/json/issues/47)
 - Key iterator [\#46](https://github.com/nlohmann/json/issues/46)
 - Add count member function [\#45](https://github.com/nlohmann/json/issues/45)
- Printing attribute names [\#39](https://github.com/nlohmann/json/issues/39)
- Avoid using spaces when encoding without pretty print [\#31](https://github.com/nlohmann/json/issues/31)
- Cannot encode long numbers [\#30](https://github.com/nlohmann/json/issues/30)
- Creating an empty array [\#27](https://github.com/nlohmann/json/issues/27)
- Custom allocator support [\#25](https://github.com/nlohmann/json/issues/25)
- create a header-only version [\#16](https://github.com/nlohmann/json/issues/16)
- Add to\_string overload for indentation [\#13](https://github.com/nlohmann/json/issues/13)
- move code into namespace [\#9](https://github.com/nlohmann/json/issues/9)
- free functions for explicit objects and arrays in initializer lists [\#8](https://github.com/nlohmann/json/issues/8)
- Test case coverage [\#2](https://github.com/nlohmann/json/issues/2)
- Parse streams incrementally. [\#40](https://github.com/nlohmann/json/pull/40) ([aburgh](https://github.com/aburgh))
-
- Binary string causes numbers to be dumped as hex [\#101](https://github.com/nlohmann/json/issues/101)
- failed to iterator json object with reverse\_iterator [\#100](https://github.com/nlohmann/json/issues/100)
- static analysis warnings [\#94](https://github.com/nlohmann/json/issues/94)
- reverse\_iterator operator inheritance problem [\#93](https://github.com/nlohmann/json/issues/93)
- Nonstandard integer type [\#89](https://github.com/nlohmann/json/issues/89)
- lexer::get\_number return NAN [\#82](https://github.com/nlohmann/json/issues/82)
- Handle infinity and NaN cases [\#70](https://github.com/nlohmann/json/issues/70)
- errors in g++-4.8.1 [\#68](https://github.com/nlohmann/json/issues/68)
- Double quotation mark is not parsed correctly [\#60](https://github.com/nlohmann/json/issues/60)
- Do not use std::to\_string [\#51](https://github.com/nlohmann/json/issues/51)
- Confused about iterating through json objects [\#49](https://github.com/nlohmann/json/issues/49)
 - Problem getting vector \(array\) of strings [\#44](https://github.com/nlohmann/json/issues/44)
 - Compilation error due to assuming that private=public [\#43](https://github.com/nlohmann/json/issues/43)
 - Use of deprecated implicit copy constructor [\#42](https://github.com/nlohmann/json/issues/42)
+- Printing attribute names [\#39](https://github.com/nlohmann/json/issues/39)
 - dumping a small number\_float just outputs 0.000000 [\#37](https://github.com/nlohmann/json/issues/37)
+- find is error [\#32](https://github.com/nlohmann/json/issues/32)
 - Avoid using spaces when encoding without pretty print [\#31](https://github.com/nlohmann/json/issues/31)
 - Cannot encode long numbers [\#30](https://github.com/nlohmann/json/issues/30)
 - segmentation fault when iterating over empty arrays/objects [\#28](https://github.com/nlohmann/json/issues/28)
+- Creating an empty array [\#27](https://github.com/nlohmann/json/issues/27)
+- Custom allocator support [\#25](https://github.com/nlohmann/json/issues/25)
+- make the type of the used string container customizable [\#20](https://github.com/nlohmann/json/issues/20)
 - Improper parsing of JSON string "\\" [\#17](https://github.com/nlohmann/json/issues/17)
+- create a header-only version [\#16](https://github.com/nlohmann/json/issues/16)
 - Don't return "const values" [\#15](https://github.com/nlohmann/json/issues/15)
+- Add to\_string overload for indentation [\#13](https://github.com/nlohmann/json/issues/13)
 - string parser does not recognize uncompliant strings [\#12](https://github.com/nlohmann/json/issues/12)
- free functions for explicit objects and arrays in initializer lists [\#8](https://github.com/nlohmann/json/issues/8)
- Runtime error in Travis job [\#1](https://github.com/nlohmann/json/issues/1)
- Fix compilation of json\_unit with GCC 5 [\#59](https://github.com/nlohmann/json/pull/59) ([dkopecek](https://github.com/dkopecek))
-
- Finish documenting the public interface in Doxygen [\#102](https://github.com/nlohmann/json/issues/102)
- 'noexcept' : unknown override specifier [\#99](https://github.com/nlohmann/json/issues/99)
- Keys when iterating over objects [\#67](https://github.com/nlohmann/json/issues/67)
- Complete brief documentation [\#61](https://github.com/nlohmann/json/issues/61)
- Get coverage back to 100% [\#58](https://github.com/nlohmann/json/issues/58)
 - possible double-free in find function [\#11](https://github.com/nlohmann/json/issues/11)
 - UTF-8 encoding/deconding/testing [\#10](https://github.com/nlohmann/json/issues/10)
+- move code into namespace [\#9](https://github.com/nlohmann/json/issues/9)
+- free functions for explicit objects and arrays in initializer lists [\#8](https://github.com/nlohmann/json/issues/8)
+- unique\_ptr for ownership [\#7](https://github.com/nlohmann/json/issues/7)
 - Add unit tests [\#4](https://github.com/nlohmann/json/issues/4)
 - Drop C++98 support [\#3](https://github.com/nlohmann/json/issues/3)
+- Test case coverage [\#2](https://github.com/nlohmann/json/issues/2)
+- Runtime error in Travis job [\#1](https://github.com/nlohmann/json/issues/1)

 - Keyword 'inline' is useless when member functions are defined in headers [\#87](https://github.com/nlohmann/json/pull/87) ([ahamez](https://github.com/ahamez))
 - Remove useless typename [\#86](https://github.com/nlohmann/json/pull/86) ([ahamez](https://github.com/ahamez))
@@ -229,6 +352,8 @@ All notable changes to this project will be documented in this file. This projec
 - support enum [\#71](https://github.com/nlohmann/json/pull/71) ([likebeta](https://github.com/likebeta))
 - Fix performance regression introduced with the parsing callback feature. [\#69](https://github.com/nlohmann/json/pull/69) ([aburgh](https://github.com/aburgh))
 - Improve the implementations of the comparission-operators [\#63](https://github.com/nlohmann/json/pull/63) ([Florianjw](https://github.com/Florianjw))
+- Fix compilation of json\_unit with GCC 5 [\#59](https://github.com/nlohmann/json/pull/59) ([dkopecek](https://github.com/dkopecek))
+- Parse streams incrementally. [\#40](https://github.com/nlohmann/json/pull/40) ([aburgh](https://github.com/aburgh))
 - Feature/small float serialization [\#38](https://github.com/nlohmann/json/pull/38) ([jrandall](https://github.com/jrandall))
 - template version with re2c scanner [\#36](https://github.com/nlohmann/json/pull/36) ([nlohmann](https://github.com/nlohmann))
 - more descriptive documentation in example [\#33](https://github.com/nlohmann/json/pull/33) ([luxe](https://github.com/luxe))
--- a/LICENSE.MIT
+++ b/LICENSE.MIT
@@ -1,4 +1,4 @@
-The library is licensed under the MIT License 
+JSON for Modern C++ is licensed under the MIT License 
 <http://opensource.org/licenses/MIT>:

 Copyright (c) 2013-2016 Niels Lohmann
--- a/4
+++ b/4
@@ -75,7 +75,7 @@ clang_sanitize: clean

 # create scanner with re2c
 re2c: src/json.hpp.re2c
-	$(RE2C) -W --bit-vectors --nested-ifs --no-debug-info $< | $(SED) '1d' > src/json.hpp
+	$(RE2C) -W --utf-8 --encoding-policy fail --bit-vectors --nested-ifs --no-debug-info $< | $(SED) '1d' > src/json.hpp

 # pretty printer
 pretty:
@@ -95,7 +95,7 @@ pretty:
 # benchmarks
 json_benchmarks: benchmarks/benchmarks.cpp benchmarks/benchpress.hpp benchmarks/cxxopts.hpp src/json.hpp
 	cd benchmarks/files/numbers ; python generate.py
-	$(CXX) -std=c++11 $(CXXFLAGS) -DNDEBUG -O3 -flto -I src -I benchmarks $< $(LDFLAGS) -o $@
+	$(CXX) -std=c++11 -pthread $(CXXFLAGS) -DNDEBUG -O3 -flto -I src -I benchmarks $< $(LDFLAGS) -o $@
 	./json_benchmarks


--- a/README.md
+++ b/README.md
@@ -3,7 +3,8 @@
 [![Build Status](https://travis-ci.org/nlohmann/json.svg?branch=master)](https://travis-ci.org/nlohmann/json)
 [![Build Status](https://ci.appveyor.com/api/projects/status/1acb366xfyg3qybk/branch/develop?svg=true)](https://ci.appveyor.com/project/nlohmann/json)
 [![Coverage Status](https://img.shields.io/coveralls/nlohmann/json.svg)](https://coveralls.io/r/nlohmann/json)
-[![Try online](https://img.shields.io/badge/try-online-blue.svg)](http://melpon.org/wandbox/permlink/zkFPohcXJ2TFuAyq)
+[![Coverity Scan Build Status](https://scan.coverity.com/projects/5550/badge.svg)](https://scan.coverity.com/projects/nlohmann-json)
+[![Try online](https://img.shields.io/badge/try-online-blue.svg)](http://melpon.org/wandbox/permlink/fsf5FqYe6GoX68W6)
 [![Documentation](https://img.shields.io/badge/docs-doxygen-blue.svg)](http://nlohmann.github.io/json)
 [![GitHub license](https://img.shields.io/badge/license-MIT-blue.svg)](https://raw.githubusercontent.com/nlohmann/json/master/LICENSE.MIT)
 [![Github Releases](https://img.shields.io/github/release/nlohmann/json.svg)](https://github.com/nlohmann/json/releases)
@@ -14,7 +15,7 @@

 There are myriads of [JSON](http://json.org) libraries out there, and each may even have its reason to exist. Our class had these design goals:

- **Intuitive syntax**. In languages such as Python, JSON feels like a first class data type. We used all the operator magic of modern C++ to achieve the same feeling in your code. Check out the [examples below](#examples) and you know, what I mean.
+- **Intuitive syntax**. In languages such as Python, JSON feels like a first class data type. We used all the operator magic of modern C++ to achieve the same feeling in your code. Check out the [examples below](#examples) and you'll know what I mean.

 - **Trivial integration**. Our whole code consists of a single header file [`json.hpp`](https://github.com/nlohmann/json/blob/develop/src/json.hpp). That's it. No library, no subproject, no dependencies, no complex build system. The class is written in vanilla C++11. All in all, everything should require no adjustment of your compiler flags or project settings.

@@ -24,7 +25,7 @@ Other aspects were not so important to us:

 - **Memory efficiency**. Each JSON object has an overhead of one pointer (the maximal size of a union) and one enumeration element (1 byte). The default generalization uses the following C++ data types: `std::string` for strings, `int64_t`, `uint64_t` or `double` for numbers, `std::map` for objects, `std::vector` for arrays, and `bool` for Booleans. However, you can template the generalized class `basic_json` to your needs.

- **Speed**. We currently implement the parser as naive [recursive descent parser](http://en.wikipedia.org/wiki/Recursive_descent_parser) with hand coded string handling. It is fast enough, but a [LALR-parser](http://en.wikipedia.org/wiki/LALR_parser) may be even faster (but would consist of more files which makes the integration harder).
+- **Speed**. There are certainly [faster JSON libraries](https://github.com/miloyip/nativejson-benchmark#parsing-time) out there. However, if your goal is to speed up your development by adding JSON support with a single header, then this library is the way to go. If you know how to use a `std::vector` or `std::map`, you are already set.

 See the [contribution guidelines](https://github.com/nlohmann/json/blob/master/.github/CONTRIBUTING.md#please-dont) for more information.

@@ -129,6 +130,8 @@ json array_not_object = { json::array({"currency", "USD"}), json::array({"value"

 ### Serialization / Deserialization

+#### To/from strings
+
 You can create an object (deserialization) by appending `_json` to a string literal:

 ```cpp
@@ -162,6 +165,8 @@ std::cout << j.dump(4) << std::endl;
 // }
 ```

+#### To/from streams (e.g. files, string streams)
+
 You can also use streams to serialize and deserialize:

 ```cpp
@@ -176,10 +181,37 @@ std::cout << j;
 std::cout << std::setw(4) << j << std::endl;
 ```

-These operators work for any subclasses of `std::istream` or `std::ostream`.
+These operators work for any subclasses of `std::istream` or `std::ostream`. Here is the same example with files:
+
+```cpp
+// read a JSON file
+std::ifstream i("file.json");
+json j;
+i >> j;
+
+// write prettified JSON to another file
+std::ofstream o("pretty.json");
+o << std::setw(4) << j << std::endl;
+```

 Please note that setting the exception bit for `failbit` is inappropriate for this use case. It will result in program termination due to the `noexcept` specifier in use.

+#### Read from iterator range
+
+You can also read JSON from an iterator range; that is, from any container accessible by iterators whose content is stored as contiguous byte sequence, for instance a `std::vector<uint8_t>`:
+
+```cpp
+std::vector<uint8_t> v = {'t', 'r', 'u', 'e'};
+json j = json::parse(v.begin(), v.end());
+```
+
+You may leave the iterators for the range [begin, end):
+
+```cpp
+std::vector<uint8_t> v = {'t', 'r', 'u', 'e'};
+json j = json::parse(v);
+```
+

 ### STL-like access

@@ -192,6 +224,9 @@ j.push_back("foo");
 j.push_back(1);
 j.push_back(true);

+// also use emplace_back
+j.emplace_back(1.78);
+
 // iterate the array
 for (json::iterator it = j.begin(); it != j.end(); ++it) {
  std::cout << *it << '\n';
@@ -230,6 +265,9 @@ o["foo"] = 23;
 o["bar"] = false;
 o["baz"] = 3.141;

+// also use emplace
+o.emplace("weather", "sunny");
+
 // special iterator member functions for objects
 for (json::iterator it = o.begin(); it != o.end(); ++it) {
  std::cout << it.key() << " : " << it.value() << "\n";
@@ -283,8 +321,8 @@ json j_uset(c_uset); // only one entry for "one" is used
 // maybe ["two", "three", "four", "one"]

 std::multiset<std::string> c_mset {"one", "two", "one", "four"};
-json j_mset(c_mset); // only one entry for "one" is used
-// maybe ["one", "two", "four"]
+json j_mset(c_mset); // both entries for "one" are used
+// maybe ["one", "two", "one", "four"]

 std::unordered_multiset<std::string> c_umset {"one", "two", "one", "four"};
 json j_umset(c_umset); // both entries for "one" are used
@@ -423,14 +461,11 @@ The following compilers are currently used in continuous integration at [Travis]
 | Clang 3.7.1     | Ubuntu 14.04.4 LTS           | clang version 3.7.1 (tags/RELEASE_371/final) |
 | Clang 3.8.0     | Ubuntu 14.04.4 LTS           | clang version 3.8.0 (tags/RELEASE_380/final) |
 | Clang 3.8.1     | Ubuntu 14.04.4 LTS           | clang version 3.8.1 (tags/RELEASE_381/final) |
-| Clang Xcode 6.1 | Darwin Kernel Version 13.4.0 (OSX 10.9.5) | Apple LLVM version 6.0 (clang-600.0.54) (based on LLVM 3.5svn) |
-| Clang Xcode 6.2 | Darwin Kernel Version 13.4.0 (OSX 10.9.5) | Apple LLVM version 6.0 (clang-600.0.57) (based on LLVM 3.5svn) |
-| Clang Xcode 6.3 | Darwin Kernel Version 14.3.0 (OSX 10.10.3) | Apple LLVM version 6.1.0 (clang-602.0.49) (based on LLVM 3.6.0svn) |
 | Clang Xcode 6.4 | Darwin Kernel Version 14.3.0 (OSX 10.10.3) | Apple LLVM version 6.1.0 (clang-602.0.53) (based on LLVM 3.6.0svn) |
-| Clang Xcode 7.1 | Darwin Kernel Version 14.5.0 (OSX 10.10.5) | Apple LLVM version 7.0.0 (clang-700.1.76) |
-| Clang Xcode 7.2 | Darwin Kernel Version 15.0.0 (OSX 10.10.5) | Apple LLVM version 7.0.2 (clang-700.1.81) |
 | Clang Xcode 7.3 | Darwin Kernel Version 15.0.0 (OSX 10.10.5) | Apple LLVM version 7.3.0 (clang-703.0.29) |
-| Clang Xcode 8.0 | Darwin Kernel Version 15.5.0 (OSX 10.11.5) | Apple LLVM version 8.0.0 (clang-800.0.24.1) |
+| Clang Xcode 8.0 | Darwin Kernel Version 15.6.0 | Apple LLVM version 8.0.0 (clang-800.0.38) |
+| Clang Xcode 8.1 | Darwin Kernel Version 16.1.0 (macOS 10.12.1) | Apple LLVM version 8.0.0 (clang-800.0.42.1) |
+| Clang Xcode 8.2 | Darwin Kernel Version 16.1.0 (macOS 10.12.1) | Apple LLVM version 8.0.0 (clang-800.0.42.1) |
 | Visual Studio 14 2015 | Windows Server 2012 R2 (x64) | Microsoft (R) Build Engine version 14.0.25123.0 | 


@@ -494,6 +529,14 @@ I deeply appreciate the help of the following people.
 - [Damien](https://github.com/dtoma) fixed one of the last conversion warnings.
 - [Thomas Braun](https://github.com/t-b) fixed a warning in a test case.
 - [Théo DELRIEU](https://github.com/theodelrieu) patiently and constructively oversaw the long way toward [iterator-range parsing](https://github.com/nlohmann/json/issues/290).
+- [Stefan](https://github.com/5tefan) fixed a minor issue in the documentation.
+- [Vasil Dimov](https://github.com/vasild) fixed the documentation regarding conversions from `std::multiset`.
+- [ChristophJud](https://github.com/ChristophJud) overworked the CMake files to ease project inclusion.
+- [Vladimir Petrigo](https://github.com/vpetrigo) made a SFINAE hack more readable.
+- [Denis Andrejew](https://github.com/seeekr) fixed a grammar issue in the README file.
+- [Pierre-Antoine Lacaze](https://github.com/palacaze) found a subtle bug in the `dump()` function.
+- [TurpentineDistillery](https://github.com/TurpentineDistillery) pointed to [`std::locale::classic()`](http://en.cppreference.com/w/cpp/locale/locale/classic) to avoid too much locale joggling, found some nice performance improvements in the parser and improved the benchmarking code.
+- [cgzones](https://github.com/cgzones) had an idea how to fix the Coverity scan.

 Thanks a lot for helping out!

@@ -502,6 +545,11 @@ Thanks a lot for helping out!

 - The code contains numerous debug **assertions** which can be switched off by defining the preprocessor macro `NDEBUG`, see the [documentation of `assert`](http://en.cppreference.com/w/cpp/error/assert). In particular, note [`operator[]`](https://nlohmann.github.io/json/classnlohmann_1_1basic__json_a2e26bd0b0168abb61f67ad5bcd5b9fa1.html#a2e26bd0b0168abb61f67ad5bcd5b9fa1) implements **unchecked access** for const objects: If the given key is not present, the behavior is undefined (think of a dereferenced null pointer) and yields an [assertion failure](https://github.com/nlohmann/json/issues/289) if assertions are switched on. If you are not sure whether an element in an object exists, use checked access with the [`at()` function](https://nlohmann.github.io/json/classnlohmann_1_1basic__json_a674de1ee73e6bf4843fc5dc1351fb726.html#a674de1ee73e6bf4843fc5dc1351fb726).
 - As the exact type of a number is not defined in the [JSON specification](http://rfc7159.net/rfc7159), this library tries to choose the best fitting C++ number type automatically. As a result, the type `double` may be used to store numbers which may yield [**floating-point exceptions**](https://github.com/nlohmann/json/issues/181) in certain rare situations if floating-point exceptions have been unmasked in the calling code. These exceptions are not caused by the library and need to be fixed in the calling code, such as by re-masking the exceptions prior to calling library functions.
+- The library supports **Unicode input** as follows:
+  - Only **UTF-8** encoded input is supported which is the default encoding for JSON according to [RFC 7159](http://rfc7159.net/rfc7159#rfc.section.8.1).
+  - Other encodings such as Latin-1, UTF-16, or UTF-32 are not supported and will yield parse errors.
+  - [Unicode noncharacters](http://www.unicode.org/faq/private_use.html#nonchar1) will not be replaced by the library.
+  - Invalid surrogates (e.g., incomplete pairs such as `\uDEAD`) will yield parse errors.


 ## Execute unit tests
@@ -512,7 +560,17 @@ To compile and run the tests, you need to execute
 $ make check

 ===============================================================================
-All tests passed (8905154 assertions in 35 test cases)
+All tests passed (8905518 assertions in 36 test cases)
+```
+
+Alternatively, you can use [CMake](https://cmake.org) and run
+
+```sh
+$ mkdir build
+$ cd build
+$ cmake ..
+$ make
+$ ctest
 ```

 For more information, have a look at the file [.travis.yml](https://github.com/nlohmann/json/blob/master/.travis.yml).
--- a/benchmarks/benchmarks.cpp
+++ b/benchmarks/benchmarks.cpp
@@ -1,107 +1,118 @@
 #define BENCHPRESS_CONFIG_MAIN

 #include <fstream>
+#include <sstream>
 #include <benchpress.hpp>
 #include <json.hpp>
+#include <pthread.h>
+#include <thread>

-BENCHMARK("parse jeopardy.json", [](benchpress::context* ctx)
+using json = nlohmann::json;
+
+struct StartUp
 {
-    for (size_t i = 0; i < ctx->num_iterations(); ++i)
+    StartUp()
    {
-        std::ifstream input_file("benchmarks/files/jeopardy/jeopardy.json");
-        nlohmann::json j;
-        j << input_file;
+#ifndef __llvm__
+        // pin thread to a single CPU
+        cpu_set_t cpuset;
+        pthread_t thread;
+        thread = pthread_self();
+        CPU_ZERO(&cpuset);
+        CPU_SET(std::thread::hardware_concurrency() - 1, &cpuset);
+        pthread_setaffinity_np(thread, sizeof(cpu_set_t), &cpuset);
+#endif
    }
-})
+};
+StartUp startup;

-BENCHMARK("parse canada.json", [](benchpress::context* ctx)
+enum class EMode { input, output_no_indent, output_with_indent };
+
+static void bench(benchpress::context& ctx,
+                  const std::string& in_path,
+                  const EMode mode)
 {
-    for (size_t i = 0; i < ctx->num_iterations(); ++i)
+    // using string streams for benchmarking to factor-out cold-cache disk
+    // access.
+    std::stringstream istr;
    {
-        std::ifstream input_file("benchmarks/files/nativejson-benchmark/canada.json");
-        nlohmann::json j;
-        j << input_file;
-    }
-})
+        // read file into string stream
+        std::ifstream input_file(in_path);
+        istr << input_file.rdbuf();
+        input_file.close();

-BENCHMARK("parse citm_catalog.json", [](benchpress::context* ctx)
-{
-    for (size_t i = 0; i < ctx->num_iterations(); ++i)
-    {
-        std::ifstream input_file("benchmarks/files/nativejson-benchmark/citm_catalog.json");
-        nlohmann::json j;
-        j << input_file;
-    }
-})
-
-BENCHMARK("parse twitter.json", [](benchpress::context* ctx)
-{
-    for (size_t i = 0; i < ctx->num_iterations(); ++i)
-    {
-        std::ifstream input_file("benchmarks/files/nativejson-benchmark/twitter.json");
-        nlohmann::json j;
-        j << input_file;
-    }
-})
-
-BENCHMARK("parse numbers/floats.json", [](benchpress::context* ctx)
-{
-    for (size_t i = 0; i < ctx->num_iterations(); ++i)
-    {
-        std::ifstream input_file("benchmarks/files/numbers/floats.json");
-        nlohmann::json j;
-        j << input_file;
-    }
-})
-
-BENCHMARK("parse numbers/signed_ints.json", [](benchpress::context* ctx)
-{
-    for (size_t i = 0; i < ctx->num_iterations(); ++i)
-    {
-        std::ifstream input_file("benchmarks/files/numbers/signed_ints.json");
-        nlohmann::json j;
-        j << input_file;
-    }
-})
-
-BENCHMARK("parse numbers/unsigned_ints.json", [](benchpress::context* ctx)
-{
-    for (size_t i = 0; i < ctx->num_iterations(); ++i)
-    {
-        std::ifstream input_file("benchmarks/files/numbers/unsigned_ints.json");
-        nlohmann::json j;
-        j << input_file;
-    }
-})
-
-BENCHMARK("dump jeopardy.json", [](benchpress::context* ctx)
-{
-    std::ifstream input_file("benchmarks/files/jeopardy/jeopardy.json");
-    nlohmann::json j;
-    j << input_file;
-    std::ofstream output_file("jeopardy.dump.json");
-
-    ctx->reset_timer();
-    for (size_t i = 0; i < ctx->num_iterations(); ++i)
-    {
-        output_file << j;
+        // read the stream once
+        json j;
+        j << istr;
+        // clear flags and rewind
+        istr.clear();
+        istr.seekg(0);
    }

-    std::remove("jeopardy.dump.json");
-})
-
-BENCHMARK("dump jeopardy.json with indent", [](benchpress::context* ctx)
-{
-    std::ifstream input_file("benchmarks/files/jeopardy/jeopardy.json");
-    nlohmann::json j;
-    j << input_file;
-    std::ofstream output_file("jeopardy.dump.json");
-
-    ctx->reset_timer();
-    for (size_t i = 0; i < ctx->num_iterations(); ++i)
+    switch (mode)
    {
-        output_file << std::setw(4) << j;
-    }
+        // benchmarking input
+        case EMode::input:
+        {
+            ctx.reset_timer();

-    std::remove("jeopardy.dump.json");
-})
+            for (size_t i = 0; i < ctx.num_iterations(); ++i)
+            {
+                // clear flags and rewind
+                istr.clear();
+                istr.seekg(0);
+                json j;
+                j << istr;
+            }
+
+            break;
+        }
+
+        // benchmarking output
+        case EMode::output_no_indent:
+        case EMode::output_with_indent:
+        {
+            // create JSON value from input
+            json j;
+            j << istr;
+            std::stringstream ostr;
+
+            ctx.reset_timer();
+            for (size_t i = 0; i < ctx.num_iterations(); ++i)
+            {
+                if (mode == EMode::output_no_indent)
+                {
+                    ostr << j;
+                }
+                else
+                {
+                    ostr << std::setw(4) << j;
+                }
+
+                // reset data
+                ostr.str(std::string());
+            }
+
+            break;
+        }
+    }
+}
+
+#define BENCHMARK_I(mode, title, in_path)           \
+    BENCHMARK((title), [](benchpress::context* ctx) \
+    {                                               \
+        bench(*ctx, (in_path), (mode));             \
+    })
+
+BENCHMARK_I(EMode::input, "parse jeopardy.json",              "benchmarks/files/jeopardy/jeopardy.json");
+BENCHMARK_I(EMode::input, "parse canada.json",                "benchmarks/files/nativejson-benchmark/canada.json");
+BENCHMARK_I(EMode::input, "parse citm_catalog.json",          "benchmarks/files/nativejson-benchmark/citm_catalog.json");
+BENCHMARK_I(EMode::input, "parse twitter.json",               "benchmarks/files/nativejson-benchmark/twitter.json");
+BENCHMARK_I(EMode::input, "parse numbers/floats.json",        "benchmarks/files/numbers/floats.json");
+BENCHMARK_I(EMode::input, "parse numbers/signed_ints.json",   "benchmarks/files/numbers/signed_ints.json");
+BENCHMARK_I(EMode::input, "parse numbers/unsigned_ints.json", "benchmarks/files/numbers/unsigned_ints.json");
+
+BENCHMARK_I(EMode::output_no_indent,   "dump jeopardy.json",             "benchmarks/files/jeopardy/jeopardy.json");
+BENCHMARK_I(EMode::output_with_indent, "dump jeopardy.json with indent", "benchmarks/files/jeopardy/jeopardy.json");
+BENCHMARK_I(EMode::output_no_indent,   "dump numbers/floats.json",       "benchmarks/files/numbers/floats.json");
+BENCHMARK_I(EMode::output_no_indent,   "dump numbers/signed_ints.json",  "benchmarks/files/numbers/signed_ints.json");
--- a/cmake/config.cmake.in
+++ b/cmake/config.cmake.in
@@ -1,6 +1,7 @@
@PACKAGE_INIT@
+set_and_check(JSON_INCLUDE_DIR "@PACKAGE_JSON_INCLUDE_DESTINATION@")

 cmake_policy(PUSH)
 cmake_policy(SET CMP0024 OLD)
 include(${CMAKE_CURRENT_LIST_DIR}/@JSON_TARGETS_FILENAME@)
-cmake_policy(POP)
+cmake_policy(POP)
--- a/doc/Doxyfile
+++ b/doc/Doxyfile
@@ -5,7 +5,7 @@
 #---------------------------------------------------------------------------
 DOXYFILE_ENCODING      = UTF-8
 PROJECT_NAME           = "JSON for Modern C++"
-PROJECT_NUMBER         = 2.0.3
+PROJECT_NUMBER         = 2.0.8
 PROJECT_BRIEF          = 
 PROJECT_LOGO           =
 OUTPUT_DIRECTORY       = .
--- a/doc/examples/README.link
+++ b/doc/examples/README.link
@@ -1 +1 @@
-<a target="_blank" href="http://melpon.org/wandbox/permlink/zkFPohcXJ2TFuAyq"><b>online</b></a>
+<a target="_blank" href="http://melpon.org/wandbox/permlink/G6Pdtdxq01HJvvJz"><b>online</b></a>
--- a/doc/examples/basic_json__CompatibleArrayType.cpp
+++ b/doc/examples/basic_json__CompatibleArrayType.cpp
@@ -39,7 +39,7 @@ int main()

    // create an array from std::multiset
    std::multiset<std::string> c_mset {"one", "two", "one", "four"};
-    json j_mset(c_mset); // only one entry for "one" is used
+    json j_mset(c_mset); // both entries for "one" are used

    // create an array from std::unordered_multiset
    std::unordered_multiset<std::string> c_umset {"one", "two", "one", "four"};
--- a/doc/examples/basic_json__CompatibleArrayType.link
+++ b/doc/examples/basic_json__CompatibleArrayType.link
@@ -1 +1 @@
-<a target="_blank" href="http://melpon.org/wandbox/permlink/MghSilgvyh4ZJShY"><b>online</b></a>
+<a target="_blank" href="http://melpon.org/wandbox/permlink/3BIhBw91FUVuHE1D"><b>online</b></a>
--- a/doc/examples/emplace.cpp
+++ b/doc/examples/emplace.cpp
@@ -0,0 +1,30 @@
+#include <json.hpp>
+
+using json = nlohmann::json;
+
+int main()
+{
+    // create JSON values
+    json object = {{"one", 1}, {"two", 2}};
+    json null;
+
+    // print values
+    std::cout << object << '\n';
+    std::cout << null << '\n';
+
+    // add values
+    auto res1 = object.emplace("three", 3);
+    null.emplace("A", "a");
+    null.emplace("B", "b");
+
+    // the following call will not add an object, because there is already
+    // a value stored at key "B"
+    auto res2 = null.emplace("B", "c");
+
+    // print values
+    std::cout << object << '\n';
+    std::cout << *res1.first << " " << std::boolalpha << res1.second << '\n';
+
+    std::cout << null << '\n';
+    std::cout << *res2.first << " " << std::boolalpha << res2.second << '\n';
+}
--- a/doc/examples/emplace.link
+++ b/doc/examples/emplace.link
@@ -0,0 +1 @@
+<a target="_blank" href="http://melpon.org/wandbox/permlink/B6ILaoysGMliouEO"><b>online</b></a>
--- a/doc/examples/emplace.output
+++ b/doc/examples/emplace.output
@@ -0,0 +1,6 @@
+{"one":1,"two":2}
+null
+{"one":1,"three":3,"two":2}
+3 true
+{"A":"a","B":"b"}
+"b" false
--- a/doc/examples/emplace_back.cpp
+++ b/doc/examples/emplace_back.cpp
@@ -0,0 +1,23 @@
+#include <json.hpp>
+
+using json = nlohmann::json;
+
+int main()
+{
+    // create JSON values
+    json array = {1, 2, 3, 4, 5};
+    json null;
+
+    // print values
+    std::cout << array << '\n';
+    std::cout << null << '\n';
+
+    // add values
+    array.emplace_back(6);
+    null.emplace_back("first");
+    null.emplace_back(3, "second");
+
+    // print values
+    std::cout << array << '\n';
+    std::cout << null << '\n';
+}
--- a/doc/examples/emplace_back.link
+++ b/doc/examples/emplace_back.link
@@ -0,0 +1 @@
+<a target="_blank" href="http://melpon.org/wandbox/permlink/jdch45YEMX94DvlH"><b>online</b></a>
--- a/doc/examples/emplace_back.output
+++ b/doc/examples/emplace_back.output
@@ -0,0 +1,4 @@
+[1,2,3,4,5]
+null
+[1,2,3,4,5,6]
+["first",["second","second","second"]]
--- a/doc/examples/operatorjson_pointer.cpp
+++ b/doc/examples/operatorjson_pointer.cpp
@@ -40,7 +40,7 @@ int main()
    // output the changed array
    std::cout << j["array"] << '\n';

-    // "change" the arry element past the end
+    // "change" the array element past the end
    j["/array/-"_json_pointer] = 55;
    // output the changed array
    std::cout << j["array"] << '\n';
--- a/doc/examples/operatorjson_pointer.link
+++ b/doc/examples/operatorjson_pointer.link
@@ -1 +1 @@
-<a target="_blank" href="http://melpon.org/wandbox/permlink/xzFX3E4gYBXFwd04"><b>online</b></a>
+<a target="_blank" href="http://melpon.org/wandbox/permlink/AYgVTzCodPApT4hT"><b>online</b></a>
--- a/doc/images/scanner.png
+++ b/doc/images/scanner.png
--- a/doc/index.md
+++ b/doc/index.md
@@ -197,7 +197,7 @@ The container functions known from STL have been extended to support the differe
    <td class="ok_green">@link nlohmann::basic_json::max_size `max_size` @endlink (returns `0`)</td>
  </tr>
  <tr>
-    <td rowspan="5">modifiers</td>
+    <td rowspan="6">modifiers</td>
    <td>`clear`</td>
    <td class="ok_green">@link nlohmann::basic_json::clear `clear` @endlink</td>
    <td class="ok_green">@link nlohmann::basic_json::clear `clear` @endlink</td>
@@ -233,6 +233,15 @@ The container functions known from STL have been extended to support the differe
    <td class="nok_throws">throws `std::domain_error`</td>
    <td class="ok_green">@link nlohmann::basic_json::push_back(const typename object_t::value_type & val) `push_back` @endlink (creates object)<br>@link nlohmann::basic_json::push_back(const nlohmann::basic_json &) `push_back` @endlink (creates array)</td>
  </tr>
+  <tr>
+    <td>`emplace` / `emplace_back`</td>
+    <td class="ok_green">@link nlohmann::basic_json::emplace() `emplace` @endlink</td>
+    <td class="ok_green">@link nlohmann::basic_json::emplace_back() `emplace_back` @endlink</td>
+    <td class="nok_throws">throws `std::domain_error`</td>
+    <td class="nok_throws">throws `std::domain_error`</td>
+    <td class="nok_throws">throws `std::domain_error`</td>
+    <td class="ok_green">@link nlohmann::basic_json::emplace() `emplace` @endlink (creates object)<br>@link nlohmann::basic_json::emplace_back() `emplace_back` @endlink (creates array)</td>
+  </tr>
  <tr>
    <td>`swap`</td>
    <td class="ok_green">@link nlohmann::basic_json::swap `swap` @endlink</td>
@@ -268,4 +277,4 @@ The container functions known from STL have been extended to support the differe
@author [Niels Lohmann](http://nlohmann.me)
@see https://github.com/nlohmann/json to download the source code

-@version 2.0.3
+@version 2.0.8
--- a/doc/json.gif
+++ b/doc/json.gif
--- a/src/json.hpp
+++ b/src/json.hpp
--- a/src/json.hpp.re2c
+++ b/src/json.hpp.re2c
@@ -1,7 +1,7 @@
 /*
    __ _____ _____ _____
 __|  |   __|     |   | |  JSON for Modern C++
-|  |  |__   |  |  | | | |  version 2.0.3
+|  |  |__   |  |  | | | |  version 2.0.8
 |_____|_____|_____|_|___|  https://github.com/nlohmann/json

 Licensed under the MIT License <http://opensource.org/licenses/MIT>.
@@ -29,31 +29,32 @@ SOFTWARE.
 #ifndef NLOHMANN_JSON_HPP
 #define NLOHMANN_JSON_HPP

-#include <algorithm>
-#include <array>
-#include <cassert>
-#include <ciso646>
-#include <cmath>
-#include <cstddef>
-#include <cstdint>
-#include <cstdlib>
-#include <cstring>
-#include <functional>
-#include <initializer_list>
-#include <iomanip>
-#include <iostream>
-#include <iterator>
-#include <limits>
-#include <locale>
-#include <map>
-#include <memory>
-#include <numeric>
-#include <sstream>
-#include <stdexcept>
-#include <string>
-#include <type_traits>
-#include <utility>
-#include <vector>
+#include <algorithm> // all_of, for_each, transform
+#include <array> // array
+#include <cassert> // assert
+#include <cctype> // isdigit
+#include <ciso646> // and, not, or
+#include <cmath> // isfinite, signbit
+#include <cstddef> // nullptr_t, ptrdiff_t, size_t
+#include <cstdint> // int64_t, uint64_t
+#include <cstdlib> // strtod, strtof, strtold, strtoul
+#include <cstring> // strlen
+#include <functional> // function, hash, less
+#include <initializer_list> // initializer_list
+#include <iomanip> // setw
+#include <iostream> // istream, ostream
+#include <iterator> // advance, begin, bidirectional_iterator_tag, distance, end, inserter, iterator, iterator_traits, next, random_access_iterator_tag, reverse_iterator
+#include <limits> // numeric_limits
+#include <locale> // locale
+#include <map> // map
+#include <memory> // addressof, allocator, allocator_traits, unique_ptr
+#include <numeric> // accumulate
+#include <sstream> // stringstream
+#include <stdexcept> // domain_error, invalid_argument, out_of_range
+#include <string> // getline, stoi, string, to_string
+#include <type_traits> // add_pointer, enable_if, is_arithmetic, is_base_of, is_const, is_constructible, is_convertible, is_floating_point, is_integral, is_nothrow_move_assignable, std::is_nothrow_move_constructible, std::is_pointer, std::is_reference, std::is_same, remove_const, remove_pointer, remove_reference
+#include <utility> // declval, forward, make_pair, move, pair, swap
+#include <vector> // vector

 // exclude unsupported compilers
 #if defined(__clang__)
@@ -106,36 +107,19 @@ such as sequence containers. For instance, `std::map` passes the test as it
 contains a `mapped_type`, whereas `std::vector` fails the test.

@sa http://stackoverflow.com/a/7728728/266378
-@since version 1.0.0
+@since version 1.0.0, overworked in version 2.0.6
 */
 template<typename T>
 struct has_mapped_type
 {
  private:
-    template<typename C> static char test(typename C::mapped_type*);
-    template<typename C> static char (&test(...))[2];
+    template <typename U, typename = typename U::mapped_type>
+    static int detect(U&&);
+
+    static void detect(...);
  public:
-    static constexpr bool value = sizeof(test<T>(0)) == 1;
-};
-
-/*!
-@brief helper class to create locales with decimal point
-
-This struct is used a default locale during the JSON serialization. JSON
-requires the decimal point to be `.`, so this function overloads the
-`do_decimal_point()` function to return `.`. This function is called by
-float-to-string conversions to retrieve the decimal separator between integer
-and fractional parts.
-
-@sa https://github.com/nlohmann/json/issues/51#issuecomment-86869315
-@since version 2.0.0
-*/
-struct DecimalSeparator : std::numpunct<char>
-{
-    char do_decimal_point() const
-    {
-        return '.';
-    }
+    static constexpr bool value =
+        std::is_integral<decltype(detect(std::declval<T>()))>::value;
 };

 }
@@ -2197,8 +2181,7 @@ class basic_json
    {
        std::stringstream ss;
        // fix locale problems
-        const static std::locale loc(std::locale(), new DecimalSeparator);
-        ss.imbue(loc);
+        ss.imbue(std::locale::classic());

        // 6, 15 or 16 digits of precision allows round-trip IEEE 754
        // string->float->string, string->double->string or string->long
@@ -5049,6 +5032,102 @@ class basic_json
        return *this;
    }

+    /*!
+    @brief add an object to an array
+
+    Creates a JSON value from the passed parameters @a args to the end of the
+    JSON value. If the function is called on a JSON null value, an empty array
+    is created before appending the value created from @a args.
+
+    @param[in] args arguments to forward to a constructor of @ref basic_json
+    @tparam Args compatible types to create a @ref basic_json object
+
+    @throw std::domain_error when called on a type other than JSON array or
+    null; example: `"cannot use emplace_back() with number"`
+
+    @complexity Amortized constant.
+
+    @liveexample{The example shows how `push_back()` can be used to add
+    elements to a JSON array. Note how the `null` value was silently converted
+    to a JSON array.,emplace_back}
+
+    @since version 2.0.8
+    */
+    template<class... Args>
+    void emplace_back(Args&& ... args)
+    {
+        // emplace_back only works for null objects or arrays
+        if (not(is_null() or is_array()))
+        {
+            throw std::domain_error("cannot use emplace_back() with " + type_name());
+        }
+
+        // transform null object into an array
+        if (is_null())
+        {
+            m_type = value_t::array;
+            m_value = value_t::array;
+            assert_invariant();
+        }
+
+        // add element to array (perfect forwarding)
+        m_value.array->emplace_back(std::forward<Args>(args)...);
+    }
+
+    /*!
+    @brief add an object to an object if key does not exist
+
+    Inserts a new element into a JSON object constructed in-place with the given
+    @a args if there is no element with the key in the container. If the
+    function is called on a JSON null value, an empty object is created before
+    appending the value created from @a args.
+
+    @param[in] args arguments to forward to a constructor of @ref basic_json
+    @tparam Args compatible types to create a @ref basic_json object
+
+    @return a pair consisting of an iterator to the inserted element, or the
+            already-existing element if no insertion happened, and a bool
+            denoting whether the insertion took place.
+
+    @throw std::domain_error when called on a type other than JSON object or
+    null; example: `"cannot use emplace() with number"`
+
+    @complexity Logarithmic in the size of the container, O(log(`size()`)).
+
+    @liveexample{The example shows how `emplace()` can be used to add elements
+    to a JSON object. Note how the `null` value was silently converted to a
+    JSON object. Further note how no value is added if there was already one
+    value stored with the same key.,emplace}
+
+    @since version 2.0.8
+    */
+    template<class... Args>
+    std::pair<iterator, bool> emplace(Args&& ... args)
+    {
+        // emplace only works for null objects or arrays
+        if (not(is_null() or is_object()))
+        {
+            throw std::domain_error("cannot use emplace() with " + type_name());
+        }
+
+        // transform null object into an object
+        if (is_null())
+        {
+            m_type = value_t::object;
+            m_value = value_t::object;
+            assert_invariant();
+        }
+
+        // add element to array (perfect forwarding)
+        auto res = m_value.object->emplace(std::forward<Args>(args)...);
+        // create result iterator and set iterator to the result of emplace
+        auto it = begin();
+        it.m_it.object_iterator = res.first;
+
+        // return pair of iterator and boolean
+        return {it, res.second};
+    }
+
    /*!
    @brief inserts element

@@ -5825,7 +5904,7 @@ class basic_json
        o.width(0);

        // fix locale problems
-        const auto old_locale = o.imbue(std::locale(std::locale(), new DecimalSeparator));
+        const auto old_locale = o.imbue(std::locale::classic());
        // set precision

        // 6, 15 or 16 digits of precision allows round-trip IEEE 754
@@ -7614,8 +7693,22 @@ class basic_json
        explicit lexer(std::istream& s)
            : m_stream(&s), m_line_buffer()
        {
+            // immediately abort if stream is erroneous
+            if (s.fail())
+            {
+                throw std::invalid_argument("stream error: " +  std::string(strerror(errno)));
+            }
+
            // fill buffer
            fill_line_buffer();
+
+            // skip UTF-8 byte-order mark
+            if (m_line_buffer.size() >= 3 and m_line_buffer.substr(0, 3) == "\xEF\xBB\xBF")
+            {
+                m_line_buffer[0] = ' ';
+                m_line_buffer[1] = ' ';
+                m_line_buffer[2] = ' ';
+            }
        }

        // switch off unwanted functions (due to pointer members)
@@ -7784,24 +7877,20 @@ class basic_json
                assert(m_start != nullptr);

                /*!re2c
-                    re2c:define:YYCTYPE   = lexer_char_t;
-                    re2c:define:YYCURSOR  = m_cursor;
-                    re2c:define:YYLIMIT   = m_limit;
-                    re2c:define:YYMARKER  = m_marker;
-                    re2c:define:YYFILL    = "fill_line_buffer()";
-                    re2c:yyfill:parameter = 0;
-                    re2c:indent:string    = "    ";
-                    re2c:indent:top       = 1;
-                    re2c:labelprefix      = "basic_json_parser_";
+                    re2c:define:YYCTYPE      = lexer_char_t;
+                    re2c:define:YYCURSOR     = m_cursor;
+                    re2c:define:YYLIMIT      = m_limit;
+                    re2c:define:YYMARKER     = m_marker;
+                    re2c:define:YYFILL       = "fill_line_buffer(@@); // LCOV_EXCL_LINE";
+                    re2c:define:YYFILL:naked = 1;
+                    re2c:indent:string       = "    ";
+                    re2c:indent:top          = 1;
+                    re2c:labelprefix         = "basic_json_parser_";

                    // ignore whitespace
                    ws = [ \t\n\r]+;
                    ws   { continue; }

-                    // ignore byte-order-mark
-                    bom = "\xEF\xBB\xBF";
-                    bom   { continue; }
-
                    // structural characters
                    "[" { last_token_type = token_type::begin_array; break; }
                    "]" { last_token_type = token_type::end_array; break; }
@@ -7841,10 +7930,10 @@ class basic_json
                    string          { last_token_type = token_type::value_string; break; }

                    // end of file
-                    "\000"         { last_token_type = token_type::end_of_input; break; }
+                    "\x00"         { last_token_type = token_type::end_of_input; break; }

                    // anything else is an error
-                    .              { last_token_type = token_type::parse_error; break; }
+                    *              { last_token_type = token_type::parse_error; break; }
                */
            }

@@ -7879,43 +7968,60 @@ class basic_json
            m_start
            m_content
        */
-        void fill_line_buffer()
+        void fill_line_buffer(size_t n = 0)
        {
+            // if line buffer is used, m_content points to its data
+            assert(m_line_buffer.empty()
+                   or m_content == reinterpret_cast<const lexer_char_t*>(m_line_buffer.data()));
+
+            // if line buffer is used, m_limit is set past the end of its data
+            assert(m_line_buffer.empty()
+                   or m_limit == m_content + m_line_buffer.size());
+
+            // pointer relationships
+            assert(m_content <= m_start);
+            assert(m_start <= m_cursor);
+            assert(m_cursor <= m_limit);
+            assert(m_marker == nullptr or m_marker  <= m_limit);
+
            // number of processed characters (p)
-            const auto offset_start = m_start - m_content;
+            const size_t num_processed_chars = static_cast<size_t>(m_start - m_content);
            // offset for m_marker wrt. to m_start
            const auto offset_marker = (m_marker == nullptr) ? 0 : m_marker - m_start;
            // number of unprocessed characters (u)
            const auto offset_cursor = m_cursor - m_start;

            // no stream is used or end of file is reached
-            if (m_stream == nullptr or not * m_stream)
+            if (m_stream == nullptr or m_stream->eof())
            {
-                // copy unprocessed characters to line buffer
-                m_line_buffer.clear();
-                for (m_cursor = m_start; m_cursor != m_limit; ++m_cursor)
-                {
-                    m_line_buffer.append(1, static_cast<const char>(*m_cursor));
-                }
+                // m_start may or may not be pointing into m_line_buffer at
+                // this point. We trust the standand library to do the right
+                // thing. See http://stackoverflow.com/q/28142011/266378
+                m_line_buffer.assign(m_start, m_limit);

-                // append 5 characters (size of longest keyword "false") to
-                // make sure that there is sufficient space between m_cursor
-                // and m_limit
-                m_line_buffer.append(5, '\0');
+                // append n characters to make sure that there is sufficient
+                // space between m_cursor and m_limit
+                m_line_buffer.append(1, '\x00');
+                if (n > 0)
+                {
+                    m_line_buffer.append(n - 1, '\x01');
+                }
            }
            else
            {
                // delete processed characters from line buffer
-                m_line_buffer.erase(0, static_cast<size_t>(offset_start));
+                m_line_buffer.erase(0, num_processed_chars);
                // read next line from input stream
-                std::string line;
-                std::getline(*m_stream, line);
+                m_line_buffer_tmp.clear();
+                std::getline(*m_stream, m_line_buffer_tmp, '\n');
+
                // add line with newline symbol to the line buffer
-                m_line_buffer += "\n" + line;
+                m_line_buffer += m_line_buffer_tmp;
+                m_line_buffer.push_back('\n');
            }

            // set pointers
-            m_content = reinterpret_cast<const lexer_char_t*>(m_line_buffer.c_str());
+            m_content = reinterpret_cast<const lexer_char_t*>(m_line_buffer.data());
            assert(m_content != nullptr);
            m_start  = m_content;
            m_marker = m_start + offset_marker;
@@ -7998,9 +8104,20 @@ class basic_json
            // iterate the result between the quotes
            for (const lexer_char_t* i = m_start + 1; i < m_cursor - 1; ++i)
            {
-                // process escaped characters
-                if (*i == '\\')
+                // find next escape character
+                auto e = std::find(i, m_cursor - 1, '\\');
+                if (e != i)
                {
+                    // see https://github.com/nlohmann/json/issues/365#issuecomment-262874705
+                    for (auto k = i; k < e; k++)
+                    {
+                        result.push_back(static_cast<typename string_t::value_type>(*k));
+                    }
+                    i = e - 1; // -1 because of ++i
+                }
+                else
+                {
+                    // processing escaped character
                    // read next character
                    ++i;

@@ -8071,6 +8188,11 @@ class basic_json
                                // skip the next 10 characters (xxxx\uyyyy)
                                i += 10;
                            }
+                            else if (codepoint >= 0xDC00 and codepoint <= 0xDFFF)
+                            {
+                                // we found a lone low surrogate
+                                throw std::invalid_argument("missing high surrogate");
+                            }
                            else
                            {
                                // add unicode character(s)
@@ -8082,12 +8204,6 @@ class basic_json
                        }
                    }
                }
-                else
-                {
-                    // all other characters are just copied to the end of the
-                    // string
-                    result.append(1, static_cast<typename string_t::value_type>(*i));
-                }
            }

            return result;
@@ -8253,6 +8369,13 @@ class basic_json
            {
                // parse with strtod
                result.m_value.number_float = str_to_float_t(static_cast<number_float_t*>(nullptr), NULL);
+
+                // replace infinity and NAN by null
+                if (not std::isfinite(result.m_value.number_float))
+                {
+                    type = value_t::null;
+                    result.m_value = basic_json::json_value();
+                }
            }

            // save the type
@@ -8264,6 +8387,8 @@ class basic_json
        std::istream* m_stream = nullptr;
        /// line buffer buffer for m_stream
        string_t m_line_buffer {};
+        /// used for filling m_line_buffer
+        string_t m_line_buffer_tmp {};
        /// the buffer pointer
        const lexer_char_t* m_content = nullptr;
        /// pointer to the beginning of the current symbol
@@ -8289,7 +8414,7 @@ class basic_json
        /// a parser reading from a string literal
        parser(const char* buff, const parser_callback_t cb = nullptr)
            : callback(cb),
-              m_lexer(reinterpret_cast<const typename lexer::lexer_char_t*>(buff), strlen(buff))
+              m_lexer(reinterpret_cast<const typename lexer::lexer_char_t*>(buff), std::strlen(buff))
        {}

        /// a parser reading from an input stream
@@ -8733,6 +8858,12 @@ class basic_json
        /*!
        @brief return a reference to the pointed to value

+        @note This version does not throw if a value is not present, but tries
+        to create nested values instead. For instance, calling this function
+        with pointer `"/this/that"` on a null value is equivalent to calling
+        `operator[]("this").operator[]("that")` on that value, effectively
+        changing the null value to an object.
+
        @param[in] ptr  a JSON value

        @return reference to the JSON value pointed to by the JSON pointer
@@ -8747,6 +8878,29 @@ class basic_json
        {
            for (const auto& reference_token : reference_tokens)
            {
+                // convert null values to arrays or objects before continuing
+                if (ptr->m_type == value_t::null)
+                {
+                    // check if reference token is a number
+                    const bool nums = std::all_of(reference_token.begin(),
+                                                  reference_token.end(),
+                                                  [](const char x)
+                    {
+                        return std::isdigit(x);
+                    });
+
+                    // change value to array for numbers or "-" or to object
+                    // otherwise
+                    if (nums or reference_token == "-")
+                    {
+                        *ptr = value_t::array;
+                    }
+                    else
+                    {
+                        *ptr = value_t::object;
+                    }
+                }
+
                switch (ptr->m_type)
                {
                    case value_t::object:
@@ -9413,7 +9567,7 @@ class basic_json
                json_pointer top_pointer = ptr.top();
                if (top_pointer != ptr)
                {
-                    basic_json& x = result.at(top_pointer);
+                    result.at(top_pointer);
                }

                // get reference to parent of JSON pointer ptr
@@ -9854,30 +10008,32 @@ can be used by adding `"_json"` to a string literal and returns a JSON object
 if no parse error occurred.

@param[in] s  a string representation of a JSON object
+@param[in] n  the length of string @a s
@return a JSON object

@since version 1.0.0
 */
-inline nlohmann::json operator "" _json(const char* s, std::size_t)
+inline nlohmann::json operator "" _json(const char* s, std::size_t n)
 {
-    return nlohmann::json::parse(s);
+    return nlohmann::json::parse(s, s + n);
 }

 /*!
@brief user-defined string literal for JSON pointer

 This operator implements a user-defined string literal for JSON Pointers. It
-can be used by adding `"_json"` to a string literal and returns a JSON pointer
+can be used by adding `"_json_pointer"` to a string literal and returns a JSON pointer
 object if no parse error occurred.

@param[in] s  a string representation of a JSON Pointer
+@param[in] n  the length of string @a s
@return a JSON pointer object

@since version 2.0.0
 */
-inline nlohmann::json::json_pointer operator "" _json_pointer(const char* s, std::size_t)
+inline nlohmann::json::json_pointer operator "" _json_pointer(const char* s, std::size_t n)
 {
-    return nlohmann::json::json_pointer(s);
+    return nlohmann::json::json_pointer(std::string(s, n));
 }

 // restore GCC/clang diagnostic settings
--- a/test/data/nst_json_testsuite/LICENSE
+++ b/test/data/nst_json_testsuite/LICENSE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2016 Nicolas Seriot
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
--- a/test/data/nst_json_testsuite/test_parsing/i_number_neg_int_huge_exp.json
+++ b/test/data/nst_json_testsuite/test_parsing/i_number_neg_int_huge_exp.json
@@ -0,0 +1 @@
+[-1e+9999]
--- a/test/data/nst_json_testsuite/test_parsing/i_number_pos_double_huge_exp.json
+++ b/test/data/nst_json_testsuite/test_parsing/i_number_pos_double_huge_exp.json
@@ -0,0 +1 @@
+[1.5e+9999]
--- a/test/data/nst_json_testsuite/test_parsing/i_object_key_lone_2nd_surrogate.json
+++ b/test/data/nst_json_testsuite/test_parsing/i_object_key_lone_2nd_surrogate.json
@@ -0,0 +1 @@
+{"\uDFAA":0}
--- a/test/data/nst_json_testsuite/test_parsing/i_string_1st_surrogate_but_2nd_missing.json
+++ b/test/data/nst_json_testsuite/test_parsing/i_string_1st_surrogate_but_2nd_missing.json
@@ -0,0 +1 @@
+["\uDADA"]
--- a/test/data/nst_json_testsuite/test_parsing/i_string_1st_valid_surrogate_2nd_invalid.json
+++ b/test/data/nst_json_testsuite/test_parsing/i_string_1st_valid_surrogate_2nd_invalid.json
@@ -0,0 +1 @@
+["\uD888\u1234"]
--- a/test/data/nst_json_testsuite/test_parsing/i_string_UTF-16_invalid_lonely_surrogate.json
+++ b/test/data/nst_json_testsuite/test_parsing/i_string_UTF-16_invalid_lonely_surrogate.json
@@ -0,0 +1 @@
+["\ud800"]
--- a/test/data/nst_json_testsuite/test_parsing/i_string_UTF-16_invalid_surrogate.json
+++ b/test/data/nst_json_testsuite/test_parsing/i_string_UTF-16_invalid_surrogate.json
@@ -0,0 +1 @@
+["\ud800abc"]
--- a/test/data/nst_json_testsuite/test_parsing/i_string_UTF-8_invalid_sequence.json
+++ b/test/data/nst_json_testsuite/test_parsing/i_string_UTF-8_invalid_sequence.json
@@ -0,0 +1 @@
+["譌･ﾑ淫"]
--- a/test/data/nst_json_testsuite/test_parsing/i_string_incomplete_surrogate_and_escape_valid.json
+++ b/test/data/nst_json_testsuite/test_parsing/i_string_incomplete_surrogate_and_escape_valid.json
@@ -0,0 +1 @@
+["\uD800\n"]
--- a/test/data/nst_json_testsuite/test_parsing/i_string_incomplete_surrogate_pair.json
+++ b/test/data/nst_json_testsuite/test_parsing/i_string_incomplete_surrogate_pair.json
@@ -0,0 +1 @@
+["\uDd1ea"]
--- a/test/data/nst_json_testsuite/test_parsing/i_string_incomplete_surrogates_escape_valid.json
+++ b/test/data/nst_json_testsuite/test_parsing/i_string_incomplete_surrogates_escape_valid.json
@@ -0,0 +1 @@
+["\uD800\uD800\n"]
--- a/test/data/nst_json_testsuite/test_parsing/i_string_inverted_surrogates_U+1D11E.json
+++ b/test/data/nst_json_testsuite/test_parsing/i_string_inverted_surrogates_U+1D11E.json
@@ -0,0 +1 @@
+["\uDd1e\uD834"]
--- a/test/data/nst_json_testsuite/test_parsing/i_string_lone_second_surrogate.json
+++ b/test/data/nst_json_testsuite/test_parsing/i_string_lone_second_surrogate.json
@@ -0,0 +1 @@
+["\uDFAA"]
--- a/test/data/nst_json_testsuite/test_parsing/i_string_not_in_unicode_range.json
+++ b/test/data/nst_json_testsuite/test_parsing/i_string_not_in_unicode_range.json
@@ -0,0 +1 @@
+["<22><><EFBFBD><EFBFBD>"]
--- a/test/data/nst_json_testsuite/test_parsing/i_string_truncated-utf-8.json
+++ b/test/data/nst_json_testsuite/test_parsing/i_string_truncated-utf-8.json
@@ -0,0 +1 @@
+["<22><>"]
--- a/test/data/nst_json_testsuite/test_parsing/i_string_unicode_U+10FFFE_nonchar.json
+++ b/test/data/nst_json_testsuite/test_parsing/i_string_unicode_U+10FFFE_nonchar.json
@@ -0,0 +1 @@
+["\uDBFF\uDFFE"]
--- a/test/data/nst_json_testsuite/test_parsing/i_string_unicode_U+1FFFE_nonchar.json
+++ b/test/data/nst_json_testsuite/test_parsing/i_string_unicode_U+1FFFE_nonchar.json
@@ -0,0 +1 @@
+["\uD83F\uDFFE"]
--- a/test/data/nst_json_testsuite/test_parsing/i_string_unicode_U+FDD0_nonchar.json
+++ b/test/data/nst_json_testsuite/test_parsing/i_string_unicode_U+FDD0_nonchar.json
@@ -0,0 +1 @@
+["\uFDD0"]
--- a/test/data/nst_json_testsuite/test_parsing/i_string_unicode_U+FFFE_nonchar.json
+++ b/test/data/nst_json_testsuite/test_parsing/i_string_unicode_U+FFFE_nonchar.json
@@ -0,0 +1 @@
+["\uFFFE"]
--- a/test/data/nst_json_testsuite/test_parsing/i_structure_500_nested_arrays.json
+++ b/test/data/nst_json_testsuite/test_parsing/i_structure_500_nested_arrays.json
@@ -0,0 +1 @@
+[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]
--- a/test/data/nst_json_testsuite/test_parsing/i_structure_UTF-8_BOM_empty_object.json
+++ b/test/data/nst_json_testsuite/test_parsing/i_structure_UTF-8_BOM_empty_object.json
@@ -0,0 +1 @@
+{}
--- a/test/data/nst_json_testsuite/test_parsing/n_array_1_true_without_comma.json
+++ b/test/data/nst_json_testsuite/test_parsing/n_array_1_true_without_comma.json
@@ -0,0 +1 @@
+[1 true]
--- a/test/data/nst_json_testsuite/test_parsing/n_array_a_invalid_utf8.json
+++ b/test/data/nst_json_testsuite/test_parsing/n_array_a_invalid_utf8.json
@@ -0,0 +1 @@
+[a<EFBFBD>]
--- a/test/data/nst_json_testsuite/test_parsing/n_array_colon_instead_of_comma.json
+++ b/test/data/nst_json_testsuite/test_parsing/n_array_colon_instead_of_comma.json
@@ -0,0 +1 @@
+["": 1]
--- a/test/data/nst_json_testsuite/test_parsing/n_array_comma_after_close.json
+++ b/test/data/nst_json_testsuite/test_parsing/n_array_comma_after_close.json
@@ -0,0 +1 @@
+[""],
--- a/test/data/nst_json_testsuite/test_parsing/n_array_comma_and_number.json
+++ b/test/data/nst_json_testsuite/test_parsing/n_array_comma_and_number.json
@@ -0,0 +1 @@
+[,1]
--- a/test/data/nst_json_testsuite/test_parsing/n_array_double_comma.json
+++ b/test/data/nst_json_testsuite/test_parsing/n_array_double_comma.json
@@ -0,0 +1 @@
+[1,,2]
--- a/test/data/nst_json_testsuite/test_parsing/n_array_double_extra_comma.json
+++ b/test/data/nst_json_testsuite/test_parsing/n_array_double_extra_comma.json
@@ -0,0 +1 @@
+["x",,]
--- a/test/data/nst_json_testsuite/test_parsing/n_array_extra_close.json
+++ b/test/data/nst_json_testsuite/test_parsing/n_array_extra_close.json
@@ -0,0 +1 @@
+["x"]]
--- a/test/data/nst_json_testsuite/test_parsing/n_array_extra_comma.json
+++ b/test/data/nst_json_testsuite/test_parsing/n_array_extra_comma.json
@@ -0,0 +1 @@
+["",]
--- a/test/data/nst_json_testsuite/test_parsing/n_array_incomplete.json
+++ b/test/data/nst_json_testsuite/test_parsing/n_array_incomplete.json
@@ -0,0 +1 @@
+["x"
--- a/test/data/nst_json_testsuite/test_parsing/n_array_incomplete_invalid_value.json
+++ b/test/data/nst_json_testsuite/test_parsing/n_array_incomplete_invalid_value.json
@@ -0,0 +1 @@
+[x
--- a/test/data/nst_json_testsuite/test_parsing/n_array_inner_array_no_comma.json
+++ b/test/data/nst_json_testsuite/test_parsing/n_array_inner_array_no_comma.json
@@ -0,0 +1 @@
+[3[4]]
--- a/test/data/nst_json_testsuite/test_parsing/n_array_invalid_utf8.json
+++ b/test/data/nst_json_testsuite/test_parsing/n_array_invalid_utf8.json
@@ -0,0 +1 @@
+[<EFBFBD>]
--- a/test/data/nst_json_testsuite/test_parsing/n_array_items_separated_by_semicolon.json
+++ b/test/data/nst_json_testsuite/test_parsing/n_array_items_separated_by_semicolon.json
@@ -0,0 +1 @@
+[1:2]
--- a/test/data/nst_json_testsuite/test_parsing/n_array_just_comma.json
+++ b/test/data/nst_json_testsuite/test_parsing/n_array_just_comma.json
@@ -0,0 +1 @@
+[,]
--- a/test/data/nst_json_testsuite/test_parsing/n_array_just_minus.json
+++ b/test/data/nst_json_testsuite/test_parsing/n_array_just_minus.json
@@ -0,0 +1 @@
+[-]
--- a/test/data/nst_json_testsuite/test_parsing/n_array_missing_value.json
+++ b/test/data/nst_json_testsuite/test_parsing/n_array_missing_value.json
@@ -0,0 +1 @@
+[   , ""]
--- a/test/data/nst_json_testsuite/test_parsing/n_array_newlines_unclosed.json
+++ b/test/data/nst_json_testsuite/test_parsing/n_array_newlines_unclosed.json
@@ -0,0 +1,3 @@
+["a",
+4
+,1,
--- a/test/data/nst_json_testsuite/test_parsing/n_array_number_and_comma.json
+++ b/test/data/nst_json_testsuite/test_parsing/n_array_number_and_comma.json
@@ -0,0 +1 @@
+[1,]
--- a/test/data/nst_json_testsuite/test_parsing/n_array_number_and_several_commas.json
+++ b/test/data/nst_json_testsuite/test_parsing/n_array_number_and_several_commas.json
@@ -0,0 +1 @@
+[1,,]
--- a/test/data/nst_json_testsuite/test_parsing/n_array_spaces_vertical_tab_formfeed.json
+++ b/test/data/nst_json_testsuite/test_parsing/n_array_spaces_vertical_tab_formfeed.json
@@ -0,0 +1 @@
+["a"\f]
--- a/test/data/nst_json_testsuite/test_parsing/n_array_star_inside.json
+++ b/test/data/nst_json_testsuite/test_parsing/n_array_star_inside.json
@@ -0,0 +1 @@
+[*]
--- a/test/data/nst_json_testsuite/test_parsing/n_array_unclosed.json
+++ b/test/data/nst_json_testsuite/test_parsing/n_array_unclosed.json
@@ -0,0 +1 @@
+[""
--- a/test/data/nst_json_testsuite/test_parsing/n_array_unclosed_trailing_comma.json
+++ b/test/data/nst_json_testsuite/test_parsing/n_array_unclosed_trailing_comma.json
@@ -0,0 +1 @@
+[1,
--- a/test/data/nst_json_testsuite/test_parsing/n_array_unclosed_with_new_lines.json
+++ b/test/data/nst_json_testsuite/test_parsing/n_array_unclosed_with_new_lines.json
@@ -0,0 +1,3 @@
+[1,
+1
+,1
--- a/test/data/nst_json_testsuite/test_parsing/n_array_unclosed_with_object_inside.json
+++ b/test/data/nst_json_testsuite/test_parsing/n_array_unclosed_with_object_inside.json
@@ -0,0 +1 @@
+[{}
--- a/test/data/nst_json_testsuite/test_parsing/n_incomplete_false.json
+++ b/test/data/nst_json_testsuite/test_parsing/n_incomplete_false.json
@@ -0,0 +1 @@
+[fals]
--- a/test/data/nst_json_testsuite/test_parsing/n_incomplete_null.json
+++ b/test/data/nst_json_testsuite/test_parsing/n_incomplete_null.json
@@ -0,0 +1 @@
+[nul]
--- a/test/data/nst_json_testsuite/test_parsing/n_incomplete_true.json
+++ b/test/data/nst_json_testsuite/test_parsing/n_incomplete_true.json
@@ -0,0 +1 @@
+[tru]
--- a/test/data/nst_json_testsuite/test_parsing/n_number_++.json
+++ b/test/data/nst_json_testsuite/test_parsing/n_number_++.json
@@ -0,0 +1 @@
+[++1234]
--- a/test/data/nst_json_testsuite/test_parsing/n_number_+1.json
+++ b/test/data/nst_json_testsuite/test_parsing/n_number_+1.json
@@ -0,0 +1 @@
+[+1]
--- a/test/data/nst_json_testsuite/test_parsing/n_number_+Inf.json
+++ b/test/data/nst_json_testsuite/test_parsing/n_number_+Inf.json
@@ -0,0 +1 @@
+[+Inf]
--- a/test/data/nst_json_testsuite/test_parsing/n_number_-01.json
+++ b/test/data/nst_json_testsuite/test_parsing/n_number_-01.json
@@ -0,0 +1 @@
+[-01]
--- a/test/data/nst_json_testsuite/test_parsing/n_number_-1.0..json
+++ b/test/data/nst_json_testsuite/test_parsing/n_number_-1.0..json
@@ -0,0 +1 @@
+[-1.0.]
--- a/test/data/nst_json_testsuite/test_parsing/n_number_-2..json
+++ b/test/data/nst_json_testsuite/test_parsing/n_number_-2..json
@@ -0,0 +1 @@
+[-2.]
--- a/test/data/nst_json_testsuite/test_parsing/n_number_-NaN.json
+++ b/test/data/nst_json_testsuite/test_parsing/n_number_-NaN.json
@@ -0,0 +1 @@
+[-NaN]
--- a/test/data/nst_json_testsuite/test_parsing/n_number_.-1.json
+++ b/test/data/nst_json_testsuite/test_parsing/n_number_.-1.json
@@ -0,0 +1 @@
+[.-1]
--- a/test/data/nst_json_testsuite/test_parsing/n_number_.2e-3.json
+++ b/test/data/nst_json_testsuite/test_parsing/n_number_.2e-3.json
@@ -0,0 +1 @@
+[.2e-3]
--- a/test/data/nst_json_testsuite/test_parsing/n_number_0.1.2.json
+++ b/test/data/nst_json_testsuite/test_parsing/n_number_0.1.2.json
@@ -0,0 +1 @@
+[0.1.2]
--- a/test/data/nst_json_testsuite/test_parsing/n_number_0.3e+.json
+++ b/test/data/nst_json_testsuite/test_parsing/n_number_0.3e+.json
@@ -0,0 +1 @@
+[0.3e+]
--- a/test/data/nst_json_testsuite/test_parsing/n_number_0.3e.json
+++ b/test/data/nst_json_testsuite/test_parsing/n_number_0.3e.json
@@ -0,0 +1 @@
+[0.3e]
--- a/test/data/nst_json_testsuite/test_parsing/n_number_0.e1.json
+++ b/test/data/nst_json_testsuite/test_parsing/n_number_0.e1.json
@@ -0,0 +1 @@
+[0.e1]
--- a/test/data/nst_json_testsuite/test_parsing/n_number_0_capital_E+.json
+++ b/test/data/nst_json_testsuite/test_parsing/n_number_0_capital_E+.json
@@ -0,0 +1 @@
+[0E+]
--- a/test/data/nst_json_testsuite/test_parsing/n_number_0_capital_E.json
+++ b/test/data/nst_json_testsuite/test_parsing/n_number_0_capital_E.json
@@ -0,0 +1 @@
+[0E]
--- a/test/data/nst_json_testsuite/test_parsing/n_number_0e+.json
+++ b/test/data/nst_json_testsuite/test_parsing/n_number_0e+.json
@@ -0,0 +1 @@
+[0e+]
--- a/test/data/nst_json_testsuite/test_parsing/n_number_0e.json
+++ b/test/data/nst_json_testsuite/test_parsing/n_number_0e.json
@@ -0,0 +1 @@
+[0e]
--- a/test/data/nst_json_testsuite/test_parsing/n_number_1.0e+.json
+++ b/test/data/nst_json_testsuite/test_parsing/n_number_1.0e+.json
@@ -0,0 +1 @@
+[1.0e+]
--- a/test/data/nst_json_testsuite/test_parsing/n_number_1.0e-.json
+++ b/test/data/nst_json_testsuite/test_parsing/n_number_1.0e-.json
@@ -0,0 +1 @@
+[1.0e-]
--- a/test/data/nst_json_testsuite/test_parsing/n_number_1.0e.json
+++ b/test/data/nst_json_testsuite/test_parsing/n_number_1.0e.json
@@ -0,0 +1 @@
+[1.0e]
--- a/test/data/nst_json_testsuite/test_parsing/n_number_1_000.json
+++ b/test/data/nst_json_testsuite/test_parsing/n_number_1_000.json
@@ -0,0 +1 @@
+[1 000.0]
--- a/test/data/nst_json_testsuite/test_parsing/n_number_1eE2.json
+++ b/test/data/nst_json_testsuite/test_parsing/n_number_1eE2.json
@@ -0,0 +1 @@
+[1eE2]
--- a/test/data/nst_json_testsuite/test_parsing/n_number_2.e+3.json
+++ b/test/data/nst_json_testsuite/test_parsing/n_number_2.e+3.json
@@ -0,0 +1 @@
+[2.e+3]
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Niels Lohmann	bc28942101	🔖 Merge branch 'release/2.0.8' into develop	2016-12-02 20:07:43 +01:00
Niels Lohmann	44c0f811b1	🔖 version 2.0.8	2016-12-02 20:05:53 +01:00
Niels Lohmann	6c24caf282	📝 updated ChangeLog	2016-12-02 19:04:36 +01:00
Niels Lohmann	4adb8a81bf	📝 version bump	2016-12-02 18:39:35 +01:00
Niels Lohmann	60b7299fe1	📝 updated README	2016-12-02 18:02:38 +01:00
Niels Lohmann	8f563a5f81	Merge branch 'feature/emplace' into develop	2016-12-01 21:22:23 +01:00
Niels Lohmann	5c811b91f1	Merge branch 'develop' into feature/emplace	2016-12-01 21:17:40 +01:00
Niels Lohmann	e717492019	Merge branch 'feature/issue365' into develop	2016-11-29 07:46:14 +01:00
Niels Lohmann	bd252b2a09	Merge branch 'develop' into feature/issue365	2016-11-28 23:24:52 +01:00
Niels Lohmann	7b6bd585c1	Merge branch 'develop' into feature/emplace	2016-11-28 23:23:56 +01:00
Niels Lohmann	d563c21afe	📝 update documentation of Travis builders	2016-11-28 23:23:45 +01:00
Niels Lohmann	286025497f	👷 removed retired images (https://blog.travis-ci.com/2016-11-17-retiring-some-osx-images/)	2016-11-28 22:16:33 +01:00
Niels Lohmann	aeb4f87a27	✨ added return value for emplace (#349 )	2016-11-28 18:33:46 +01:00
Niels Lohmann	6ecff31b7f	Merge branch 'develop' into feature/emplace	2016-11-28 18:00:10 +01:00
Niels Lohmann	a8522f391a	Merge branch 'develop' into feature/issue365	2016-11-26 12:45:50 +01:00
Niels Lohmann	2773038cf9	⚡ added improvements (#365 )	2016-11-26 12:43:23 +01:00
Niels Lohmann	a791af30b4	Merge branch 'feature/filenotfound' into develop	2016-11-25 17:39:38 +01:00
Niels Lohmann	1ed510c232	Merge branch 'develop' into feature/filenotfound	2016-11-25 17:39:24 +01:00
Niels Lohmann	f194db9aa6	✅ added assertion for warning from #368	2016-11-24 22:07:35 +01:00
Niels Lohmann	c39c36e6ad	💄 fixed indentation	2016-11-24 22:05:29 +01:00
Niels Lohmann	472d0045ba	📝 updating README after fixing #299	2016-11-24 21:56:21 +01:00
Niels Lohmann	1407bbf94c	💄 fixed indentation	2016-11-24 21:54:05 +01:00
Niels Lohmann	8014637ad1	✅ added a test for EOF error (#367 )	2016-11-24 21:53:41 +01:00
Niels Lohmann	dfc49e7afe	🐛 fixed a bug if parser was called with a stream at EOF (#367 )	2016-11-24 21:45:10 +01:00
Niels Lohmann	4bd3b1b0ef	Merge branch 'develop' into feature/issue365	2016-11-24 18:25:00 +01:00
Niels Lohmann	e3450cac72	📈 removing more variance of the benchmarks	2016-11-24 18:24:26 +01:00
Niels Lohmann	c3a610d32a	🔧 ignoring Clion files	2016-11-24 17:45:01 +01:00
Niels Lohmann	25548f85c9	👷 trying Coverity with Clang 3.6 (#299 )	2016-11-24 17:25:05 +01:00
Niels Lohmann	4bb41d065b	🐛 parsing erroneous files yields an exception (#366 )	2016-11-23 16:57:01 +01:00
Niels	5f4becb0f5	Merge branch 'develop' into feature/issue365	2016-11-23 08:48:54 +01:00
Niels	ed611119d9	📈 reducing benchmark variance (#365 )	2016-11-23 08:47:40 +01:00
Niels	6cc2d58d69	🐛 hopefully fixing the crashes on Linux (#365 )	2016-11-22 20:13:47 +01:00
Niels	f620d74919	⚡ added performance fixes (#365 )	2016-11-22 07:26:11 +01:00
Niels	869f4c68d4	📝 updated thanks section	2016-11-22 07:25:40 +01:00
Niels	c34b41acd6	🐛 fixes crash in dump from static object (#359 ) Merge branch 'feature/issue359' into develop	2016-11-22 06:57:58 +01:00
Niels	abce5c25bb	📝 cleaned comments and updated README	2016-11-21 23:38:17 +01:00
Niels	43dbe02d5b	🐛 fixing #359	2016-11-21 21:53:10 +01:00
Niels	693bfe439b	Merge branch 'develop' into feature/emplace	2016-11-16 19:16:16 +01:00
Niels	0d72767b3e	⬆️ updated to Catch v1.5.8	2016-11-16 19:15:54 +01:00
Niels	56667af823	🎨 stating the name of the library in the license	2016-11-16 19:08:25 +01:00
Niels	b0f896558f	Merge branch 'develop' into feature/emplace	2016-11-16 09:04:25 +01:00
Niels	425b9834a8	🐛 removed the wrong compiler	2016-11-16 08:25:08 +01:00
Niels	56671a88c6	🍎 removed Xcode 8.0 due to repeated problems	2016-11-16 08:01:48 +01:00
Niels	5316f0fff2	🍎 added Xcode 8.1 build for travis	2016-11-16 06:42:26 +01:00
Niels	1be73b903e	proposal for emplace/emplace_back (#349 )	2016-11-11 19:29:14 +01:00
Niels	9ca00e4880	readded missing header	2016-11-03 07:27:32 +01:00
Niels	e385417047	documented and cleaned up headers (#314 )	2016-11-02 21:27:19 +01:00
Niels	6d2b5e3771	Merge branch 'release/2.0.7' into develop	2016-11-02 20:52:42 +01:00
Niels	700977d73e	version bump	2016-11-02 20:52:15 +01:00
Niels	79015b9d0a	Merge branch 'feature/jsontestsuite' into develop	2016-11-02 17:03:17 +01:00
Niels	3716a2fbe8	Merge branch 'develop' into feature/jsontestsuite	2016-11-02 17:03:12 +01:00
Niels	737d43724f	Merge branch 'feature/issue329' into develop	2016-11-02 16:59:23 +01:00
Niels	59c8343851	cleanup	2016-11-02 15:44:46 +01:00
Niels	94c16b2c31	fixed coverage	2016-11-01 17:01:04 +01:00
Niels	8f70525374	more test coverage	2016-10-30 17:46:00 +01:00
Niels	7adccde714	improved coverage and updated README	2016-10-30 17:10:11 +01:00
Niels	8d1e65f297	evaluated i-tests (#344 )	2016-10-30 16:07:17 +01:00
Niels	7b4e6cf705	added implementation-specific tests (#344 )	2016-10-30 12:08:29 +01:00
Niels	a8136c578a	fixed BOM handling #344	2016-10-29 21:08:30 +02:00
Niels	b820bb3b1f	fixed a lot of unicode errors (#344 ) BOMs currently yield an error.	2016-10-29 19:35:17 +02:00
Niels	b03bbe724d	added n test cases (#344 )	2016-10-29 14:02:33 +02:00
Niels	7da182472d	Merge branch 'develop' into feature/jsontestsuite	2016-10-29 13:37:17 +02:00
Niels	42ea4fb751	fixed a bug for short input files (#344 ) For input files with less than 5 bytes, the parser had a bug so that refilling the input buffer led to erasing it.	2016-10-29 13:32:36 +02:00
Niels	2fdba9de19	added "y" cases	2016-10-26 23:45:11 +02:00
Niels	a2808322c6	add test files from https://github.com/nst/JSONTestSuite	2016-10-26 18:57:56 +02:00
Niels Lohmann	a29fcae409	fixed Cmake link	2016-10-26 09:20:40 +02:00
Niels	3ebe28970a	small fixes	2016-10-23 17:25:07 +02:00
Niels	79d9fdc016	user-defined string literals exploit string length (#340 )	2016-10-22 18:57:58 +02:00
Niels	e310850353	cleanup after #336	2016-10-16 23:46:24 +02:00
Niels Lohmann	8057782bb8	Merge pull request #336 from seeekr/patch-1 fix minor grammar/style issue in README.md	2016-10-16 23:40:17 +02:00
Denis Andrejew	cb2d41e3a0	fix minor grammar/style issue in README.md	2016-10-16 02:46:43 +02:00
Niels	542a48a16a	Merge branch 'release/2.0.6' into develop	2016-10-15 16:48:08 +02:00
Niels	606098f45d	release 2.0.6	2016-10-15 16:47:45 +02:00
Niels	d91067220f	added missing overflow check for #329	2016-10-13 21:00:48 +02:00
Niels	67b9f1936d	cleanup after closing #324	2016-10-12 22:05:45 +02:00
Niels Lohmann	bb9d87ad55	Merge pull request #324 from vpetrigo/has_mapped_improve make has_mapped_type struct friendly	2016-10-12 21:59:56 +02:00
Niels	e7a60d8961	Merge branch 'feature/issue323' into develop	2016-10-12 21:21:59 +02:00
Niels	470197bd0b	improve test coverage	2016-10-10 21:58:31 +02:00
Niels	d3e7f9da67	code cleanup for #323	2016-10-10 20:38:50 +02:00
Niels	97280bbcfc	added missing header	2016-10-09 16:32:01 +02:00
Vladimir Petrigo	e9fde3e116	make has_mapped_type struct friendly	2016-10-08 16:50:23 +03:00
Niels	54bf5f20e9	adjusted README	2016-10-08 14:33:10 +02:00
Niels	2fa8ea0f74	started fixing #323	2016-10-08 14:27:28 +02:00
Niels	a0ef5a194c	addressed #319 , #321 , and #318	2016-10-06 23:27:43 +02:00
Niels Lohmann	04b11d78ff	Merge pull request #318 from ChristophJud/include_dir_relocation Include dir relocation	2016-10-06 22:35:36 +02:00
Niels Lohmann	8173c370f6	Merge pull request #321 from vasild/develop Fix usage examples' comments for std::multiset	2016-10-06 22:33:58 +02:00
Niels	b6550b35c3	fix after #313	2016-10-04 18:20:36 +02:00
Vasil Dimov	b5128b1610	Fix usage examples' comments for std::multiset	2016-10-04 18:53:44 +03:00
Niels Lohmann	963efb1f09	Merge pull request #313 from 5tefan/develop trivial documentation fix	2016-10-02 11:29:49 +02:00
Niels	d6005e59a5	added fuzzing results	2016-10-02 11:23:47 +02:00
Christoph Jud	e1b6a23049	relocation of install-include directory for other packages	2016-09-26 12:15:03 +02:00
Stefan Codrescu	be61091401	trivial documentation fix	2016-09-16 18:15:36 -06:00
Niels	e4366688f7	v2.0.5	2016-09-14 23:42:12 +02:00
Niels	5dfd2c9bdf	Merge branch 'release/2.0.5' into develop	2016-09-14 23:07:14 +02:00
Niels	5879eb0be3	Merge branch 'release/2.0.5'	2016-09-14 23:06:53 +02:00
Niels	3d104f1d43	version bump	2016-09-14 23:06:39 +02:00
Niels	6bbcdc1ec5	fixes #310	2016-09-14 22:48:12 +02:00
Niels	7b6cba23f3	results for #307	2016-09-12 21:23:12 +02:00
Niels	24c588cd25	Merge branch 'release/2.0.4' into develop	2016-09-11 23:37:30 +02:00
Niels	f209be1142	Merge branch 'release/2.0.4'	2016-09-11 23:37:11 +02:00
Niels	768d66560e	version bump	2016-09-11 23:36:59 +02:00
Niels	15925469c6	Travis updated their Xcode	2016-09-11 22:50:40 +02:00
Niels	f922426ec3	fixed #304	2016-09-11 22:40:51 +02:00
Niels	2daab5a4c2	fixed #306	2016-09-11 22:30:08 +02:00
Niels	8ea0ee502d	clang 3.9.0 is not working yet	2016-09-03 13:08:17 +02:00
Niels	fa0299f03a	moved cmake into clang	2016-09-03 12:30:10 +02:00
Niels	36745ed296	install from tarball	2016-09-03 10:34:52 +02:00
Niels	f0455b401d	forgot sh call	2016-09-03 09:44:10 +02:00
Niels	e0d809312b	the cmake in apt is too old	2016-09-03 09:17:30 +02:00
Niels	bfd6678800	clang 3.9.0 needs a newer cmake	2016-09-03 08:47:07 +02:00
Niels	9639f0dfb3	Clang 3.9.0 has been released	2016-09-03 00:37:45 +02:00
Niels	625370a1ad	Merge branch 'develop'	2016-09-02 16:05:38 +02:00
Niels	357baeff5a	release 2.0.3	2016-09-01 08:07:52 +02:00
Niels	42be2edd4c	fixed test coverage	2016-09-01 00:29:42 +02:00
Niels	2c82f25272	Merge branch 'release/2.0.3'	2016-08-31 21:27:32 +02:00
Niels	3586767c05	Merge branch 'release/v2.0.2'	2016-07-31 13:37:26 +02:00
Niels	8b39570009	Merge branch 'develop'	2016-06-28 21:40:23 +02:00
Niels	e29d6b5f41	Merge branch 'release/2.0.1'	2016-06-28 21:33:43 +02:00
Niels	25ccf7f908	Merge branch 'release/2.0.0'	2016-06-24 00:46:36 +02:00
				`@@ -0,0 +1 @@`
				`<a target="_blank" href="http://melpon.org/wandbox/permlink/B6ILaoysGMliouEO"><b>online</b></a>`
				`@@ -0,0 +1 @@`
				[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]