diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 85ff9b504e..8dbacb78a1 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -26,11 +26,11 @@ Please stick to the [issue template](https://github.com/nlohmann/json/blob/devel ## Files to change -:exclamation: Before you make any changes, note the single-header file [`src/json.hpp`](https://github.com/nlohmann/json/blob/develop/src/json.hpp) is **generated** from the source files in the [`develop` directory](https://github.com/nlohmann/json/tree/develop/develop). Please **do not** edit file `src/json.hpp` directly, but change the `develop` sources and regenerate file `src/json.hpp` by executing `make amalgamate`. +:exclamation: Before you make any changes, note the single-header file [`single_include/nlohmann/json.hpp`](https://github.com/nlohmann/json/blob/develop/single_include/nlohmann/json.hpp) is **generated** from the source files in the [`include/nlohmann` directory](https://github.com/nlohmann/json/tree/develop/include/nlohmann). Please **do not** edit file `single_include/nlohmann/json.hpp` directly, but change the `include/nlohmann` sources and regenerate file `single_include/nlohmann/json.hpp` by executing `make amalgamate`. To make changes, you need to edit the following files: -1. [`develop/*`](https://github.com/nlohmann/json/tree/develop/develop) - These files are the sources of the library. Before testing or creating a pull request, execute `make amalgamate` to regenerate `src/json.hpp`. +1. [`include/nlohmann/*`](https://github.com/nlohmann/json/tree/develop/include/nlohmann) - These files are the sources of the library. Before testing or creating a pull request, execute `make amalgamate` to regenerate `single_include/nlohmann/json.hpp`. 2. [`test/src/unit-*.cpp`](https://github.com/nlohmann/json/tree/develop/test/src) - These files contain the [Catch](https://github.com/philsquared/Catch) unit tests which currently cover [100 %](https://coveralls.io/github/nlohmann/json) of the library's code. diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 5863d0b5fb..d75a67b4d4 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -9,7 +9,7 @@ Read the [Contribution Guidelines](https://github.com/nlohmann/json/blob/develop - [ ] Changes are described in the pull request, or an [existing issue is referenced](https://github.com/nlohmann/json/issues). - [ ] The test suite [compiles and runs](https://github.com/nlohmann/json/blob/develop/README.md#execute-unit-tests) without error. - [ ] [Code coverage](https://coveralls.io/github/nlohmann/json) is 100%. Test cases can be added by editing the [test suite](https://github.com/nlohmann/json/tree/develop/test/src). -- [ ] The source code is amalgamated; that is, after making changes to the sources in the `develop` directory, run `make amalgamate` to create the single-header file `src/json.hpp`. The whole process is described [here](https://github.com/nlohmann/json/blob/develop/.github/CONTRIBUTING.md#files-to-change). +- [ ] The source code is amalgamated; that is, after making changes to the sources in the `include/nlohmann` directory, run `make amalgamate` to create the single-header file `single_include/nlohmann/json.hpp`. The whole process is described [here](https://github.com/nlohmann/json/blob/develop/.github/CONTRIBUTING.md#files-to-change). ## Please don't diff --git a/.travis.yml b/.travis.yml index 6c284754f0..ef06dbfa6a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -296,6 +296,6 @@ script: - if [ `which brew` ]; then brew update ; brew tap nlohmann/json ; - brew install nlohmann_json --HEAD ; - brew test nlohmann_json ; + #brew install nlohmann_json --HEAD ; + #brew test nlohmann_json ; fi diff --git a/CMakeLists.txt b/CMakeLists.txt index ca4f49a2d2..22408ff661 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.0.0) ## PROJECT ## name and version ## -project(nlohmann_json VERSION 3.0.1 LANGUAGES CXX) +project(nlohmann_json VERSION 3.1.0 LANGUAGES CXX) ## ## INCLUDE diff --git a/ChangeLog.md b/ChangeLog.md index bb95f937f6..bc03ba2031 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,6 +1,69 @@ # Change Log All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/). +## [v3.1.0](https://github.com/nlohmann/json/releases/tag/v3.1.0) (2018-02-01) +[Full Changelog](https://github.com/nlohmann/json/compare/v3.0.1...v3.1.0) + +- I have a proposal [\#949](https://github.com/nlohmann/json/issues/949) +- VERSION define\(s\) [\#948](https://github.com/nlohmann/json/issues/948) +- v3.0.1 compile error in icc 16.0.4 [\#947](https://github.com/nlohmann/json/issues/947) +- Use in VS2017 15.5.5 [\#946](https://github.com/nlohmann/json/issues/946) +- Process for reporting Security Bugs? [\#945](https://github.com/nlohmann/json/issues/945) +- Please expose a NLOHMANN\_JSON\_VERSION macro [\#943](https://github.com/nlohmann/json/issues/943) +- Change header include directory to nlohmann/json [\#942](https://github.com/nlohmann/json/issues/942) +- string\_type in binary\_reader [\#941](https://github.com/nlohmann/json/issues/941) +- compile error with clang 5.0 -std=c++1z and no string\_view [\#939](https://github.com/nlohmann/json/issues/939) +- Allow overriding JSON\_THROW to something else than abort\(\) [\#938](https://github.com/nlohmann/json/issues/938) +- Handle invalid string in Json file [\#937](https://github.com/nlohmann/json/issues/937) +- Unused variable 'kMinExp' [\#935](https://github.com/nlohmann/json/issues/935) +- test [\#934](https://github.com/nlohmann/json/issues/934) +- yytext is already defined [\#933](https://github.com/nlohmann/json/issues/933) +- Equality operator fails [\#931](https://github.com/nlohmann/json/issues/931) +- use in visual studio 2015 [\#929](https://github.com/nlohmann/json/issues/929) +- Relative includes of json\_fwd.hpp in detail/meta.hpp. \[Develop branch\] [\#928](https://github.com/nlohmann/json/issues/928) +- GCC 7.x issue [\#926](https://github.com/nlohmann/json/issues/926) +- json\_fwd.hpp not installed [\#923](https://github.com/nlohmann/json/issues/923) +- Use Google Benchmarks [\#921](https://github.com/nlohmann/json/issues/921) +- Move class json\_pointer to separate file [\#920](https://github.com/nlohmann/json/issues/920) +- Unable to locate 'to\_json\(\)' and 'from\_json\(\)' methods in the same namespace [\#917](https://github.com/nlohmann/json/issues/917) +- \[answered\]Read key1 from .value example [\#914](https://github.com/nlohmann/json/issues/914) +- Don't use `define private public` in test files [\#913](https://github.com/nlohmann/json/issues/913) +- value\(\) template argument type deduction [\#912](https://github.com/nlohmann/json/issues/912) +- Installation path is incorrect [\#910](https://github.com/nlohmann/json/issues/910) +- H [\#909](https://github.com/nlohmann/json/issues/909) +- Build failure using clang 5 [\#908](https://github.com/nlohmann/json/issues/908) +- Amalgate [\#907](https://github.com/nlohmann/json/issues/907) +- Update documentation and tests wrt. split headers [\#906](https://github.com/nlohmann/json/issues/906) +- Lib not working on ubuntu 16.04 [\#905](https://github.com/nlohmann/json/issues/905) +- Problem when writing to file. [\#904](https://github.com/nlohmann/json/issues/904) +- C2864 error when compiling with VS2015 and VS 2017 [\#903](https://github.com/nlohmann/json/issues/903) +- \[json.exception.type\_error.304\] cannot use at\(\) with object [\#902](https://github.com/nlohmann/json/issues/902) +- How do I forward nlohmann::json declaration? [\#899](https://github.com/nlohmann/json/issues/899) +- How to effectively store binary data? [\#898](https://github.com/nlohmann/json/issues/898) +- How to get the length of a JSON string without retrieving its std::string? [\#897](https://github.com/nlohmann/json/issues/897) +- Regression Tests Failure using "ctest" [\#887](https://github.com/nlohmann/json/issues/887) +- Discuss: add JSON Merge Patch \(RFC 7396\)? [\#877](https://github.com/nlohmann/json/issues/877) +- Discuss: replace static "iterator\_wrapper" function with "items" member function [\#874](https://github.com/nlohmann/json/issues/874) +- Make optional user-data available in from\_json [\#864](https://github.com/nlohmann/json/issues/864) +- Casting to std::string not working in VS2015 [\#861](https://github.com/nlohmann/json/issues/861) +- Sequential reading of JSON arrays [\#851](https://github.com/nlohmann/json/issues/851) +- Idea: Handle Multimaps Better [\#816](https://github.com/nlohmann/json/issues/816) +- Floating point rounding [\#777](https://github.com/nlohmann/json/issues/777) +- Loss of precision when serializing \ [\#360](https://github.com/nlohmann/json/issues/360) + +- Templatize std::string in binary\_reader \#941 [\#950](https://github.com/nlohmann/json/pull/950) ([kaidokert](https://github.com/kaidokert)) +- fix cmake install directory \(for real this time\) [\#944](https://github.com/nlohmann/json/pull/944) ([theodelrieu](https://github.com/theodelrieu)) +- Allow overriding THROW/CATCH/TRY macros with no-exceptions \#938 [\#940](https://github.com/nlohmann/json/pull/940) ([kaidokert](https://github.com/kaidokert)) +- Removed compiler warning about unused variable 'kMinExp' [\#936](https://github.com/nlohmann/json/pull/936) ([zerodefect](https://github.com/zerodefect)) +- Fix a typo in README.md [\#930](https://github.com/nlohmann/json/pull/930) ([Pipeliner](https://github.com/Pipeliner)) +- Howto installation of json\_fwd.hpp \(fixes \#923\) [\#925](https://github.com/nlohmann/json/pull/925) ([zerodefect](https://github.com/zerodefect)) +- fix sfinae on basic\_json UDT constructor [\#919](https://github.com/nlohmann/json/pull/919) ([theodelrieu](https://github.com/theodelrieu)) +- Floating-point formatting [\#915](https://github.com/nlohmann/json/pull/915) ([abolz](https://github.com/abolz)) +- Fix/cmake install [\#911](https://github.com/nlohmann/json/pull/911) ([theodelrieu](https://github.com/theodelrieu)) +- fix link to the documentation of the emplace function [\#900](https://github.com/nlohmann/json/pull/900) ([Dobiasd](https://github.com/Dobiasd)) +- JSON Merge Patch \(RFC 7396\) [\#876](https://github.com/nlohmann/json/pull/876) ([nlohmann](https://github.com/nlohmann)) +- Refactor/split it [\#700](https://github.com/nlohmann/json/pull/700) ([theodelrieu](https://github.com/theodelrieu)) + ## [v3.0.1](https://github.com/nlohmann/json/releases/tag/v3.0.1) (2017-12-29) [Full Changelog](https://github.com/nlohmann/json/compare/v3.0.0...v3.0.1) @@ -653,7 +716,7 @@ All notable changes to this project will be documented in this file. This projec - 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)) +- fixed a tiny typo [\#271](https://github.com/nlohmann/json/pull/271) ([feroldi](https://github.com/feroldi)) ## [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) diff --git a/LICENSE.MIT b/LICENSE.MIT index 00599afe6a..8b0f7002e4 100644 --- a/LICENSE.MIT +++ b/LICENSE.MIT @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2013-2017 Niels Lohmann +Copyright (c) 2013-2018 Niels Lohmann Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/README.md b/README.md index 4f064a477d..5f6a9baba0 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ [![Coverage Status](https://img.shields.io/coveralls/nlohmann/json.svg)](https://coveralls.io/r/nlohmann/json) [![Coverity Scan Build Status](https://scan.coverity.com/projects/5550/badge.svg)](https://scan.coverity.com/projects/nlohmann-json) [![Codacy Badge](https://api.codacy.com/project/badge/Grade/f3732b3327e34358a0e9d1fe9f661f08)](https://www.codacy.com/app/nlohmann/json?utm_source=github.com&utm_medium=referral&utm_content=nlohmann/json&utm_campaign=Badge_Grade) -[![Try online](https://img.shields.io/badge/try-online-blue.svg)](https://wandbox.org/permlink/Op57X0V7fTf2tdwl) +[![Try online](https://img.shields.io/badge/try-online-blue.svg)](https://wandbox.org/permlink/VHpbaZBOnrZcbn7j) [![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) @@ -40,7 +40,7 @@ There are myriads of [JSON](http://json.org) libraries out there, and each may e - **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. +- **Trivial integration**. Our whole code consists of a single header file [`json.hpp`](https://github.com/nlohmann/json/blob/single_include/nlohmann/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. - **Serious testing**. Our class is heavily [unit-tested](https://github.com/nlohmann/json/blob/master/test/src/unit.cpp) and covers [100%](https://coveralls.io/r/nlohmann/json) of the code, including all exceptional behavior. Furthermore, we checked with [Valgrind](http://valgrind.org) that there are no memory leaks. To maintain high quality, the project is following the [Core Infrastructure Initiative (CII) best practices](https://bestpractices.coreinfrastructure.org/projects/289). @@ -55,7 +55,7 @@ See the [contribution guidelines](https://github.com/nlohmann/json/blob/master/. ## Integration -The single required source, file `json.hpp` is in the `src` directory or [released here](https://github.com/nlohmann/json/releases). All you need to do is add +The single required source, file `json.hpp` is in the `single_include/nlohmann` directory or [released here](https://github.com/nlohmann/json/releases). All you need to do is add ```cpp #include "json.hpp" @@ -66,7 +66,7 @@ using json = nlohmann::json; to the files you want to use JSON objects. That's it. Do not forget to set the necessary switches to enable C++11 (e.g., `-std=c++11` for GCC and Clang). -You can further use file [`develop/json_fwd.hpp`](https://github.com/nlohmann/json/blob/develop/develop/json_fwd.hpp) for forward-declarations. The installation of json_fwd.hpp (as part of cmake's install step), can be achieved by setting `-DJSON_MultipleHeaders=ON`: +You can further use file [`include/json_fwd.hpp`](https://github.com/nlohmann/json/blob/develop/develop/json_fwd.hpp) for forward-declarations. The installation of json_fwd.hpp (as part of cmake's install step), can be achieved by setting `-DJSON_MultipleHeaders=ON`: ### Package Managers @@ -908,7 +908,7 @@ I deeply appreciate the help of the following people. - [duncanwerner](https://github.com/duncanwerner) found a really embarrassing performance regression in the 2.0.0 release. - [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). He also implemented the magic behind the serialization/deserialization of user-defined types. +- [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). He also implemented the magic behind the serialization/deserialization of user-defined types and split the single header file into smaller chunks. - [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. @@ -967,6 +967,8 @@ I deeply appreciate the help of the following people. - [abolz](https://github.com/abolz) integrated the Grisu2 algorithm for proper floating-point formatting, allowing more roundtrip checks to succeed. - [Vadim Evard](https://github.com/Pipeliner) fixed a Markdown issue in the README. - [zerodefect](https://github.com/zerodefect) fixed a compiler warning. +- [Kert](https://github.com/kaidokert) allowed to template the string type in the serialization and added the possibility to override the exceptional behavior. +- [mark-99](https://github.com/mark-99) helped fixing an ICC error. Thanks a lot for helping out! Please [let me know](mailto:mail@nlohmann.me) if I forgot someone. @@ -996,7 +998,7 @@ The library itself contains of a single header file licensed under the MIT licen - [**send_to_wandbox**](https://github.com/nlohmann/json/blob/develop/doc/scripts/send_to_wandbox.py) to send code examples to [Wandbox](http://melpon.org/wandbox) - [**Travis**](https://travis-ci.org) for [continuous integration](https://travis-ci.org/nlohmann/json) on Linux and macOS - [**Valgrind**](http://valgrind.org) to check for correct memory management -- [**Wandbox**](http://melpon.org/wandbox) for [online examples](https://wandbox.org/permlink/Op57X0V7fTf2tdwl) +- [**Wandbox**](http://melpon.org/wandbox) for [online examples](https://wandbox.org/permlink/VHpbaZBOnrZcbn7j) ## Projects using JSON for Modern C++ diff --git a/doc/Doxyfile b/doc/Doxyfile index 46d3685c71..1ccbf260bd 100644 --- a/doc/Doxyfile +++ b/doc/Doxyfile @@ -5,7 +5,7 @@ #--------------------------------------------------------------------------- DOXYFILE_ENCODING = UTF-8 PROJECT_NAME = "JSON for Modern C++" -PROJECT_NUMBER = 3.0.1 +PROJECT_NUMBER = 3.1.0 PROJECT_BRIEF = PROJECT_LOGO = OUTPUT_DIRECTORY = . @@ -29,7 +29,7 @@ INHERIT_DOCS = YES SEPARATE_MEMBER_PAGES = YES TAB_SIZE = 4 ALIASES = "complexity=@par Complexity^^" \ - "liveexample{2}=@par Example^^ \1 ^^ @includelineno \2.cpp \n Output (play with this example @htmlinclude \2.link):^^ @verbinclude \2.output ^^ The example code above can be translated with @verbatim g++ -std=c++11 -Isrc doc/examples/\2.cpp -o \2 @endverbatim" \ + "liveexample{2}=@par Example^^ \1 ^^ @includelineno \2.cpp \n Output (play with this example @htmlinclude \2.link):^^ @verbinclude \2.output ^^ The example code above can be translated with @verbatim g++ -std=c++11 -Isingle_include doc/examples/\2.cpp -o \2 @endverbatim" \ "requirement=@par Requirements^^" \ "exceptionsafety=@par Exception safety^^" \ "iterators=@par Iterator validity^^" @@ -107,7 +107,7 @@ WARN_LOGFILE = #--------------------------------------------------------------------------- # Configuration options related to the input files #--------------------------------------------------------------------------- -INPUT = ../src/json.hpp \ +INPUT = ../single_include/nlohmann/json.hpp \ index.md \ faq.md \ binary_formats.md diff --git a/doc/Makefile b/doc/Makefile index 886378a4aa..30ee74843b 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -1,4 +1,4 @@ -SRCDIR = ../src +SRCDIR = ../single_include SED:=$(shell command -v gsed || which sed) all: doxygen @@ -28,7 +28,7 @@ EXAMPLES = $(wildcard examples/*.cpp) %.link: %.cpp rm -fr tmp mkdir tmp - cp $(SRCDIR)/json.hpp tmp + cp -r $(SRCDIR)/nlohmann tmp scripts/send_to_wandbox.py tmp $< > $@.tmp /bin/echo -n "online" > $@ rm -fr tmp $@.tmp diff --git a/doc/examples/README.cpp b/doc/examples/README.cpp index 5a8ab38f28..04b488dbdb 100644 --- a/doc/examples/README.cpp +++ b/doc/examples/README.cpp @@ -1,5 +1,5 @@ #include -#include "json.hpp" +#include using json = nlohmann::json; diff --git a/doc/examples/README.link b/doc/examples/README.link index 5403e0d828..365a883c65 100644 --- a/doc/examples/README.link +++ b/doc/examples/README.link @@ -1 +1 @@ -online \ No newline at end of file +online \ No newline at end of file diff --git a/doc/examples/array.cpp b/doc/examples/array.cpp index b43be5a652..139b5ef10e 100644 --- a/doc/examples/array.cpp +++ b/doc/examples/array.cpp @@ -1,5 +1,5 @@ #include -#include "json.hpp" +#include using json = nlohmann::json; diff --git a/doc/examples/array.link b/doc/examples/array.link index cd77ed145e..5f02f8c5cb 100644 --- a/doc/examples/array.link +++ b/doc/examples/array.link @@ -1 +1 @@ -online \ No newline at end of file +online \ No newline at end of file diff --git a/doc/examples/at__object_t_key_type.cpp b/doc/examples/at__object_t_key_type.cpp index 0430617e4f..202f8a2eed 100644 --- a/doc/examples/at__object_t_key_type.cpp +++ b/doc/examples/at__object_t_key_type.cpp @@ -1,5 +1,5 @@ #include -#include "json.hpp" +#include using json = nlohmann::json; diff --git a/doc/examples/at__object_t_key_type.link b/doc/examples/at__object_t_key_type.link index b4d6efc81b..bac67ae9ab 100644 --- a/doc/examples/at__object_t_key_type.link +++ b/doc/examples/at__object_t_key_type.link @@ -1 +1 @@ -online \ No newline at end of file +online \ No newline at end of file diff --git a/doc/examples/at__object_t_key_type_const.cpp b/doc/examples/at__object_t_key_type_const.cpp index 9aa2ed33ce..56ce57661e 100644 --- a/doc/examples/at__object_t_key_type_const.cpp +++ b/doc/examples/at__object_t_key_type_const.cpp @@ -1,5 +1,5 @@ #include -#include "json.hpp" +#include using json = nlohmann::json; diff --git a/doc/examples/at__object_t_key_type_const.link b/doc/examples/at__object_t_key_type_const.link index 6e6ca3354f..3000cc5795 100644 --- a/doc/examples/at__object_t_key_type_const.link +++ b/doc/examples/at__object_t_key_type_const.link @@ -1 +1 @@ -online \ No newline at end of file +online \ No newline at end of file diff --git a/doc/examples/at__size_type.cpp b/doc/examples/at__size_type.cpp index 202e44b10d..65baeddcf4 100644 --- a/doc/examples/at__size_type.cpp +++ b/doc/examples/at__size_type.cpp @@ -1,5 +1,5 @@ #include -#include "json.hpp" +#include using json = nlohmann::json; diff --git a/doc/examples/at__size_type.link b/doc/examples/at__size_type.link index 5dec37524e..b06ef70bf9 100644 --- a/doc/examples/at__size_type.link +++ b/doc/examples/at__size_type.link @@ -1 +1 @@ -online \ No newline at end of file +online \ No newline at end of file diff --git a/doc/examples/at__size_type_const.cpp b/doc/examples/at__size_type_const.cpp index 33108ce865..faa4cffdd1 100644 --- a/doc/examples/at__size_type_const.cpp +++ b/doc/examples/at__size_type_const.cpp @@ -1,5 +1,5 @@ #include -#include "json.hpp" +#include using json = nlohmann::json; diff --git a/doc/examples/at__size_type_const.link b/doc/examples/at__size_type_const.link index 7412f09fb0..ba465d31e6 100644 --- a/doc/examples/at__size_type_const.link +++ b/doc/examples/at__size_type_const.link @@ -1 +1 @@ -online \ No newline at end of file +online \ No newline at end of file diff --git a/doc/examples/at_json_pointer.cpp b/doc/examples/at_json_pointer.cpp index f43b1bcca3..ed450f70df 100644 --- a/doc/examples/at_json_pointer.cpp +++ b/doc/examples/at_json_pointer.cpp @@ -1,5 +1,5 @@ #include -#include "json.hpp" +#include using json = nlohmann::json; diff --git a/doc/examples/at_json_pointer.link b/doc/examples/at_json_pointer.link index 99ebf01937..4bae0ca359 100644 --- a/doc/examples/at_json_pointer.link +++ b/doc/examples/at_json_pointer.link @@ -1 +1 @@ -online \ No newline at end of file +online \ No newline at end of file diff --git a/doc/examples/at_json_pointer_const.cpp b/doc/examples/at_json_pointer_const.cpp index 8009e95ff6..6f2b2f5ed9 100644 --- a/doc/examples/at_json_pointer_const.cpp +++ b/doc/examples/at_json_pointer_const.cpp @@ -1,5 +1,5 @@ #include -#include "json.hpp" +#include using json = nlohmann::json; diff --git a/doc/examples/at_json_pointer_const.link b/doc/examples/at_json_pointer_const.link index 9011b99b15..21e000c59b 100644 --- a/doc/examples/at_json_pointer_const.link +++ b/doc/examples/at_json_pointer_const.link @@ -1 +1 @@ -online \ No newline at end of file +online \ No newline at end of file diff --git a/doc/examples/back.cpp b/doc/examples/back.cpp index cb227c2be7..1439a8218c 100644 --- a/doc/examples/back.cpp +++ b/doc/examples/back.cpp @@ -1,5 +1,5 @@ #include -#include "json.hpp" +#include using json = nlohmann::json; diff --git a/doc/examples/back.link b/doc/examples/back.link index fa1ce912cf..09a85fda5d 100644 --- a/doc/examples/back.link +++ b/doc/examples/back.link @@ -1 +1 @@ -online \ No newline at end of file +online \ No newline at end of file diff --git a/doc/examples/basic_json__CompatibleType.cpp b/doc/examples/basic_json__CompatibleType.cpp index 694935591f..d39fd7a439 100644 --- a/doc/examples/basic_json__CompatibleType.cpp +++ b/doc/examples/basic_json__CompatibleType.cpp @@ -6,7 +6,7 @@ #include #include #include -#include "json.hpp" +#include using json = nlohmann::json; diff --git a/doc/examples/basic_json__CompatibleType.link b/doc/examples/basic_json__CompatibleType.link index a6e786ab14..6f401441c7 100644 --- a/doc/examples/basic_json__CompatibleType.link +++ b/doc/examples/basic_json__CompatibleType.link @@ -1 +1 @@ -online \ No newline at end of file +online \ No newline at end of file diff --git a/doc/examples/basic_json__CompatibleType.output b/doc/examples/basic_json__CompatibleType.output index cd5923b8fd..2337e81fb0 100644 --- a/doc/examples/basic_json__CompatibleType.output +++ b/doc/examples/basic_json__CompatibleType.output @@ -28,10 +28,10 @@ 1024 -17 8 -3.14159265358979 +3.141592653589793 null null -42.2299995422363 +42.22999954223633 null 23.42 diff --git a/doc/examples/basic_json__InputIt_InputIt.cpp b/doc/examples/basic_json__InputIt_InputIt.cpp index 36c6f571f0..ed5aff9a83 100644 --- a/doc/examples/basic_json__InputIt_InputIt.cpp +++ b/doc/examples/basic_json__InputIt_InputIt.cpp @@ -1,5 +1,5 @@ #include -#include "json.hpp" +#include using json = nlohmann::json; diff --git a/doc/examples/basic_json__InputIt_InputIt.link b/doc/examples/basic_json__InputIt_InputIt.link index aad58f7309..bd8170d938 100644 --- a/doc/examples/basic_json__InputIt_InputIt.link +++ b/doc/examples/basic_json__InputIt_InputIt.link @@ -1 +1 @@ -online \ No newline at end of file +online \ No newline at end of file diff --git a/doc/examples/basic_json__basic_json.cpp b/doc/examples/basic_json__basic_json.cpp index 98df6101d5..17136f4377 100644 --- a/doc/examples/basic_json__basic_json.cpp +++ b/doc/examples/basic_json__basic_json.cpp @@ -1,5 +1,5 @@ #include -#include "json.hpp" +#include using json = nlohmann::json; diff --git a/doc/examples/basic_json__basic_json.link b/doc/examples/basic_json__basic_json.link index e894b66388..8e44fa7c52 100644 --- a/doc/examples/basic_json__basic_json.link +++ b/doc/examples/basic_json__basic_json.link @@ -1 +1 @@ -online \ No newline at end of file +online \ No newline at end of file diff --git a/doc/examples/basic_json__copyassignment.cpp b/doc/examples/basic_json__copyassignment.cpp index 4f1bc43947..2d86574000 100644 --- a/doc/examples/basic_json__copyassignment.cpp +++ b/doc/examples/basic_json__copyassignment.cpp @@ -1,5 +1,5 @@ #include -#include "json.hpp" +#include using json = nlohmann::json; diff --git a/doc/examples/basic_json__copyassignment.link b/doc/examples/basic_json__copyassignment.link index eec9258f8d..b558aa04a7 100644 --- a/doc/examples/basic_json__copyassignment.link +++ b/doc/examples/basic_json__copyassignment.link @@ -1 +1 @@ -online \ No newline at end of file +online \ No newline at end of file diff --git a/doc/examples/basic_json__list_init_t.cpp b/doc/examples/basic_json__list_init_t.cpp index ba1bce4ee9..78611e1a3e 100644 --- a/doc/examples/basic_json__list_init_t.cpp +++ b/doc/examples/basic_json__list_init_t.cpp @@ -1,5 +1,5 @@ #include -#include "json.hpp" +#include using json = nlohmann::json; diff --git a/doc/examples/basic_json__list_init_t.link b/doc/examples/basic_json__list_init_t.link index 75234b6233..b92a9fa258 100644 --- a/doc/examples/basic_json__list_init_t.link +++ b/doc/examples/basic_json__list_init_t.link @@ -1 +1 @@ -online \ No newline at end of file +online \ No newline at end of file diff --git a/doc/examples/basic_json__moveconstructor.cpp b/doc/examples/basic_json__moveconstructor.cpp index 34827259e0..48b68f61ed 100644 --- a/doc/examples/basic_json__moveconstructor.cpp +++ b/doc/examples/basic_json__moveconstructor.cpp @@ -1,5 +1,5 @@ #include -#include "json.hpp" +#include using json = nlohmann::json; diff --git a/doc/examples/basic_json__moveconstructor.link b/doc/examples/basic_json__moveconstructor.link index f90473027d..c45e09bb6a 100644 --- a/doc/examples/basic_json__moveconstructor.link +++ b/doc/examples/basic_json__moveconstructor.link @@ -1 +1 @@ -online \ No newline at end of file +online \ No newline at end of file diff --git a/doc/examples/basic_json__nullptr_t.cpp b/doc/examples/basic_json__nullptr_t.cpp index 886d5ea3cb..7a4366650a 100644 --- a/doc/examples/basic_json__nullptr_t.cpp +++ b/doc/examples/basic_json__nullptr_t.cpp @@ -1,5 +1,5 @@ #include -#include "json.hpp" +#include using json = nlohmann::json; diff --git a/doc/examples/basic_json__nullptr_t.link b/doc/examples/basic_json__nullptr_t.link index 003110f128..30568efb41 100644 --- a/doc/examples/basic_json__nullptr_t.link +++ b/doc/examples/basic_json__nullptr_t.link @@ -1 +1 @@ -online \ No newline at end of file +online \ No newline at end of file diff --git a/doc/examples/basic_json__size_type_basic_json.cpp b/doc/examples/basic_json__size_type_basic_json.cpp index a021edda34..9ec7677273 100644 --- a/doc/examples/basic_json__size_type_basic_json.cpp +++ b/doc/examples/basic_json__size_type_basic_json.cpp @@ -1,5 +1,5 @@ #include -#include "json.hpp" +#include using json = nlohmann::json; diff --git a/doc/examples/basic_json__size_type_basic_json.link b/doc/examples/basic_json__size_type_basic_json.link index e48b9fd958..2b286dc1d7 100644 --- a/doc/examples/basic_json__size_type_basic_json.link +++ b/doc/examples/basic_json__size_type_basic_json.link @@ -1 +1 @@ -online \ No newline at end of file +online \ No newline at end of file diff --git a/doc/examples/basic_json__value.cpp b/doc/examples/basic_json__value.cpp index 42d4aa3146..9488d30efe 100644 --- a/doc/examples/basic_json__value.cpp +++ b/doc/examples/basic_json__value.cpp @@ -1,5 +1,5 @@ #include -#include "json.hpp" +#include using json = nlohmann::json; diff --git a/doc/examples/basic_json__value.link b/doc/examples/basic_json__value.link index d018278177..df2bbdc58f 100644 --- a/doc/examples/basic_json__value.link +++ b/doc/examples/basic_json__value.link @@ -1 +1 @@ -online \ No newline at end of file +online \ No newline at end of file diff --git a/doc/examples/basic_json__value_ptr.cpp b/doc/examples/basic_json__value_ptr.cpp index 4f6f999ecf..f25b7736ae 100644 --- a/doc/examples/basic_json__value_ptr.cpp +++ b/doc/examples/basic_json__value_ptr.cpp @@ -1,5 +1,5 @@ #include -#include "json.hpp" +#include using json = nlohmann::json; diff --git a/doc/examples/basic_json__value_ptr.link b/doc/examples/basic_json__value_ptr.link index 799f96f7d2..3f393692db 100644 --- a/doc/examples/basic_json__value_ptr.link +++ b/doc/examples/basic_json__value_ptr.link @@ -1 +1 @@ -online \ No newline at end of file +online \ No newline at end of file diff --git a/doc/examples/basic_json__value_t.cpp b/doc/examples/basic_json__value_t.cpp index d52e628b90..c306731ac2 100644 --- a/doc/examples/basic_json__value_t.cpp +++ b/doc/examples/basic_json__value_t.cpp @@ -1,5 +1,5 @@ #include -#include "json.hpp" +#include using json = nlohmann::json; diff --git a/doc/examples/basic_json__value_t.link b/doc/examples/basic_json__value_t.link index a66b1dd443..8dc41b22ee 100644 --- a/doc/examples/basic_json__value_t.link +++ b/doc/examples/basic_json__value_t.link @@ -1 +1 @@ -online \ No newline at end of file +online \ No newline at end of file diff --git a/doc/examples/begin.cpp b/doc/examples/begin.cpp index ebf97e5fe9..42710d153e 100644 --- a/doc/examples/begin.cpp +++ b/doc/examples/begin.cpp @@ -1,5 +1,5 @@ #include -#include "json.hpp" +#include using json = nlohmann::json; diff --git a/doc/examples/begin.link b/doc/examples/begin.link index 64ac5fba9a..3875421d9e 100644 --- a/doc/examples/begin.link +++ b/doc/examples/begin.link @@ -1 +1 @@ -online \ No newline at end of file +online \ No newline at end of file diff --git a/doc/examples/cbegin.cpp b/doc/examples/cbegin.cpp index d12c860886..3226fd2195 100644 --- a/doc/examples/cbegin.cpp +++ b/doc/examples/cbegin.cpp @@ -1,5 +1,5 @@ #include -#include "json.hpp" +#include using json = nlohmann::json; diff --git a/doc/examples/cbegin.link b/doc/examples/cbegin.link index fe670f1585..547ae48589 100644 --- a/doc/examples/cbegin.link +++ b/doc/examples/cbegin.link @@ -1 +1 @@ -online \ No newline at end of file +online \ No newline at end of file diff --git a/doc/examples/cend.cpp b/doc/examples/cend.cpp index 8d141acf13..9d7978d50e 100644 --- a/doc/examples/cend.cpp +++ b/doc/examples/cend.cpp @@ -1,5 +1,5 @@ #include -#include "json.hpp" +#include using json = nlohmann::json; diff --git a/doc/examples/cend.link b/doc/examples/cend.link index 3c7264263a..7b8bcba41b 100644 --- a/doc/examples/cend.link +++ b/doc/examples/cend.link @@ -1 +1 @@ -online \ No newline at end of file +online \ No newline at end of file diff --git a/doc/examples/clear.cpp b/doc/examples/clear.cpp index e892b13e98..f081e7eda8 100644 --- a/doc/examples/clear.cpp +++ b/doc/examples/clear.cpp @@ -1,5 +1,5 @@ #include -#include "json.hpp" +#include using json = nlohmann::json; diff --git a/doc/examples/clear.link b/doc/examples/clear.link index 1123e2f3e6..cad700c32a 100644 --- a/doc/examples/clear.link +++ b/doc/examples/clear.link @@ -1 +1 @@ -online \ No newline at end of file +online \ No newline at end of file diff --git a/doc/examples/count.cpp b/doc/examples/count.cpp index cd030fffc8..0ea19b6c1b 100644 --- a/doc/examples/count.cpp +++ b/doc/examples/count.cpp @@ -1,5 +1,5 @@ #include -#include "json.hpp" +#include using json = nlohmann::json; diff --git a/doc/examples/count.link b/doc/examples/count.link index 84666742bf..9355bd2cfd 100644 --- a/doc/examples/count.link +++ b/doc/examples/count.link @@ -1 +1 @@ -online \ No newline at end of file +online \ No newline at end of file diff --git a/doc/examples/crbegin.cpp b/doc/examples/crbegin.cpp index 6dc4a6f7db..dc3209cf87 100644 --- a/doc/examples/crbegin.cpp +++ b/doc/examples/crbegin.cpp @@ -1,5 +1,5 @@ #include -#include "json.hpp" +#include using json = nlohmann::json; diff --git a/doc/examples/crbegin.link b/doc/examples/crbegin.link index f97dac66f2..6079e7a308 100644 --- a/doc/examples/crbegin.link +++ b/doc/examples/crbegin.link @@ -1 +1 @@ -online \ No newline at end of file +online \ No newline at end of file diff --git a/doc/examples/crend.cpp b/doc/examples/crend.cpp index 9a00950c03..dff2609316 100644 --- a/doc/examples/crend.cpp +++ b/doc/examples/crend.cpp @@ -1,5 +1,5 @@ #include -#include "json.hpp" +#include using json = nlohmann::json; diff --git a/doc/examples/crend.link b/doc/examples/crend.link index 208c7c96a3..1263fc1f26 100644 --- a/doc/examples/crend.link +++ b/doc/examples/crend.link @@ -1 +1 @@ -online \ No newline at end of file +online \ No newline at end of file diff --git a/doc/examples/diff.cpp b/doc/examples/diff.cpp index 274e56bf00..a29f14d261 100644 --- a/doc/examples/diff.cpp +++ b/doc/examples/diff.cpp @@ -1,5 +1,5 @@ #include -#include "json.hpp" +#include using json = nlohmann::json; diff --git a/doc/examples/diff.link b/doc/examples/diff.link index a02ddbdb69..dfd1772bd4 100644 --- a/doc/examples/diff.link +++ b/doc/examples/diff.link @@ -1 +1 @@ -online \ No newline at end of file +online \ No newline at end of file diff --git a/doc/examples/dump.cpp b/doc/examples/dump.cpp index 1c48597246..4deb64a141 100644 --- a/doc/examples/dump.cpp +++ b/doc/examples/dump.cpp @@ -1,5 +1,5 @@ #include -#include "json.hpp" +#include using json = nlohmann::json; diff --git a/doc/examples/dump.link b/doc/examples/dump.link index 4de703433c..c072c0d95f 100644 --- a/doc/examples/dump.link +++ b/doc/examples/dump.link @@ -1 +1 @@ -online \ No newline at end of file +online \ No newline at end of file diff --git a/doc/examples/emplace.cpp b/doc/examples/emplace.cpp index 7e80b68cf7..a5314910f5 100644 --- a/doc/examples/emplace.cpp +++ b/doc/examples/emplace.cpp @@ -1,5 +1,5 @@ #include -#include "json.hpp" +#include using json = nlohmann::json; diff --git a/doc/examples/emplace.link b/doc/examples/emplace.link index 809cc21e8b..36f2ed2f83 100644 --- a/doc/examples/emplace.link +++ b/doc/examples/emplace.link @@ -1 +1 @@ -online \ No newline at end of file +online \ No newline at end of file diff --git a/doc/examples/emplace_back.cpp b/doc/examples/emplace_back.cpp index 6a50fd20d6..e979a945cc 100644 --- a/doc/examples/emplace_back.cpp +++ b/doc/examples/emplace_back.cpp @@ -1,5 +1,5 @@ #include -#include "json.hpp" +#include using json = nlohmann::json; diff --git a/doc/examples/emplace_back.link b/doc/examples/emplace_back.link index 9397a892ce..2ea20f36e0 100644 --- a/doc/examples/emplace_back.link +++ b/doc/examples/emplace_back.link @@ -1 +1 @@ -online \ No newline at end of file +online \ No newline at end of file diff --git a/doc/examples/empty.cpp b/doc/examples/empty.cpp index 94bc46a3ed..6ef6e40edb 100644 --- a/doc/examples/empty.cpp +++ b/doc/examples/empty.cpp @@ -1,5 +1,5 @@ #include -#include "json.hpp" +#include using json = nlohmann::json; diff --git a/doc/examples/empty.link b/doc/examples/empty.link index 90a6590efa..a182c12848 100644 --- a/doc/examples/empty.link +++ b/doc/examples/empty.link @@ -1 +1 @@ -online \ No newline at end of file +online \ No newline at end of file diff --git a/doc/examples/end.cpp b/doc/examples/end.cpp index 2984f9eae2..5a5b6e728a 100644 --- a/doc/examples/end.cpp +++ b/doc/examples/end.cpp @@ -1,5 +1,5 @@ #include -#include "json.hpp" +#include using json = nlohmann::json; diff --git a/doc/examples/end.link b/doc/examples/end.link index 2695e1d571..9ef322c4b6 100644 --- a/doc/examples/end.link +++ b/doc/examples/end.link @@ -1 +1 @@ -online \ No newline at end of file +online \ No newline at end of file diff --git a/doc/examples/erase__IteratorType.cpp b/doc/examples/erase__IteratorType.cpp index 0ba7e6fca0..bf5d3dd445 100644 --- a/doc/examples/erase__IteratorType.cpp +++ b/doc/examples/erase__IteratorType.cpp @@ -1,5 +1,5 @@ #include -#include "json.hpp" +#include using json = nlohmann::json; diff --git a/doc/examples/erase__IteratorType.link b/doc/examples/erase__IteratorType.link index 71d4114669..67ea55abd2 100644 --- a/doc/examples/erase__IteratorType.link +++ b/doc/examples/erase__IteratorType.link @@ -1 +1 @@ -online \ No newline at end of file +online \ No newline at end of file diff --git a/doc/examples/erase__IteratorType_IteratorType.cpp b/doc/examples/erase__IteratorType_IteratorType.cpp index efbf789e4c..7cddac6a27 100644 --- a/doc/examples/erase__IteratorType_IteratorType.cpp +++ b/doc/examples/erase__IteratorType_IteratorType.cpp @@ -1,5 +1,5 @@ #include -#include "json.hpp" +#include using json = nlohmann::json; diff --git a/doc/examples/erase__IteratorType_IteratorType.link b/doc/examples/erase__IteratorType_IteratorType.link index 9209f64cf7..0ea298913c 100644 --- a/doc/examples/erase__IteratorType_IteratorType.link +++ b/doc/examples/erase__IteratorType_IteratorType.link @@ -1 +1 @@ -online \ No newline at end of file +online \ No newline at end of file diff --git a/doc/examples/erase__key_type.cpp b/doc/examples/erase__key_type.cpp index 592aa020a2..40c755110f 100644 --- a/doc/examples/erase__key_type.cpp +++ b/doc/examples/erase__key_type.cpp @@ -1,5 +1,5 @@ #include -#include "json.hpp" +#include using json = nlohmann::json; diff --git a/doc/examples/erase__key_type.link b/doc/examples/erase__key_type.link index b3ab45ef25..1d02dd58bb 100644 --- a/doc/examples/erase__key_type.link +++ b/doc/examples/erase__key_type.link @@ -1 +1 @@ -online \ No newline at end of file +online \ No newline at end of file diff --git a/doc/examples/erase__size_type.cpp b/doc/examples/erase__size_type.cpp index 72021badad..b6d7b011c7 100644 --- a/doc/examples/erase__size_type.cpp +++ b/doc/examples/erase__size_type.cpp @@ -1,5 +1,5 @@ #include -#include "json.hpp" +#include using json = nlohmann::json; diff --git a/doc/examples/erase__size_type.link b/doc/examples/erase__size_type.link index 33a124ca0b..c3d94bb83c 100644 --- a/doc/examples/erase__size_type.link +++ b/doc/examples/erase__size_type.link @@ -1 +1 @@ -online \ No newline at end of file +online \ No newline at end of file diff --git a/doc/examples/exception.cpp b/doc/examples/exception.cpp index 13926b25b4..82696e6142 100644 --- a/doc/examples/exception.cpp +++ b/doc/examples/exception.cpp @@ -1,5 +1,5 @@ #include -#include "json.hpp" +#include using json = nlohmann::json; diff --git a/doc/examples/exception.link b/doc/examples/exception.link index 7043792b26..ed4cb445a7 100644 --- a/doc/examples/exception.link +++ b/doc/examples/exception.link @@ -1 +1 @@ -online \ No newline at end of file +online \ No newline at end of file diff --git a/doc/examples/find__key_type.cpp b/doc/examples/find__key_type.cpp index c411ba4f66..685ba77633 100644 --- a/doc/examples/find__key_type.cpp +++ b/doc/examples/find__key_type.cpp @@ -1,5 +1,5 @@ #include -#include "json.hpp" +#include using json = nlohmann::json; diff --git a/doc/examples/find__key_type.link b/doc/examples/find__key_type.link index 0be7a24ad9..f23abc827f 100644 --- a/doc/examples/find__key_type.link +++ b/doc/examples/find__key_type.link @@ -1 +1 @@ -online \ No newline at end of file +online \ No newline at end of file diff --git a/doc/examples/flatten.cpp b/doc/examples/flatten.cpp index 908b371d52..2bd7e9e8fa 100644 --- a/doc/examples/flatten.cpp +++ b/doc/examples/flatten.cpp @@ -1,5 +1,5 @@ #include -#include "json.hpp" +#include using json = nlohmann::json; diff --git a/doc/examples/flatten.link b/doc/examples/flatten.link index d32588fef8..8eb81a696d 100644 --- a/doc/examples/flatten.link +++ b/doc/examples/flatten.link @@ -1 +1 @@ -online \ No newline at end of file +online \ No newline at end of file diff --git a/doc/examples/from_cbor.cpp b/doc/examples/from_cbor.cpp index b37b375a59..633b3e7964 100644 --- a/doc/examples/from_cbor.cpp +++ b/doc/examples/from_cbor.cpp @@ -1,5 +1,5 @@ #include -#include "json.hpp" +#include using json = nlohmann::json; diff --git a/doc/examples/from_cbor.link b/doc/examples/from_cbor.link index 6e1f4e2466..6e27db911b 100644 --- a/doc/examples/from_cbor.link +++ b/doc/examples/from_cbor.link @@ -1 +1 @@ -online \ No newline at end of file +online \ No newline at end of file diff --git a/doc/examples/from_msgpack.cpp b/doc/examples/from_msgpack.cpp index 84c7d1f1fc..8a99b3c5fb 100644 --- a/doc/examples/from_msgpack.cpp +++ b/doc/examples/from_msgpack.cpp @@ -1,5 +1,5 @@ #include -#include "json.hpp" +#include using json = nlohmann::json; diff --git a/doc/examples/from_msgpack.link b/doc/examples/from_msgpack.link index 493f443568..ddfdcb34a9 100644 --- a/doc/examples/from_msgpack.link +++ b/doc/examples/from_msgpack.link @@ -1 +1 @@ -online \ No newline at end of file +online \ No newline at end of file diff --git a/doc/examples/from_ubjson.cpp b/doc/examples/from_ubjson.cpp index 2adca3c6c7..b20999fd1f 100644 --- a/doc/examples/from_ubjson.cpp +++ b/doc/examples/from_ubjson.cpp @@ -1,5 +1,5 @@ #include -#include "json.hpp" +#include using json = nlohmann::json; diff --git a/doc/examples/from_ubjson.link b/doc/examples/from_ubjson.link index 5ff36826f1..2855f18c90 100644 --- a/doc/examples/from_ubjson.link +++ b/doc/examples/from_ubjson.link @@ -1 +1 @@ -online \ No newline at end of file +online \ No newline at end of file diff --git a/doc/examples/front.cpp b/doc/examples/front.cpp index bbc372e061..a0f6306897 100644 --- a/doc/examples/front.cpp +++ b/doc/examples/front.cpp @@ -1,5 +1,5 @@ #include -#include "json.hpp" +#include using json = nlohmann::json; diff --git a/doc/examples/front.link b/doc/examples/front.link index 4f8bcd7796..172924f9a1 100644 --- a/doc/examples/front.link +++ b/doc/examples/front.link @@ -1 +1 @@ -online \ No newline at end of file +online \ No newline at end of file diff --git a/doc/examples/get__PointerType.cpp b/doc/examples/get__PointerType.cpp index 29f9ad3499..2f32ed7af6 100644 --- a/doc/examples/get__PointerType.cpp +++ b/doc/examples/get__PointerType.cpp @@ -1,5 +1,5 @@ #include -#include "json.hpp" +#include using json = nlohmann::json; diff --git a/doc/examples/get__PointerType.link b/doc/examples/get__PointerType.link index 73a3fc5186..1c67f73983 100644 --- a/doc/examples/get__PointerType.link +++ b/doc/examples/get__PointerType.link @@ -1 +1 @@ -online \ No newline at end of file +online \ No newline at end of file diff --git a/doc/examples/get__ValueType_const.cpp b/doc/examples/get__ValueType_const.cpp index d78a6b2601..7a703aaeb1 100644 --- a/doc/examples/get__ValueType_const.cpp +++ b/doc/examples/get__ValueType_const.cpp @@ -1,6 +1,6 @@ #include #include -#include "json.hpp" +#include using json = nlohmann::json; diff --git a/doc/examples/get__ValueType_const.link b/doc/examples/get__ValueType_const.link index 7bf5e8a3b1..a3de6d6e4b 100644 --- a/doc/examples/get__ValueType_const.link +++ b/doc/examples/get__ValueType_const.link @@ -1 +1 @@ -online \ No newline at end of file +online \ No newline at end of file diff --git a/doc/examples/get_ptr.cpp b/doc/examples/get_ptr.cpp index 27deb14980..564ce0f4e1 100644 --- a/doc/examples/get_ptr.cpp +++ b/doc/examples/get_ptr.cpp @@ -1,5 +1,5 @@ #include -#include "json.hpp" +#include using json = nlohmann::json; diff --git a/doc/examples/get_ptr.link b/doc/examples/get_ptr.link index 6c4a0684ca..ab05e4a492 100644 --- a/doc/examples/get_ptr.link +++ b/doc/examples/get_ptr.link @@ -1 +1 @@ -online \ No newline at end of file +online \ No newline at end of file diff --git a/doc/examples/get_ref.cpp b/doc/examples/get_ref.cpp index 951fea3e46..ab25946bb3 100644 --- a/doc/examples/get_ref.cpp +++ b/doc/examples/get_ref.cpp @@ -1,5 +1,5 @@ #include -#include "json.hpp" +#include using json = nlohmann::json; diff --git a/doc/examples/get_ref.link b/doc/examples/get_ref.link index d5bb4cfd51..d458912b36 100644 --- a/doc/examples/get_ref.link +++ b/doc/examples/get_ref.link @@ -1 +1 @@ -online \ No newline at end of file +online \ No newline at end of file diff --git a/doc/examples/insert.cpp b/doc/examples/insert.cpp index 913ad09db5..4ee609876a 100644 --- a/doc/examples/insert.cpp +++ b/doc/examples/insert.cpp @@ -1,5 +1,5 @@ #include -#include "json.hpp" +#include using json = nlohmann::json; diff --git a/doc/examples/insert.link b/doc/examples/insert.link index 803d5c624b..564226f5dd 100644 --- a/doc/examples/insert.link +++ b/doc/examples/insert.link @@ -1 +1 @@ -online \ No newline at end of file +online \ No newline at end of file diff --git a/doc/examples/insert__count.cpp b/doc/examples/insert__count.cpp index 3c2ac24ae8..ce33b93e42 100644 --- a/doc/examples/insert__count.cpp +++ b/doc/examples/insert__count.cpp @@ -1,5 +1,5 @@ #include -#include "json.hpp" +#include using json = nlohmann::json; diff --git a/doc/examples/insert__count.link b/doc/examples/insert__count.link index a76cd8e29a..100cd360de 100644 --- a/doc/examples/insert__count.link +++ b/doc/examples/insert__count.link @@ -1 +1 @@ -online \ No newline at end of file +online \ No newline at end of file diff --git a/doc/examples/insert__ilist.cpp b/doc/examples/insert__ilist.cpp index 90965b37cd..a20766a140 100644 --- a/doc/examples/insert__ilist.cpp +++ b/doc/examples/insert__ilist.cpp @@ -1,5 +1,5 @@ #include -#include "json.hpp" +#include using json = nlohmann::json; diff --git a/doc/examples/insert__ilist.link b/doc/examples/insert__ilist.link index 387dce6968..36b181dcb9 100644 --- a/doc/examples/insert__ilist.link +++ b/doc/examples/insert__ilist.link @@ -1 +1 @@ -online \ No newline at end of file +online \ No newline at end of file diff --git a/doc/examples/insert__range.cpp b/doc/examples/insert__range.cpp index 5b0aa9ea65..92fe63b0d7 100644 --- a/doc/examples/insert__range.cpp +++ b/doc/examples/insert__range.cpp @@ -1,5 +1,5 @@ #include -#include "json.hpp" +#include using json = nlohmann::json; diff --git a/doc/examples/insert__range.link b/doc/examples/insert__range.link index cd8107c0bb..00e83ac221 100644 --- a/doc/examples/insert__range.link +++ b/doc/examples/insert__range.link @@ -1 +1 @@ -online \ No newline at end of file +online \ No newline at end of file diff --git a/doc/examples/insert__range_object.cpp b/doc/examples/insert__range_object.cpp index b811f8aa20..97373d3b4f 100644 --- a/doc/examples/insert__range_object.cpp +++ b/doc/examples/insert__range_object.cpp @@ -1,5 +1,5 @@ #include -#include "json.hpp" +#include using json = nlohmann::json; diff --git a/doc/examples/insert__range_object.link b/doc/examples/insert__range_object.link index 7c67093b28..70d43ee907 100644 --- a/doc/examples/insert__range_object.link +++ b/doc/examples/insert__range_object.link @@ -1 +1 @@ -online \ No newline at end of file +online \ No newline at end of file diff --git a/doc/examples/invalid_iterator.cpp b/doc/examples/invalid_iterator.cpp index 2d613597f7..5d3e622e64 100644 --- a/doc/examples/invalid_iterator.cpp +++ b/doc/examples/invalid_iterator.cpp @@ -1,5 +1,5 @@ #include -#include "json.hpp" +#include using json = nlohmann::json; diff --git a/doc/examples/invalid_iterator.link b/doc/examples/invalid_iterator.link index 0bb86950d8..729243d35c 100644 --- a/doc/examples/invalid_iterator.link +++ b/doc/examples/invalid_iterator.link @@ -1 +1 @@ -online \ No newline at end of file +online \ No newline at end of file diff --git a/doc/examples/is_array.cpp b/doc/examples/is_array.cpp index 1dbbf5d282..235dab7690 100644 --- a/doc/examples/is_array.cpp +++ b/doc/examples/is_array.cpp @@ -1,5 +1,5 @@ #include -#include "json.hpp" +#include using json = nlohmann::json; diff --git a/doc/examples/is_array.link b/doc/examples/is_array.link index 7820d33687..4232a9223f 100644 --- a/doc/examples/is_array.link +++ b/doc/examples/is_array.link @@ -1 +1 @@ -online \ No newline at end of file +online \ No newline at end of file diff --git a/doc/examples/is_boolean.cpp b/doc/examples/is_boolean.cpp index 485f97045e..ccc202d03b 100644 --- a/doc/examples/is_boolean.cpp +++ b/doc/examples/is_boolean.cpp @@ -1,5 +1,5 @@ #include -#include "json.hpp" +#include using json = nlohmann::json; diff --git a/doc/examples/is_boolean.link b/doc/examples/is_boolean.link index 9b56f6ed14..19f0b0081d 100644 --- a/doc/examples/is_boolean.link +++ b/doc/examples/is_boolean.link @@ -1 +1 @@ -online \ No newline at end of file +online \ No newline at end of file diff --git a/doc/examples/is_discarded.cpp b/doc/examples/is_discarded.cpp index 0b0435c36e..782e649982 100644 --- a/doc/examples/is_discarded.cpp +++ b/doc/examples/is_discarded.cpp @@ -1,5 +1,5 @@ #include -#include "json.hpp" +#include using json = nlohmann::json; diff --git a/doc/examples/is_discarded.link b/doc/examples/is_discarded.link index f20d9ce900..9ec778f791 100644 --- a/doc/examples/is_discarded.link +++ b/doc/examples/is_discarded.link @@ -1 +1 @@ -online \ No newline at end of file +online \ No newline at end of file diff --git a/doc/examples/is_null.cpp b/doc/examples/is_null.cpp index 3043e1847b..4a635092c4 100644 --- a/doc/examples/is_null.cpp +++ b/doc/examples/is_null.cpp @@ -1,5 +1,5 @@ #include -#include "json.hpp" +#include using json = nlohmann::json; diff --git a/doc/examples/is_null.link b/doc/examples/is_null.link index 05b270180d..dd1a5aab3d 100644 --- a/doc/examples/is_null.link +++ b/doc/examples/is_null.link @@ -1 +1 @@ -online \ No newline at end of file +online \ No newline at end of file diff --git a/doc/examples/is_number.cpp b/doc/examples/is_number.cpp index 08fa138d1f..eb23bd244a 100644 --- a/doc/examples/is_number.cpp +++ b/doc/examples/is_number.cpp @@ -1,5 +1,5 @@ #include -#include "json.hpp" +#include using json = nlohmann::json; diff --git a/doc/examples/is_number.link b/doc/examples/is_number.link index b1e9ad2a0a..43c52b47a3 100644 --- a/doc/examples/is_number.link +++ b/doc/examples/is_number.link @@ -1 +1 @@ -online \ No newline at end of file +online \ No newline at end of file diff --git a/doc/examples/is_number_float.cpp b/doc/examples/is_number_float.cpp index aeef78e852..3435a7e09e 100644 --- a/doc/examples/is_number_float.cpp +++ b/doc/examples/is_number_float.cpp @@ -1,5 +1,5 @@ #include -#include "json.hpp" +#include using json = nlohmann::json; diff --git a/doc/examples/is_number_float.link b/doc/examples/is_number_float.link index 17208079a6..4d8f0ea86c 100644 --- a/doc/examples/is_number_float.link +++ b/doc/examples/is_number_float.link @@ -1 +1 @@ -online \ No newline at end of file +online \ No newline at end of file diff --git a/doc/examples/is_number_integer.cpp b/doc/examples/is_number_integer.cpp index 90bd2146d9..6f6e42043a 100644 --- a/doc/examples/is_number_integer.cpp +++ b/doc/examples/is_number_integer.cpp @@ -1,5 +1,5 @@ #include -#include "json.hpp" +#include using json = nlohmann::json; diff --git a/doc/examples/is_number_integer.link b/doc/examples/is_number_integer.link index a35be75d1f..0233e0f727 100644 --- a/doc/examples/is_number_integer.link +++ b/doc/examples/is_number_integer.link @@ -1 +1 @@ -online \ No newline at end of file +online \ No newline at end of file diff --git a/doc/examples/is_number_unsigned.cpp b/doc/examples/is_number_unsigned.cpp index 499530c517..2ea2673e55 100644 --- a/doc/examples/is_number_unsigned.cpp +++ b/doc/examples/is_number_unsigned.cpp @@ -1,5 +1,5 @@ #include -#include "json.hpp" +#include using json = nlohmann::json; diff --git a/doc/examples/is_number_unsigned.link b/doc/examples/is_number_unsigned.link index 0a2ba0205d..8981763044 100644 --- a/doc/examples/is_number_unsigned.link +++ b/doc/examples/is_number_unsigned.link @@ -1 +1 @@ -online \ No newline at end of file +online \ No newline at end of file diff --git a/doc/examples/is_object.cpp b/doc/examples/is_object.cpp index a0c03a769b..42cedf8f0f 100644 --- a/doc/examples/is_object.cpp +++ b/doc/examples/is_object.cpp @@ -1,5 +1,5 @@ #include -#include "json.hpp" +#include using json = nlohmann::json; diff --git a/doc/examples/is_object.link b/doc/examples/is_object.link index 0cf3d4add2..5dd305bbb0 100644 --- a/doc/examples/is_object.link +++ b/doc/examples/is_object.link @@ -1 +1 @@ -online \ No newline at end of file +online \ No newline at end of file diff --git a/doc/examples/is_primitive.cpp b/doc/examples/is_primitive.cpp index ab329bdb47..d70c83e372 100644 --- a/doc/examples/is_primitive.cpp +++ b/doc/examples/is_primitive.cpp @@ -1,5 +1,5 @@ #include -#include "json.hpp" +#include using json = nlohmann::json; diff --git a/doc/examples/is_primitive.link b/doc/examples/is_primitive.link index 2a0e91b986..ae58b2d7c9 100644 --- a/doc/examples/is_primitive.link +++ b/doc/examples/is_primitive.link @@ -1 +1 @@ -online \ No newline at end of file +online \ No newline at end of file diff --git a/doc/examples/is_string.cpp b/doc/examples/is_string.cpp index 44cb483cec..2679cd1c5f 100644 --- a/doc/examples/is_string.cpp +++ b/doc/examples/is_string.cpp @@ -1,5 +1,5 @@ #include -#include "json.hpp" +#include using json = nlohmann::json; diff --git a/doc/examples/is_string.link b/doc/examples/is_string.link index f3672db33b..92b05e7580 100644 --- a/doc/examples/is_string.link +++ b/doc/examples/is_string.link @@ -1 +1 @@ -online \ No newline at end of file +online \ No newline at end of file diff --git a/doc/examples/is_structured.cpp b/doc/examples/is_structured.cpp index b7dfc858be..33e2bbd059 100644 --- a/doc/examples/is_structured.cpp +++ b/doc/examples/is_structured.cpp @@ -1,5 +1,5 @@ #include -#include "json.hpp" +#include using json = nlohmann::json; diff --git a/doc/examples/is_structured.link b/doc/examples/is_structured.link index 8ea3a75f30..44e06e9ffc 100644 --- a/doc/examples/is_structured.link +++ b/doc/examples/is_structured.link @@ -1 +1 @@ -online \ No newline at end of file +online \ No newline at end of file diff --git a/doc/examples/items.cpp b/doc/examples/items.cpp index b2224d603e..9cd2b51b17 100644 --- a/doc/examples/items.cpp +++ b/doc/examples/items.cpp @@ -1,5 +1,5 @@ #include -#include "json.hpp" +#include using json = nlohmann::json; diff --git a/doc/examples/items.link b/doc/examples/items.link index 0b74c5b390..001c704a9a 100644 --- a/doc/examples/items.link +++ b/doc/examples/items.link @@ -1 +1 @@ -online \ No newline at end of file +online \ No newline at end of file diff --git a/doc/examples/iterator_wrapper.cpp b/doc/examples/iterator_wrapper.cpp index 61687a92f3..7ef5bc57e8 100644 --- a/doc/examples/iterator_wrapper.cpp +++ b/doc/examples/iterator_wrapper.cpp @@ -1,5 +1,5 @@ #include -#include "json.hpp" +#include using json = nlohmann::json; diff --git a/doc/examples/iterator_wrapper.link b/doc/examples/iterator_wrapper.link index 0087d9a145..434031bb97 100644 --- a/doc/examples/iterator_wrapper.link +++ b/doc/examples/iterator_wrapper.link @@ -1 +1 @@ -online \ No newline at end of file +online \ No newline at end of file diff --git a/doc/examples/json_pointer.cpp b/doc/examples/json_pointer.cpp index 23e8e84f15..75b9717584 100644 --- a/doc/examples/json_pointer.cpp +++ b/doc/examples/json_pointer.cpp @@ -1,5 +1,5 @@ #include -#include "json.hpp" +#include using json = nlohmann::json; diff --git a/doc/examples/json_pointer.link b/doc/examples/json_pointer.link index 3ba4355f79..952bd74909 100644 --- a/doc/examples/json_pointer.link +++ b/doc/examples/json_pointer.link @@ -1 +1 @@ -online \ No newline at end of file +online \ No newline at end of file diff --git a/doc/examples/json_pointer__to_string.cpp b/doc/examples/json_pointer__to_string.cpp index 70b72778e9..da397cdf44 100644 --- a/doc/examples/json_pointer__to_string.cpp +++ b/doc/examples/json_pointer__to_string.cpp @@ -1,5 +1,5 @@ #include -#include "json.hpp" +#include using json = nlohmann::json; diff --git a/doc/examples/json_pointer__to_string.link b/doc/examples/json_pointer__to_string.link index b1148125dd..244c481541 100644 --- a/doc/examples/json_pointer__to_string.link +++ b/doc/examples/json_pointer__to_string.link @@ -1 +1 @@ -online \ No newline at end of file +online \ No newline at end of file diff --git a/doc/examples/max_size.cpp b/doc/examples/max_size.cpp index 8273f86f4c..c2ffc54680 100644 --- a/doc/examples/max_size.cpp +++ b/doc/examples/max_size.cpp @@ -1,5 +1,5 @@ #include -#include "json.hpp" +#include using json = nlohmann::json; diff --git a/doc/examples/max_size.link b/doc/examples/max_size.link index d49f5ea81d..1212833df1 100644 --- a/doc/examples/max_size.link +++ b/doc/examples/max_size.link @@ -1 +1 @@ -online \ No newline at end of file +online \ No newline at end of file diff --git a/doc/examples/merge_patch.cpp b/doc/examples/merge_patch.cpp index 77a5f2a253..b8804d7c5f 100644 --- a/doc/examples/merge_patch.cpp +++ b/doc/examples/merge_patch.cpp @@ -1,5 +1,5 @@ #include -#include "json.hpp" +#include #include // for std::setw using json = nlohmann::json; diff --git a/doc/examples/merge_patch.link b/doc/examples/merge_patch.link index 7a6cbbace9..41aa4effaf 100644 --- a/doc/examples/merge_patch.link +++ b/doc/examples/merge_patch.link @@ -1 +1 @@ -online \ No newline at end of file +online \ No newline at end of file diff --git a/doc/examples/meta.cpp b/doc/examples/meta.cpp index 9194beae5e..e800b9bed2 100644 --- a/doc/examples/meta.cpp +++ b/doc/examples/meta.cpp @@ -1,5 +1,5 @@ #include -#include "json.hpp" +#include using json = nlohmann::json; diff --git a/doc/examples/meta.link b/doc/examples/meta.link index f1d8c86957..4da2b02bc8 100644 --- a/doc/examples/meta.link +++ b/doc/examples/meta.link @@ -1 +1 @@ -online \ No newline at end of file +online \ No newline at end of file diff --git a/doc/examples/meta.output b/doc/examples/meta.output index 1b3e2aa1d6..04529057b7 100644 --- a/doc/examples/meta.output +++ b/doc/examples/meta.output @@ -10,8 +10,8 @@ "url": "https://github.com/nlohmann/json", "version": { "major": 3, - "minor": 0, - "patch": 1, - "string": "3.0.1" + "minor": 1, + "patch": 0, + "string": "3.1.0" } } diff --git a/doc/examples/object.cpp b/doc/examples/object.cpp index 6c11775831..733b89b530 100644 --- a/doc/examples/object.cpp +++ b/doc/examples/object.cpp @@ -1,5 +1,5 @@ #include -#include "json.hpp" +#include using json = nlohmann::json; diff --git a/doc/examples/object.link b/doc/examples/object.link index f863833499..fbed2f67d7 100644 --- a/doc/examples/object.link +++ b/doc/examples/object.link @@ -1 +1 @@ -online \ No newline at end of file +online \ No newline at end of file diff --git a/doc/examples/operator__ValueType.cpp b/doc/examples/operator__ValueType.cpp index 2def5271bc..66fcf310e5 100644 --- a/doc/examples/operator__ValueType.cpp +++ b/doc/examples/operator__ValueType.cpp @@ -1,6 +1,6 @@ #include #include -#include "json.hpp" +#include using json = nlohmann::json; diff --git a/doc/examples/operator__ValueType.link b/doc/examples/operator__ValueType.link index 0c32d63198..798b8fdffd 100644 --- a/doc/examples/operator__ValueType.link +++ b/doc/examples/operator__ValueType.link @@ -1 +1 @@ -online \ No newline at end of file +online \ No newline at end of file diff --git a/doc/examples/operator__equal.cpp b/doc/examples/operator__equal.cpp index d541a21294..1426f489aa 100644 --- a/doc/examples/operator__equal.cpp +++ b/doc/examples/operator__equal.cpp @@ -1,5 +1,5 @@ #include -#include "json.hpp" +#include using json = nlohmann::json; diff --git a/doc/examples/operator__equal.link b/doc/examples/operator__equal.link index ae7c25ae6d..6e1cc1cce6 100644 --- a/doc/examples/operator__equal.link +++ b/doc/examples/operator__equal.link @@ -1 +1 @@ -online \ No newline at end of file +online \ No newline at end of file diff --git a/doc/examples/operator__equal__nullptr_t.cpp b/doc/examples/operator__equal__nullptr_t.cpp index b5d0c6407f..dbb2103723 100644 --- a/doc/examples/operator__equal__nullptr_t.cpp +++ b/doc/examples/operator__equal__nullptr_t.cpp @@ -1,5 +1,5 @@ #include -#include "json.hpp" +#include using json = nlohmann::json; diff --git a/doc/examples/operator__equal__nullptr_t.link b/doc/examples/operator__equal__nullptr_t.link index 90cc174424..097da7769a 100644 --- a/doc/examples/operator__equal__nullptr_t.link +++ b/doc/examples/operator__equal__nullptr_t.link @@ -1 +1 @@ -online \ No newline at end of file +online \ No newline at end of file diff --git a/doc/examples/operator__greater.cpp b/doc/examples/operator__greater.cpp index a5c4f78a03..c632387cfb 100644 --- a/doc/examples/operator__greater.cpp +++ b/doc/examples/operator__greater.cpp @@ -1,5 +1,5 @@ #include -#include "json.hpp" +#include using json = nlohmann::json; diff --git a/doc/examples/operator__greater.link b/doc/examples/operator__greater.link index 7f08279105..3fc848ea35 100644 --- a/doc/examples/operator__greater.link +++ b/doc/examples/operator__greater.link @@ -1 +1 @@ -online \ No newline at end of file +online \ No newline at end of file diff --git a/doc/examples/operator__greaterequal.cpp b/doc/examples/operator__greaterequal.cpp index da014bde95..f8659ee07e 100644 --- a/doc/examples/operator__greaterequal.cpp +++ b/doc/examples/operator__greaterequal.cpp @@ -1,5 +1,5 @@ #include -#include "json.hpp" +#include using json = nlohmann::json; diff --git a/doc/examples/operator__greaterequal.link b/doc/examples/operator__greaterequal.link index 599f5d7b2a..62ce78a6a9 100644 --- a/doc/examples/operator__greaterequal.link +++ b/doc/examples/operator__greaterequal.link @@ -1 +1 @@ -online \ No newline at end of file +online \ No newline at end of file diff --git a/doc/examples/operator__less.cpp b/doc/examples/operator__less.cpp index 3865847fb5..64209a22a2 100644 --- a/doc/examples/operator__less.cpp +++ b/doc/examples/operator__less.cpp @@ -1,5 +1,5 @@ #include -#include "json.hpp" +#include using json = nlohmann::json; diff --git a/doc/examples/operator__less.link b/doc/examples/operator__less.link index 0689f995e0..52da7af1b4 100644 --- a/doc/examples/operator__less.link +++ b/doc/examples/operator__less.link @@ -1 +1 @@ -online \ No newline at end of file +online \ No newline at end of file diff --git a/doc/examples/operator__lessequal.cpp b/doc/examples/operator__lessequal.cpp index 8e9a21f16b..543b9543f1 100644 --- a/doc/examples/operator__lessequal.cpp +++ b/doc/examples/operator__lessequal.cpp @@ -1,5 +1,5 @@ #include -#include "json.hpp" +#include using json = nlohmann::json; diff --git a/doc/examples/operator__lessequal.link b/doc/examples/operator__lessequal.link index 576818511c..0c9ede3aba 100644 --- a/doc/examples/operator__lessequal.link +++ b/doc/examples/operator__lessequal.link @@ -1 +1 @@ -online \ No newline at end of file +online \ No newline at end of file diff --git a/doc/examples/operator__notequal.cpp b/doc/examples/operator__notequal.cpp index debcdf8a4e..43e89509ce 100644 --- a/doc/examples/operator__notequal.cpp +++ b/doc/examples/operator__notequal.cpp @@ -1,5 +1,5 @@ #include -#include "json.hpp" +#include using json = nlohmann::json; diff --git a/doc/examples/operator__notequal.link b/doc/examples/operator__notequal.link index c23e8263fe..656ffa8a0e 100644 --- a/doc/examples/operator__notequal.link +++ b/doc/examples/operator__notequal.link @@ -1 +1 @@ -online \ No newline at end of file +online \ No newline at end of file diff --git a/doc/examples/operator__notequal__nullptr_t.cpp b/doc/examples/operator__notequal__nullptr_t.cpp index 8d74e7136e..dc7e6ac4c3 100644 --- a/doc/examples/operator__notequal__nullptr_t.cpp +++ b/doc/examples/operator__notequal__nullptr_t.cpp @@ -1,5 +1,5 @@ #include -#include "json.hpp" +#include using json = nlohmann::json; diff --git a/doc/examples/operator__notequal__nullptr_t.link b/doc/examples/operator__notequal__nullptr_t.link index 49864d342e..f9a17003f3 100644 --- a/doc/examples/operator__notequal__nullptr_t.link +++ b/doc/examples/operator__notequal__nullptr_t.link @@ -1 +1 @@ -online \ No newline at end of file +online \ No newline at end of file diff --git a/doc/examples/operator__value_t.cpp b/doc/examples/operator__value_t.cpp index 087910a425..d9aac7978e 100644 --- a/doc/examples/operator__value_t.cpp +++ b/doc/examples/operator__value_t.cpp @@ -1,5 +1,5 @@ #include -#include "json.hpp" +#include using json = nlohmann::json; diff --git a/doc/examples/operator__value_t.link b/doc/examples/operator__value_t.link index 7c22cd4a08..d2c38a37ce 100644 --- a/doc/examples/operator__value_t.link +++ b/doc/examples/operator__value_t.link @@ -1 +1 @@ -online \ No newline at end of file +online \ No newline at end of file diff --git a/doc/examples/operator_deserialize.cpp b/doc/examples/operator_deserialize.cpp index 7a2cf23adc..bf21448012 100644 --- a/doc/examples/operator_deserialize.cpp +++ b/doc/examples/operator_deserialize.cpp @@ -1,5 +1,5 @@ #include -#include "json.hpp" +#include using json = nlohmann::json; diff --git a/doc/examples/operator_deserialize.link b/doc/examples/operator_deserialize.link index d60e530136..72d7350e37 100644 --- a/doc/examples/operator_deserialize.link +++ b/doc/examples/operator_deserialize.link @@ -1 +1 @@ -online \ No newline at end of file +online \ No newline at end of file diff --git a/doc/examples/operator_serialize.cpp b/doc/examples/operator_serialize.cpp index 7f55638359..0c46f014a1 100644 --- a/doc/examples/operator_serialize.cpp +++ b/doc/examples/operator_serialize.cpp @@ -1,5 +1,5 @@ #include -#include "json.hpp" +#include using json = nlohmann::json; diff --git a/doc/examples/operator_serialize.link b/doc/examples/operator_serialize.link index f078934f1f..57edc8cca0 100644 --- a/doc/examples/operator_serialize.link +++ b/doc/examples/operator_serialize.link @@ -1 +1 @@ -online \ No newline at end of file +online \ No newline at end of file diff --git a/doc/examples/operatorarray__key_type.cpp b/doc/examples/operatorarray__key_type.cpp index 43ff8ad809..8db08d0bc5 100644 --- a/doc/examples/operatorarray__key_type.cpp +++ b/doc/examples/operatorarray__key_type.cpp @@ -1,5 +1,5 @@ #include -#include "json.hpp" +#include using json = nlohmann::json; diff --git a/doc/examples/operatorarray__key_type.link b/doc/examples/operatorarray__key_type.link index 68a7a9c823..c1a534b19b 100644 --- a/doc/examples/operatorarray__key_type.link +++ b/doc/examples/operatorarray__key_type.link @@ -1 +1 @@ -online \ No newline at end of file +online \ No newline at end of file diff --git a/doc/examples/operatorarray__key_type_const.cpp b/doc/examples/operatorarray__key_type_const.cpp index 2320e439e5..1bdb340248 100644 --- a/doc/examples/operatorarray__key_type_const.cpp +++ b/doc/examples/operatorarray__key_type_const.cpp @@ -1,5 +1,5 @@ #include -#include "json.hpp" +#include using json = nlohmann::json; diff --git a/doc/examples/operatorarray__key_type_const.link b/doc/examples/operatorarray__key_type_const.link index 53a089249b..9467ca2c14 100644 --- a/doc/examples/operatorarray__key_type_const.link +++ b/doc/examples/operatorarray__key_type_const.link @@ -1 +1 @@ -online \ No newline at end of file +online \ No newline at end of file diff --git a/doc/examples/operatorarray__size_type.cpp b/doc/examples/operatorarray__size_type.cpp index bc8ecb96d5..d6f3e153c6 100644 --- a/doc/examples/operatorarray__size_type.cpp +++ b/doc/examples/operatorarray__size_type.cpp @@ -1,5 +1,5 @@ #include -#include "json.hpp" +#include using json = nlohmann::json; diff --git a/doc/examples/operatorarray__size_type.link b/doc/examples/operatorarray__size_type.link index 3e05678b9c..018f0bde94 100644 --- a/doc/examples/operatorarray__size_type.link +++ b/doc/examples/operatorarray__size_type.link @@ -1 +1 @@ -online \ No newline at end of file +online \ No newline at end of file diff --git a/doc/examples/operatorarray__size_type_const.cpp b/doc/examples/operatorarray__size_type_const.cpp index ec9fc30f3d..1bd88bc109 100644 --- a/doc/examples/operatorarray__size_type_const.cpp +++ b/doc/examples/operatorarray__size_type_const.cpp @@ -1,5 +1,5 @@ #include -#include "json.hpp" +#include using json = nlohmann::json; diff --git a/doc/examples/operatorarray__size_type_const.link b/doc/examples/operatorarray__size_type_const.link index 2eb1a380a3..8a9cd0b207 100644 --- a/doc/examples/operatorarray__size_type_const.link +++ b/doc/examples/operatorarray__size_type_const.link @@ -1 +1 @@ -online \ No newline at end of file +online \ No newline at end of file diff --git a/doc/examples/operatorjson_pointer.cpp b/doc/examples/operatorjson_pointer.cpp index d403667328..7a0353a1c9 100644 --- a/doc/examples/operatorjson_pointer.cpp +++ b/doc/examples/operatorjson_pointer.cpp @@ -1,5 +1,5 @@ #include -#include "json.hpp" +#include using json = nlohmann::json; diff --git a/doc/examples/operatorjson_pointer.link b/doc/examples/operatorjson_pointer.link index 92bf9d7725..92468d781d 100644 --- a/doc/examples/operatorjson_pointer.link +++ b/doc/examples/operatorjson_pointer.link @@ -1 +1 @@ -online \ No newline at end of file +online \ No newline at end of file diff --git a/doc/examples/operatorjson_pointer_const.cpp b/doc/examples/operatorjson_pointer_const.cpp index 52b2a9e899..a5a437b445 100644 --- a/doc/examples/operatorjson_pointer_const.cpp +++ b/doc/examples/operatorjson_pointer_const.cpp @@ -1,5 +1,5 @@ #include -#include "json.hpp" +#include using json = nlohmann::json; diff --git a/doc/examples/operatorjson_pointer_const.link b/doc/examples/operatorjson_pointer_const.link index 22a7c5cb67..836e755db6 100644 --- a/doc/examples/operatorjson_pointer_const.link +++ b/doc/examples/operatorjson_pointer_const.link @@ -1 +1 @@ -online \ No newline at end of file +online \ No newline at end of file diff --git a/doc/examples/other_error.cpp b/doc/examples/other_error.cpp index 16b9657acc..2e7ccfbb8d 100644 --- a/doc/examples/other_error.cpp +++ b/doc/examples/other_error.cpp @@ -1,5 +1,5 @@ #include -#include "json.hpp" +#include using json = nlohmann::json; diff --git a/doc/examples/other_error.link b/doc/examples/other_error.link index a8dd89bc97..bdb11752bc 100644 --- a/doc/examples/other_error.link +++ b/doc/examples/other_error.link @@ -1 +1 @@ -online \ No newline at end of file +online \ No newline at end of file diff --git a/doc/examples/out_of_range.cpp b/doc/examples/out_of_range.cpp index adec741e6c..e7116408a9 100644 --- a/doc/examples/out_of_range.cpp +++ b/doc/examples/out_of_range.cpp @@ -1,5 +1,5 @@ #include -#include "json.hpp" +#include using json = nlohmann::json; diff --git a/doc/examples/out_of_range.link b/doc/examples/out_of_range.link index 3daa44ef2a..790eec6249 100644 --- a/doc/examples/out_of_range.link +++ b/doc/examples/out_of_range.link @@ -1 +1 @@ -online \ No newline at end of file +online \ No newline at end of file diff --git a/doc/examples/parse__array__parser_callback_t.cpp b/doc/examples/parse__array__parser_callback_t.cpp index 0857f9ae9d..6083a959b2 100644 --- a/doc/examples/parse__array__parser_callback_t.cpp +++ b/doc/examples/parse__array__parser_callback_t.cpp @@ -1,5 +1,5 @@ #include -#include "json.hpp" +#include using json = nlohmann::json; diff --git a/doc/examples/parse__array__parser_callback_t.link b/doc/examples/parse__array__parser_callback_t.link index 2c4a768759..017f9ff5bc 100644 --- a/doc/examples/parse__array__parser_callback_t.link +++ b/doc/examples/parse__array__parser_callback_t.link @@ -1 +1 @@ -online \ No newline at end of file +online \ No newline at end of file diff --git a/doc/examples/parse__contiguouscontainer__parser_callback_t.cpp b/doc/examples/parse__contiguouscontainer__parser_callback_t.cpp index 29b5481111..fe51560cf2 100644 --- a/doc/examples/parse__contiguouscontainer__parser_callback_t.cpp +++ b/doc/examples/parse__contiguouscontainer__parser_callback_t.cpp @@ -1,5 +1,5 @@ #include -#include "json.hpp" +#include using json = nlohmann::json; diff --git a/doc/examples/parse__contiguouscontainer__parser_callback_t.link b/doc/examples/parse__contiguouscontainer__parser_callback_t.link index 2e7f62e160..2cc96595d2 100644 --- a/doc/examples/parse__contiguouscontainer__parser_callback_t.link +++ b/doc/examples/parse__contiguouscontainer__parser_callback_t.link @@ -1 +1 @@ -online \ No newline at end of file +online \ No newline at end of file diff --git a/doc/examples/parse__istream__parser_callback_t.cpp b/doc/examples/parse__istream__parser_callback_t.cpp index a20e81f58b..92e62d9bf2 100644 --- a/doc/examples/parse__istream__parser_callback_t.cpp +++ b/doc/examples/parse__istream__parser_callback_t.cpp @@ -1,5 +1,5 @@ #include -#include "json.hpp" +#include using json = nlohmann::json; diff --git a/doc/examples/parse__istream__parser_callback_t.link b/doc/examples/parse__istream__parser_callback_t.link index 7afa48bcf2..64b703a616 100644 --- a/doc/examples/parse__istream__parser_callback_t.link +++ b/doc/examples/parse__istream__parser_callback_t.link @@ -1 +1 @@ -online \ No newline at end of file +online \ No newline at end of file diff --git a/doc/examples/parse__iteratortype__parser_callback_t.cpp b/doc/examples/parse__iteratortype__parser_callback_t.cpp index 6044021ca2..b513fe779a 100644 --- a/doc/examples/parse__iteratortype__parser_callback_t.cpp +++ b/doc/examples/parse__iteratortype__parser_callback_t.cpp @@ -1,5 +1,5 @@ #include -#include "json.hpp" +#include using json = nlohmann::json; diff --git a/doc/examples/parse__iteratortype__parser_callback_t.link b/doc/examples/parse__iteratortype__parser_callback_t.link index 093a2d1811..9adda14f3c 100644 --- a/doc/examples/parse__iteratortype__parser_callback_t.link +++ b/doc/examples/parse__iteratortype__parser_callback_t.link @@ -1 +1 @@ -online \ No newline at end of file +online \ No newline at end of file diff --git a/doc/examples/parse__string__parser_callback_t.cpp b/doc/examples/parse__string__parser_callback_t.cpp index 37ea6df766..4db82d90a2 100644 --- a/doc/examples/parse__string__parser_callback_t.cpp +++ b/doc/examples/parse__string__parser_callback_t.cpp @@ -1,5 +1,5 @@ #include -#include "json.hpp" +#include using json = nlohmann::json; diff --git a/doc/examples/parse__string__parser_callback_t.link b/doc/examples/parse__string__parser_callback_t.link index 94643bb779..8eab4cd680 100644 --- a/doc/examples/parse__string__parser_callback_t.link +++ b/doc/examples/parse__string__parser_callback_t.link @@ -1 +1 @@ -online \ No newline at end of file +online \ No newline at end of file diff --git a/doc/examples/parse_error.cpp b/doc/examples/parse_error.cpp index 6802e7da71..9b27b58fab 100644 --- a/doc/examples/parse_error.cpp +++ b/doc/examples/parse_error.cpp @@ -1,5 +1,5 @@ #include -#include "json.hpp" +#include using json = nlohmann::json; diff --git a/doc/examples/parse_error.link b/doc/examples/parse_error.link index 89a31ea5cc..7e3e8644a8 100644 --- a/doc/examples/parse_error.link +++ b/doc/examples/parse_error.link @@ -1 +1 @@ -online \ No newline at end of file +online \ No newline at end of file diff --git a/doc/examples/patch.cpp b/doc/examples/patch.cpp index fd0e6bf541..a3c64a611a 100644 --- a/doc/examples/patch.cpp +++ b/doc/examples/patch.cpp @@ -1,5 +1,5 @@ #include -#include "json.hpp" +#include using json = nlohmann::json; diff --git a/doc/examples/patch.link b/doc/examples/patch.link index 7038cda61d..19970624c1 100644 --- a/doc/examples/patch.link +++ b/doc/examples/patch.link @@ -1 +1 @@ -online \ No newline at end of file +online \ No newline at end of file diff --git a/doc/examples/push_back.cpp b/doc/examples/push_back.cpp index 7b0ec488c8..bbddf4f51b 100644 --- a/doc/examples/push_back.cpp +++ b/doc/examples/push_back.cpp @@ -1,5 +1,5 @@ #include -#include "json.hpp" +#include using json = nlohmann::json; diff --git a/doc/examples/push_back.link b/doc/examples/push_back.link index dc2b525e2a..4ee15bf1c8 100644 --- a/doc/examples/push_back.link +++ b/doc/examples/push_back.link @@ -1 +1 @@ -online \ No newline at end of file +online \ No newline at end of file diff --git a/doc/examples/push_back__initializer_list.cpp b/doc/examples/push_back__initializer_list.cpp index d231e710c4..e96645f160 100644 --- a/doc/examples/push_back__initializer_list.cpp +++ b/doc/examples/push_back__initializer_list.cpp @@ -1,5 +1,5 @@ #include -#include "json.hpp" +#include using json = nlohmann::json; diff --git a/doc/examples/push_back__initializer_list.link b/doc/examples/push_back__initializer_list.link index f6796c25aa..f18e96f441 100644 --- a/doc/examples/push_back__initializer_list.link +++ b/doc/examples/push_back__initializer_list.link @@ -1 +1 @@ -online \ No newline at end of file +online \ No newline at end of file diff --git a/doc/examples/push_back__object_t__value.cpp b/doc/examples/push_back__object_t__value.cpp index 27215fb8f1..5d694e9388 100644 --- a/doc/examples/push_back__object_t__value.cpp +++ b/doc/examples/push_back__object_t__value.cpp @@ -1,5 +1,5 @@ #include -#include "json.hpp" +#include using json = nlohmann::json; diff --git a/doc/examples/push_back__object_t__value.link b/doc/examples/push_back__object_t__value.link index 375315e469..396fdf25a1 100644 --- a/doc/examples/push_back__object_t__value.link +++ b/doc/examples/push_back__object_t__value.link @@ -1 +1 @@ -online \ No newline at end of file +online \ No newline at end of file diff --git a/doc/examples/rbegin.cpp b/doc/examples/rbegin.cpp index 2e9824b4b2..239f7a6899 100644 --- a/doc/examples/rbegin.cpp +++ b/doc/examples/rbegin.cpp @@ -1,5 +1,5 @@ #include -#include "json.hpp" +#include using json = nlohmann::json; diff --git a/doc/examples/rbegin.link b/doc/examples/rbegin.link index 3417421862..8c8c924168 100644 --- a/doc/examples/rbegin.link +++ b/doc/examples/rbegin.link @@ -1 +1 @@ -online \ No newline at end of file +online \ No newline at end of file diff --git a/doc/examples/rend.cpp b/doc/examples/rend.cpp index 0c81da12aa..adadbbdc25 100644 --- a/doc/examples/rend.cpp +++ b/doc/examples/rend.cpp @@ -1,5 +1,5 @@ #include -#include "json.hpp" +#include using json = nlohmann::json; diff --git a/doc/examples/rend.link b/doc/examples/rend.link index 7c9360bdb3..596faf602e 100644 --- a/doc/examples/rend.link +++ b/doc/examples/rend.link @@ -1 +1 @@ -online \ No newline at end of file +online \ No newline at end of file diff --git a/doc/examples/size.cpp b/doc/examples/size.cpp index 07d1b6cdba..2375483775 100644 --- a/doc/examples/size.cpp +++ b/doc/examples/size.cpp @@ -1,5 +1,5 @@ #include -#include "json.hpp" +#include using json = nlohmann::json; diff --git a/doc/examples/size.link b/doc/examples/size.link index 9042e08e03..7b2f25014a 100644 --- a/doc/examples/size.link +++ b/doc/examples/size.link @@ -1 +1 @@ -online \ No newline at end of file +online \ No newline at end of file diff --git a/doc/examples/swap__array_t.cpp b/doc/examples/swap__array_t.cpp index c83556eea7..2119dd5523 100644 --- a/doc/examples/swap__array_t.cpp +++ b/doc/examples/swap__array_t.cpp @@ -1,5 +1,5 @@ #include -#include "json.hpp" +#include using json = nlohmann::json; diff --git a/doc/examples/swap__array_t.link b/doc/examples/swap__array_t.link index 7562e78434..53670b8e6a 100644 --- a/doc/examples/swap__array_t.link +++ b/doc/examples/swap__array_t.link @@ -1 +1 @@ -online \ No newline at end of file +online \ No newline at end of file diff --git a/doc/examples/swap__object_t.cpp b/doc/examples/swap__object_t.cpp index d67801c4a1..301b558d3e 100644 --- a/doc/examples/swap__object_t.cpp +++ b/doc/examples/swap__object_t.cpp @@ -1,5 +1,5 @@ #include -#include "json.hpp" +#include using json = nlohmann::json; diff --git a/doc/examples/swap__object_t.link b/doc/examples/swap__object_t.link index cc6a18bb56..256be861ea 100644 --- a/doc/examples/swap__object_t.link +++ b/doc/examples/swap__object_t.link @@ -1 +1 @@ -online \ No newline at end of file +online \ No newline at end of file diff --git a/doc/examples/swap__reference.cpp b/doc/examples/swap__reference.cpp index 5223950cd9..34182ad24d 100644 --- a/doc/examples/swap__reference.cpp +++ b/doc/examples/swap__reference.cpp @@ -1,5 +1,5 @@ #include -#include "json.hpp" +#include using json = nlohmann::json; diff --git a/doc/examples/swap__reference.link b/doc/examples/swap__reference.link index 8c906769aa..49207f61a4 100644 --- a/doc/examples/swap__reference.link +++ b/doc/examples/swap__reference.link @@ -1 +1 @@ -online \ No newline at end of file +online \ No newline at end of file diff --git a/doc/examples/swap__reference.output b/doc/examples/swap__reference.output index f5495bd559..96b07b0944 100644 --- a/doc/examples/swap__reference.output +++ b/doc/examples/swap__reference.output @@ -1,2 +1,2 @@ -j1 = {"e":2.71828182845905,"pi":3.14159265358979} +j1 = {"e":2.718281828459045,"pi":3.141592653589793} j2 = [1,2,3,4,5] diff --git a/doc/examples/swap__string_t.cpp b/doc/examples/swap__string_t.cpp index aeea028bd0..b5d58316fd 100644 --- a/doc/examples/swap__string_t.cpp +++ b/doc/examples/swap__string_t.cpp @@ -1,5 +1,5 @@ #include -#include "json.hpp" +#include using json = nlohmann::json; diff --git a/doc/examples/swap__string_t.link b/doc/examples/swap__string_t.link index 29c2f9d001..b9fd75bd81 100644 --- a/doc/examples/swap__string_t.link +++ b/doc/examples/swap__string_t.link @@ -1 +1 @@ -online \ No newline at end of file +online \ No newline at end of file diff --git a/doc/examples/to_cbor.cpp b/doc/examples/to_cbor.cpp index 335a320a6d..b4849c1a5a 100644 --- a/doc/examples/to_cbor.cpp +++ b/doc/examples/to_cbor.cpp @@ -1,5 +1,5 @@ #include -#include "json.hpp" +#include using json = nlohmann::json; diff --git a/doc/examples/to_cbor.link b/doc/examples/to_cbor.link index 9c9f7a83d8..31f4809fea 100644 --- a/doc/examples/to_cbor.link +++ b/doc/examples/to_cbor.link @@ -1 +1 @@ -online \ No newline at end of file +online \ No newline at end of file diff --git a/doc/examples/to_msgpack.cpp b/doc/examples/to_msgpack.cpp index d0fd981630..8b18a12344 100644 --- a/doc/examples/to_msgpack.cpp +++ b/doc/examples/to_msgpack.cpp @@ -1,5 +1,5 @@ #include -#include "json.hpp" +#include using json = nlohmann::json; diff --git a/doc/examples/to_msgpack.link b/doc/examples/to_msgpack.link index ad0c6ce31a..dfc0d333d0 100644 --- a/doc/examples/to_msgpack.link +++ b/doc/examples/to_msgpack.link @@ -1 +1 @@ -online \ No newline at end of file +online \ No newline at end of file diff --git a/doc/examples/to_ubjson.cpp b/doc/examples/to_ubjson.cpp index a39bc0816b..8a25e6188f 100644 --- a/doc/examples/to_ubjson.cpp +++ b/doc/examples/to_ubjson.cpp @@ -1,5 +1,5 @@ #include -#include "json.hpp" +#include using json = nlohmann::json; diff --git a/doc/examples/to_ubjson.link b/doc/examples/to_ubjson.link index 919b8b9aac..add6fe49d6 100644 --- a/doc/examples/to_ubjson.link +++ b/doc/examples/to_ubjson.link @@ -1 +1 @@ -online \ No newline at end of file +online \ No newline at end of file diff --git a/doc/examples/type.cpp b/doc/examples/type.cpp index 5979d02590..68fba3a917 100644 --- a/doc/examples/type.cpp +++ b/doc/examples/type.cpp @@ -1,5 +1,5 @@ #include -#include "json.hpp" +#include using json = nlohmann::json; diff --git a/doc/examples/type.link b/doc/examples/type.link index a81ee12249..e027bd2c8f 100644 --- a/doc/examples/type.link +++ b/doc/examples/type.link @@ -1 +1 @@ -online \ No newline at end of file +online \ No newline at end of file diff --git a/doc/examples/type_error.cpp b/doc/examples/type_error.cpp index 6df39f512e..d4f18b1800 100644 --- a/doc/examples/type_error.cpp +++ b/doc/examples/type_error.cpp @@ -1,5 +1,5 @@ #include -#include "json.hpp" +#include using json = nlohmann::json; diff --git a/doc/examples/type_error.link b/doc/examples/type_error.link index fc160d0701..6907fd7ab3 100644 --- a/doc/examples/type_error.link +++ b/doc/examples/type_error.link @@ -1 +1 @@ -online \ No newline at end of file +online \ No newline at end of file diff --git a/doc/examples/type_name.cpp b/doc/examples/type_name.cpp index dccbd7b725..32d3590cc9 100644 --- a/doc/examples/type_name.cpp +++ b/doc/examples/type_name.cpp @@ -1,5 +1,5 @@ #include -#include "json.hpp" +#include using json = nlohmann::json; diff --git a/doc/examples/type_name.link b/doc/examples/type_name.link index dad7eebfe7..454da51938 100644 --- a/doc/examples/type_name.link +++ b/doc/examples/type_name.link @@ -1 +1 @@ -online \ No newline at end of file +online \ No newline at end of file diff --git a/doc/examples/unflatten.cpp b/doc/examples/unflatten.cpp index cc672b5f7c..5e3d65e044 100644 --- a/doc/examples/unflatten.cpp +++ b/doc/examples/unflatten.cpp @@ -1,5 +1,5 @@ #include -#include "json.hpp" +#include using json = nlohmann::json; diff --git a/doc/examples/unflatten.link b/doc/examples/unflatten.link index 20582c9d16..d13f17179c 100644 --- a/doc/examples/unflatten.link +++ b/doc/examples/unflatten.link @@ -1 +1 @@ -online \ No newline at end of file +online \ No newline at end of file diff --git a/doc/examples/update.cpp b/doc/examples/update.cpp index 4383df7fa7..b77c0fef57 100644 --- a/doc/examples/update.cpp +++ b/doc/examples/update.cpp @@ -1,5 +1,5 @@ #include -#include "json.hpp" +#include using json = nlohmann::json; diff --git a/doc/examples/update.link b/doc/examples/update.link index 46af9cbce0..5ad367d070 100644 --- a/doc/examples/update.link +++ b/doc/examples/update.link @@ -1 +1 @@ -online \ No newline at end of file +online \ No newline at end of file diff --git a/doc/examples/update__range.cpp b/doc/examples/update__range.cpp index 7c56aad3a7..88780fd414 100644 --- a/doc/examples/update__range.cpp +++ b/doc/examples/update__range.cpp @@ -1,5 +1,5 @@ #include -#include "json.hpp" +#include using json = nlohmann::json; diff --git a/doc/examples/update__range.link b/doc/examples/update__range.link index 1e90f66c4c..d2d85a82df 100644 --- a/doc/examples/update__range.link +++ b/doc/examples/update__range.link @@ -1 +1 @@ -online \ No newline at end of file +online \ No newline at end of file diff --git a/doc/index.md b/doc/index.md index 66ad588cd5..a3024a93b1 100644 --- a/doc/index.md +++ b/doc/index.md @@ -299,9 +299,9 @@ Note that this table only lists those exceptions thrown due to the type. For ins -@copyright Copyright © 2013-2017 Niels Lohmann. The code is licensed under the [MIT License](http://opensource.org/licenses/MIT). +@copyright Copyright © 2013-2018 Niels Lohmann. The code is licensed under the [MIT License](http://opensource.org/licenses/MIT). @author [Niels Lohmann](http://nlohmann.me) @see https://github.com/nlohmann/json to download the source code -@version 3.0.1 +@version 3.1.0 diff --git a/doc/json.gif b/doc/json.gif index 2b5b588300..608df6aa63 100644 Binary files a/doc/json.gif and b/doc/json.gif differ diff --git a/include/nlohmann/json.hpp b/include/nlohmann/json.hpp index 0ab7d007c0..8f04f510dd 100644 --- a/include/nlohmann/json.hpp +++ b/include/nlohmann/json.hpp @@ -1,11 +1,11 @@ /* __ _____ _____ _____ __| | __| | | | JSON for Modern C++ -| | |__ | | | | | | version 3.0.1 +| | |__ | | | | | | version 3.1.0 |_____|_____|_____|_|___| https://github.com/nlohmann/json Licensed under the MIT License . -Copyright (c) 2013-2017 Niels Lohmann . +Copyright (c) 2013-2018 Niels Lohmann . Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -30,8 +30,8 @@ SOFTWARE. #define NLOHMANN_JSON_HPP #define NLOHMANN_JSON_VERSION_MAJOR 3 -#define NLOHMANN_JSON_VERSION_MINOR 0 -#define NLOHMANN_JSON_VERSION_PATCH 1 +#define NLOHMANN_JSON_VERSION_MINOR 1 +#define NLOHMANN_JSON_VERSION_PATCH 0 #include // all_of, find, for_each #include // assert @@ -937,7 +937,7 @@ class basic_json object = nullptr; // silence warning, see #821 if (JSON_UNLIKELY(t == value_t::null)) { - JSON_THROW(other_error::create(500, "961c151d2e87f2686a955a9be24d316f1362bf21 3.0.1")); // LCOV_EXCL_LINE + JSON_THROW(other_error::create(500, "961c151d2e87f2686a955a9be24d316f1362bf21 3.1.0")); // LCOV_EXCL_LINE } break; } diff --git a/meson.build b/meson.build index 2cfc962855..cdbaad90ee 100644 --- a/meson.build +++ b/meson.build @@ -1,6 +1,6 @@ project('nlohmann_json', 'cpp') -nlohmann_json_inc = include_directories('src') +nlohmann_json_inc = include_directories('single_include/nlohmann') nlohmann_json_dep = declare_dependency( include_directories : nlohmann_json_inc diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp index 6c19d1e4bb..9b38efb4a0 100644 --- a/single_include/nlohmann/json.hpp +++ b/single_include/nlohmann/json.hpp @@ -1,11 +1,11 @@ /* __ _____ _____ _____ __| | __| | | | JSON for Modern C++ -| | |__ | | | | | | version 3.0.1 +| | |__ | | | | | | version 3.1.0 |_____|_____|_____|_|___| https://github.com/nlohmann/json Licensed under the MIT License . -Copyright (c) 2013-2017 Niels Lohmann . +Copyright (c) 2013-2018 Niels Lohmann . Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -30,8 +30,8 @@ SOFTWARE. #define NLOHMANN_JSON_HPP #define NLOHMANN_JSON_VERSION_MAJOR 3 -#define NLOHMANN_JSON_VERSION_MINOR 0 -#define NLOHMANN_JSON_VERSION_PATCH 1 +#define NLOHMANN_JSON_VERSION_MINOR 1 +#define NLOHMANN_JSON_VERSION_PATCH 0 #include // all_of, find, for_each #include // assert @@ -10515,7 +10515,7 @@ class basic_json object = nullptr; // silence warning, see #821 if (JSON_UNLIKELY(t == value_t::null)) { - JSON_THROW(other_error::create(500, "961c151d2e87f2686a955a9be24d316f1362bf21 3.0.1")); // LCOV_EXCL_LINE + JSON_THROW(other_error::create(500, "961c151d2e87f2686a955a9be24d316f1362bf21 3.1.0")); // LCOV_EXCL_LINE } break; } diff --git a/test/src/fuzzer-driver_afl.cpp b/test/src/fuzzer-driver_afl.cpp index 69fcec7c05..6a9c28819c 100644 --- a/test/src/fuzzer-driver_afl.cpp +++ b/test/src/fuzzer-driver_afl.cpp @@ -1,7 +1,7 @@ /* __ _____ _____ _____ __| | __| | | | JSON for Modern C++ (fuzz test support) -| | |__ | | | | | | version 3.0.1 +| | |__ | | | | | | version 3.1.0 |_____|_____|_____|_|___| https://github.com/nlohmann/json This file implements a driver for American Fuzzy Lop (afl-fuzz). It relies on diff --git a/test/src/fuzzer-parse_cbor.cpp b/test/src/fuzzer-parse_cbor.cpp index 72978e54fd..2b00edf013 100644 --- a/test/src/fuzzer-parse_cbor.cpp +++ b/test/src/fuzzer-parse_cbor.cpp @@ -1,7 +1,7 @@ /* __ _____ _____ _____ __| | __| | | | JSON for Modern C++ (fuzz test support) -| | |__ | | | | | | version 3.0.1 +| | |__ | | | | | | version 3.1.0 |_____|_____|_____|_|___| https://github.com/nlohmann/json This file implements a parser test suitable for fuzz testing. Given a byte diff --git a/test/src/fuzzer-parse_json.cpp b/test/src/fuzzer-parse_json.cpp index 86a8f7fbe5..5b4e0b08d2 100644 --- a/test/src/fuzzer-parse_json.cpp +++ b/test/src/fuzzer-parse_json.cpp @@ -1,7 +1,7 @@ /* __ _____ _____ _____ __| | __| | | | JSON for Modern C++ (fuzz test support) -| | |__ | | | | | | version 3.0.1 +| | |__ | | | | | | version 3.1.0 |_____|_____|_____|_|___| https://github.com/nlohmann/json This file implements a parser test suitable for fuzz testing. Given a byte diff --git a/test/src/fuzzer-parse_msgpack.cpp b/test/src/fuzzer-parse_msgpack.cpp index 03da575924..021945c156 100644 --- a/test/src/fuzzer-parse_msgpack.cpp +++ b/test/src/fuzzer-parse_msgpack.cpp @@ -1,7 +1,7 @@ /* __ _____ _____ _____ __| | __| | | | JSON for Modern C++ (fuzz test support) -| | |__ | | | | | | version 3.0.1 +| | |__ | | | | | | version 3.1.0 |_____|_____|_____|_|___| https://github.com/nlohmann/json This file implements a parser test suitable for fuzz testing. Given a byte diff --git a/test/src/fuzzer-parse_ubjson.cpp b/test/src/fuzzer-parse_ubjson.cpp index 1980f684a1..1ad07677fb 100644 --- a/test/src/fuzzer-parse_ubjson.cpp +++ b/test/src/fuzzer-parse_ubjson.cpp @@ -1,7 +1,7 @@ /* __ _____ _____ _____ __| | __| | | | JSON for Modern C++ (fuzz test support) -| | |__ | | | | | | version 3.0.1 +| | |__ | | | | | | version 3.1.0 |_____|_____|_____|_|___| https://github.com/nlohmann/json This file implements a parser test suitable for fuzz testing. Given a byte diff --git a/test/src/unit-algorithms.cpp b/test/src/unit-algorithms.cpp index 001f566e46..a05eb953ea 100644 --- a/test/src/unit-algorithms.cpp +++ b/test/src/unit-algorithms.cpp @@ -1,11 +1,11 @@ /* __ _____ _____ _____ __| | __| | | | JSON for Modern C++ (test suite) -| | |__ | | | | | | version 3.0.1 +| | |__ | | | | | | version 3.1.0 |_____|_____|_____|_|___| https://github.com/nlohmann/json Licensed under the MIT License . -Copyright (c) 2013-2017 Niels Lohmann . +Copyright (c) 2013-2018 Niels Lohmann . Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/test/src/unit-allocator.cpp b/test/src/unit-allocator.cpp index 9fdb41cb63..75efaadc3b 100644 --- a/test/src/unit-allocator.cpp +++ b/test/src/unit-allocator.cpp @@ -1,11 +1,11 @@ /* __ _____ _____ _____ __| | __| | | | JSON for Modern C++ (test suite) -| | |__ | | | | | | version 3.0.1 +| | |__ | | | | | | version 3.1.0 |_____|_____|_____|_|___| https://github.com/nlohmann/json Licensed under the MIT License . -Copyright (c) 2013-2017 Niels Lohmann . +Copyright (c) 2013-2018 Niels Lohmann . Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/test/src/unit-capacity.cpp b/test/src/unit-capacity.cpp index 1c0d573a12..e1abe70a10 100644 --- a/test/src/unit-capacity.cpp +++ b/test/src/unit-capacity.cpp @@ -1,11 +1,11 @@ /* __ _____ _____ _____ __| | __| | | | JSON for Modern C++ (test suite) -| | |__ | | | | | | version 3.0.1 +| | |__ | | | | | | version 3.1.0 |_____|_____|_____|_|___| https://github.com/nlohmann/json Licensed under the MIT License . -Copyright (c) 2013-2017 Niels Lohmann . +Copyright (c) 2013-2018 Niels Lohmann . Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/test/src/unit-cbor.cpp b/test/src/unit-cbor.cpp index 41b2e15cc5..62accfcf6f 100644 --- a/test/src/unit-cbor.cpp +++ b/test/src/unit-cbor.cpp @@ -1,11 +1,11 @@ /* __ _____ _____ _____ __| | __| | | | JSON for Modern C++ (test suite) -| | |__ | | | | | | version 3.0.1 +| | |__ | | | | | | version 3.1.0 |_____|_____|_____|_|___| https://github.com/nlohmann/json Licensed under the MIT License . -Copyright (c) 2013-2017 Niels Lohmann . +Copyright (c) 2013-2018 Niels Lohmann . Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/test/src/unit-class_const_iterator.cpp b/test/src/unit-class_const_iterator.cpp index cf6777e95c..e5c239014c 100644 --- a/test/src/unit-class_const_iterator.cpp +++ b/test/src/unit-class_const_iterator.cpp @@ -1,11 +1,11 @@ /* __ _____ _____ _____ __| | __| | | | JSON for Modern C++ (test suite) -| | |__ | | | | | | version 3.0.1 +| | |__ | | | | | | version 3.1.0 |_____|_____|_____|_|___| https://github.com/nlohmann/json Licensed under the MIT License . -Copyright (c) 2013-2017 Niels Lohmann . +Copyright (c) 2013-2018 Niels Lohmann . Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/test/src/unit-class_iterator.cpp b/test/src/unit-class_iterator.cpp index 168988d607..2604729751 100644 --- a/test/src/unit-class_iterator.cpp +++ b/test/src/unit-class_iterator.cpp @@ -1,11 +1,11 @@ /* __ _____ _____ _____ __| | __| | | | JSON for Modern C++ (test suite) -| | |__ | | | | | | version 3.0.1 +| | |__ | | | | | | version 3.1.0 |_____|_____|_____|_|___| https://github.com/nlohmann/json Licensed under the MIT License . -Copyright (c) 2013-2017 Niels Lohmann . +Copyright (c) 2013-2018 Niels Lohmann . Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/test/src/unit-class_lexer.cpp b/test/src/unit-class_lexer.cpp index 4ae7e77cdd..7850fe03ce 100644 --- a/test/src/unit-class_lexer.cpp +++ b/test/src/unit-class_lexer.cpp @@ -1,11 +1,11 @@ /* __ _____ _____ _____ __| | __| | | | JSON for Modern C++ (test suite) -| | |__ | | | | | | version 3.0.1 +| | |__ | | | | | | version 3.1.0 |_____|_____|_____|_|___| https://github.com/nlohmann/json Licensed under the MIT License . -Copyright (c) 2013-2017 Niels Lohmann . +Copyright (c) 2013-2018 Niels Lohmann . Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/test/src/unit-class_parser.cpp b/test/src/unit-class_parser.cpp index ad1a97230a..0be045b57d 100644 --- a/test/src/unit-class_parser.cpp +++ b/test/src/unit-class_parser.cpp @@ -1,11 +1,11 @@ /* __ _____ _____ _____ __| | __| | | | JSON for Modern C++ (test suite) -| | |__ | | | | | | version 3.0.1 +| | |__ | | | | | | version 3.1.0 |_____|_____|_____|_|___| https://github.com/nlohmann/json Licensed under the MIT License . -Copyright (c) 2013-2017 Niels Lohmann . +Copyright (c) 2013-2018 Niels Lohmann . Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/test/src/unit-comparison.cpp b/test/src/unit-comparison.cpp index 3ca7d552e9..e591b0b02d 100644 --- a/test/src/unit-comparison.cpp +++ b/test/src/unit-comparison.cpp @@ -1,11 +1,11 @@ /* __ _____ _____ _____ __| | __| | | | JSON for Modern C++ (test suite) -| | |__ | | | | | | version 3.0.1 +| | |__ | | | | | | version 3.1.0 |_____|_____|_____|_|___| https://github.com/nlohmann/json Licensed under the MIT License . -Copyright (c) 2013-2017 Niels Lohmann . +Copyright (c) 2013-2018 Niels Lohmann . Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/test/src/unit-concepts.cpp b/test/src/unit-concepts.cpp index 29be62ddcb..0079d78b17 100644 --- a/test/src/unit-concepts.cpp +++ b/test/src/unit-concepts.cpp @@ -1,11 +1,11 @@ /* __ _____ _____ _____ __| | __| | | | JSON for Modern C++ (test suite) -| | |__ | | | | | | version 3.0.1 +| | |__ | | | | | | version 3.1.0 |_____|_____|_____|_|___| https://github.com/nlohmann/json Licensed under the MIT License . -Copyright (c) 2013-2017 Niels Lohmann . +Copyright (c) 2013-2018 Niels Lohmann . Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/test/src/unit-constructor1.cpp b/test/src/unit-constructor1.cpp index b1aafc342d..b4f4e83ac0 100644 --- a/test/src/unit-constructor1.cpp +++ b/test/src/unit-constructor1.cpp @@ -1,11 +1,11 @@ /* __ _____ _____ _____ __| | __| | | | JSON for Modern C++ (test suite) -| | |__ | | | | | | version 3.0.1 +| | |__ | | | | | | version 3.1.0 |_____|_____|_____|_|___| https://github.com/nlohmann/json Licensed under the MIT License . -Copyright (c) 2013-2017 Niels Lohmann . +Copyright (c) 2013-2018 Niels Lohmann . Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/test/src/unit-constructor2.cpp b/test/src/unit-constructor2.cpp index 5cb33fa459..9d34f562ed 100644 --- a/test/src/unit-constructor2.cpp +++ b/test/src/unit-constructor2.cpp @@ -1,11 +1,11 @@ /* __ _____ _____ _____ __| | __| | | | JSON for Modern C++ (test suite) -| | |__ | | | | | | version 3.0.1 +| | |__ | | | | | | version 3.1.0 |_____|_____|_____|_|___| https://github.com/nlohmann/json Licensed under the MIT License . -Copyright (c) 2013-2017 Niels Lohmann . +Copyright (c) 2013-2018 Niels Lohmann . Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/test/src/unit-convenience.cpp b/test/src/unit-convenience.cpp index fc04d4a614..f9e9928491 100644 --- a/test/src/unit-convenience.cpp +++ b/test/src/unit-convenience.cpp @@ -1,11 +1,11 @@ /* __ _____ _____ _____ __| | __| | | | JSON for Modern C++ (test suite) -| | |__ | | | | | | version 3.0.1 +| | |__ | | | | | | version 3.1.0 |_____|_____|_____|_|___| https://github.com/nlohmann/json Licensed under the MIT License . -Copyright (c) 2013-2017 Niels Lohmann . +Copyright (c) 2013-2018 Niels Lohmann . Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/test/src/unit-conversions.cpp b/test/src/unit-conversions.cpp index 38c3d8dd19..99449784dc 100644 --- a/test/src/unit-conversions.cpp +++ b/test/src/unit-conversions.cpp @@ -1,11 +1,11 @@ /* __ _____ _____ _____ __| | __| | | | JSON for Modern C++ (test suite) -| | |__ | | | | | | version 3.0.1 +| | |__ | | | | | | version 3.1.0 |_____|_____|_____|_|___| https://github.com/nlohmann/json Licensed under the MIT License . -Copyright (c) 2013-2017 Niels Lohmann . +Copyright (c) 2013-2018 Niels Lohmann . Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/test/src/unit-deserialization.cpp b/test/src/unit-deserialization.cpp index e790f21ae8..f5a61ce644 100644 --- a/test/src/unit-deserialization.cpp +++ b/test/src/unit-deserialization.cpp @@ -1,11 +1,11 @@ /* __ _____ _____ _____ __| | __| | | | JSON for Modern C++ (test suite) -| | |__ | | | | | | version 3.0.1 +| | |__ | | | | | | version 3.1.0 |_____|_____|_____|_|___| https://github.com/nlohmann/json Licensed under the MIT License . -Copyright (c) 2013-2017 Niels Lohmann . +Copyright (c) 2013-2018 Niels Lohmann . Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/test/src/unit-element_access1.cpp b/test/src/unit-element_access1.cpp index cc9b3ff46d..f7fd3e8d4c 100644 --- a/test/src/unit-element_access1.cpp +++ b/test/src/unit-element_access1.cpp @@ -1,11 +1,11 @@ /* __ _____ _____ _____ __| | __| | | | JSON for Modern C++ (test suite) -| | |__ | | | | | | version 3.0.1 +| | |__ | | | | | | version 3.1.0 |_____|_____|_____|_|___| https://github.com/nlohmann/json Licensed under the MIT License . -Copyright (c) 2013-2017 Niels Lohmann . +Copyright (c) 2013-2018 Niels Lohmann . Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/test/src/unit-element_access2.cpp b/test/src/unit-element_access2.cpp index 4a566b152d..852a93c29b 100644 --- a/test/src/unit-element_access2.cpp +++ b/test/src/unit-element_access2.cpp @@ -1,11 +1,11 @@ /* __ _____ _____ _____ __| | __| | | | JSON for Modern C++ (test suite) -| | |__ | | | | | | version 3.0.1 +| | |__ | | | | | | version 3.1.0 |_____|_____|_____|_|___| https://github.com/nlohmann/json Licensed under the MIT License . -Copyright (c) 2013-2017 Niels Lohmann . +Copyright (c) 2013-2018 Niels Lohmann . Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/test/src/unit-inspection.cpp b/test/src/unit-inspection.cpp index b4fdb9a6ae..5facb11674 100644 --- a/test/src/unit-inspection.cpp +++ b/test/src/unit-inspection.cpp @@ -1,11 +1,11 @@ /* __ _____ _____ _____ __| | __| | | | JSON for Modern C++ (test suite) -| | |__ | | | | | | version 3.0.1 +| | |__ | | | | | | version 3.1.0 |_____|_____|_____|_|___| https://github.com/nlohmann/json Licensed under the MIT License . -Copyright (c) 2013-2017 Niels Lohmann . +Copyright (c) 2013-2018 Niels Lohmann . Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -316,8 +316,8 @@ TEST_CASE("object inspection") SECTION("round trips") { for (const auto& s : - {"3.141592653589793", "1000000000000000010E5" - }) + {"3.141592653589793", "1000000000000000010E5" + }) { json j1 = json::parse(s); std::string s1 = j1.dump(); diff --git a/test/src/unit-items.cpp b/test/src/unit-items.cpp index 9d4552049c..68663119fd 100644 --- a/test/src/unit-items.cpp +++ b/test/src/unit-items.cpp @@ -1,11 +1,11 @@ /* __ _____ _____ _____ __| | __| | | | JSON for Modern C++ (test suite) -| | |__ | | | | | | version 3.0.1 +| | |__ | | | | | | version 3.1.0 |_____|_____|_____|_|___| https://github.com/nlohmann/json Licensed under the MIT License . -Copyright (c) 2013-2017 Niels Lohmann . +Copyright (c) 2013-2018 Niels Lohmann . Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/test/src/unit-iterators1.cpp b/test/src/unit-iterators1.cpp index ea789fa352..a63de5e4c7 100644 --- a/test/src/unit-iterators1.cpp +++ b/test/src/unit-iterators1.cpp @@ -1,11 +1,11 @@ /* __ _____ _____ _____ __| | __| | | | JSON for Modern C++ (test suite) -| | |__ | | | | | | version 3.0.1 +| | |__ | | | | | | version 3.1.0 |_____|_____|_____|_|___| https://github.com/nlohmann/json Licensed under the MIT License . -Copyright (c) 2013-2017 Niels Lohmann . +Copyright (c) 2013-2018 Niels Lohmann . Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/test/src/unit-iterators2.cpp b/test/src/unit-iterators2.cpp index b778f040b8..05509c3137 100644 --- a/test/src/unit-iterators2.cpp +++ b/test/src/unit-iterators2.cpp @@ -1,11 +1,11 @@ /* __ _____ _____ _____ __| | __| | | | JSON for Modern C++ (test suite) -| | |__ | | | | | | version 3.0.1 +| | |__ | | | | | | version 3.1.0 |_____|_____|_____|_|___| https://github.com/nlohmann/json Licensed under the MIT License . -Copyright (c) 2013-2017 Niels Lohmann . +Copyright (c) 2013-2018 Niels Lohmann . Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/test/src/unit-json_patch.cpp b/test/src/unit-json_patch.cpp index c69b3f0788..71dbc45b5d 100644 --- a/test/src/unit-json_patch.cpp +++ b/test/src/unit-json_patch.cpp @@ -1,11 +1,11 @@ /* __ _____ _____ _____ __| | __| | | | JSON for Modern C++ (test suite) -| | |__ | | | | | | version 3.0.1 +| | |__ | | | | | | version 3.1.0 |_____|_____|_____|_|___| https://github.com/nlohmann/json Licensed under the MIT License . -Copyright (c) 2013-2017 Niels Lohmann . +Copyright (c) 2013-2018 Niels Lohmann . Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/test/src/unit-json_pointer.cpp b/test/src/unit-json_pointer.cpp index d6b6149491..f572e1c1fd 100644 --- a/test/src/unit-json_pointer.cpp +++ b/test/src/unit-json_pointer.cpp @@ -1,11 +1,11 @@ /* __ _____ _____ _____ __| | __| | | | JSON for Modern C++ (test suite) -| | |__ | | | | | | version 3.0.1 +| | |__ | | | | | | version 3.1.0 |_____|_____|_____|_|___| https://github.com/nlohmann/json Licensed under the MIT License . -Copyright (c) 2013-2017 Niels Lohmann . +Copyright (c) 2013-2018 Niels Lohmann . Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/test/src/unit-merge_patch.cpp b/test/src/unit-merge_patch.cpp index 887207663c..9dd7162fa8 100644 --- a/test/src/unit-merge_patch.cpp +++ b/test/src/unit-merge_patch.cpp @@ -1,11 +1,11 @@ /* __ _____ _____ _____ __| | __| | | | JSON for Modern C++ (test suite) -| | |__ | | | | | | version 2.1.1 +| | |__ | | | | | | version 3.1.0 |_____|_____|_____|_|___| https://github.com/nlohmann/json Licensed under the MIT License . -Copyright (c) 2013-2017 Niels Lohmann . +Copyright (c) 2013-2018 Niels Lohmann . Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/test/src/unit-meta.cpp b/test/src/unit-meta.cpp index 63d9abada1..4aa3673d34 100644 --- a/test/src/unit-meta.cpp +++ b/test/src/unit-meta.cpp @@ -1,11 +1,11 @@ /* __ _____ _____ _____ __| | __| | | | JSON for Modern C++ (test suite) -| | |__ | | | | | | version 3.0.1 +| | |__ | | | | | | version 3.1.0 |_____|_____|_____|_|___| https://github.com/nlohmann/json Licensed under the MIT License . -Copyright (c) 2013-2016 Niels Lohmann . +Copyright (c) 2013-2018 Niels Lohmann . Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -42,10 +42,10 @@ TEST_CASE("version information") CHECK(j["url"] == "https://github.com/nlohmann/json"); CHECK(j["version"] == json( { - {"string", "3.0.1"}, + {"string", "3.1.0"}, {"major", 3}, - {"minor", 0}, - {"patch", 1} + {"minor", 1}, + {"patch", 0} })); CHECK(j.find("platform") != j.end()); diff --git a/test/src/unit-modifiers.cpp b/test/src/unit-modifiers.cpp index 3b31bda9e7..6d8d3a8610 100644 --- a/test/src/unit-modifiers.cpp +++ b/test/src/unit-modifiers.cpp @@ -1,11 +1,11 @@ /* __ _____ _____ _____ __| | __| | | | JSON for Modern C++ (test suite) -| | |__ | | | | | | version 3.0.1 +| | |__ | | | | | | version 3.1.0 |_____|_____|_____|_|___| https://github.com/nlohmann/json Licensed under the MIT License . -Copyright (c) 2013-2017 Niels Lohmann . +Copyright (c) 2013-2018 Niels Lohmann . Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/test/src/unit-msgpack.cpp b/test/src/unit-msgpack.cpp index 81aa36370a..f8de13da09 100644 --- a/test/src/unit-msgpack.cpp +++ b/test/src/unit-msgpack.cpp @@ -1,11 +1,11 @@ /* __ _____ _____ _____ __| | __| | | | JSON for Modern C++ (test suite) -| | |__ | | | | | | version 3.0.1 +| | |__ | | | | | | version 3.1.0 |_____|_____|_____|_|___| https://github.com/nlohmann/json Licensed under the MIT License . -Copyright (c) 2013-2017 Niels Lohmann . +Copyright (c) 2013-2018 Niels Lohmann . Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/test/src/unit-noexcept.cpp b/test/src/unit-noexcept.cpp index 6d0fd359b8..9a42d0c31a 100644 --- a/test/src/unit-noexcept.cpp +++ b/test/src/unit-noexcept.cpp @@ -1,11 +1,11 @@ /* __ _____ _____ _____ __| | __| | | | JSON for Modern C++ (test suite) -| | |__ | | | | | | version 3.0.1 +| | |__ | | | | | | version 3.1.0 |_____|_____|_____|_|___| https://github.com/nlohmann/json Licensed under the MIT License . -Copyright (c) 2013-2017 Niels Lohmann . +Copyright (c) 2013-2018 Niels Lohmann . Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/test/src/unit-pointer_access.cpp b/test/src/unit-pointer_access.cpp index eec88ed36f..60520bd6be 100644 --- a/test/src/unit-pointer_access.cpp +++ b/test/src/unit-pointer_access.cpp @@ -1,11 +1,11 @@ /* __ _____ _____ _____ __| | __| | | | JSON for Modern C++ (test suite) -| | |__ | | | | | | version 3.0.1 +| | |__ | | | | | | version 3.1.0 |_____|_____|_____|_|___| https://github.com/nlohmann/json Licensed under the MIT License . -Copyright (c) 2013-2017 Niels Lohmann . +Copyright (c) 2013-2018 Niels Lohmann . Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/test/src/unit-readme.cpp b/test/src/unit-readme.cpp index ade0e0a565..dec879ef45 100644 --- a/test/src/unit-readme.cpp +++ b/test/src/unit-readme.cpp @@ -1,11 +1,11 @@ /* __ _____ _____ _____ __| | __| | | | JSON for Modern C++ (test suite) -| | |__ | | | | | | version 3.0.1 +| | |__ | | | | | | version 3.1.0 |_____|_____|_____|_|___| https://github.com/nlohmann/json Licensed under the MIT License . -Copyright (c) 2013-2017 Niels Lohmann . +Copyright (c) 2013-2018 Niels Lohmann . Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/test/src/unit-reference_access.cpp b/test/src/unit-reference_access.cpp index a87a0c543c..c9f21f856f 100644 --- a/test/src/unit-reference_access.cpp +++ b/test/src/unit-reference_access.cpp @@ -1,11 +1,11 @@ /* __ _____ _____ _____ __| | __| | | | JSON for Modern C++ (test suite) -| | |__ | | | | | | version 3.0.1 +| | |__ | | | | | | version 3.1.0 |_____|_____|_____|_|___| https://github.com/nlohmann/json Licensed under the MIT License . -Copyright (c) 2013-2017 Niels Lohmann . +Copyright (c) 2013-2018 Niels Lohmann . Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/test/src/unit-regression.cpp b/test/src/unit-regression.cpp index bcdb4ace1c..c342853268 100644 --- a/test/src/unit-regression.cpp +++ b/test/src/unit-regression.cpp @@ -1,11 +1,11 @@ /* __ _____ _____ _____ __| | __| | | | JSON for Modern C++ (test suite) -| | |__ | | | | | | version 3.0.1 +| | |__ | | | | | | version 3.1.0 |_____|_____|_____|_|___| https://github.com/nlohmann/json Licensed under the MIT License . -Copyright (c) 2013-2017 Niels Lohmann . +Copyright (c) 2013-2018 Niels Lohmann . Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/test/src/unit-serialization.cpp b/test/src/unit-serialization.cpp index 2f667f4124..f5ad7f73ad 100644 --- a/test/src/unit-serialization.cpp +++ b/test/src/unit-serialization.cpp @@ -1,11 +1,11 @@ /* __ _____ _____ _____ __| | __| | | | JSON for Modern C++ (test suite) -| | |__ | | | | | | version 3.0.1 +| | |__ | | | | | | version 3.1.0 |_____|_____|_____|_|___| https://github.com/nlohmann/json Licensed under the MIT License . -Copyright (c) 2013-2017 Niels Lohmann . +Copyright (c) 2013-2018 Niels Lohmann . Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/test/src/unit-testsuites.cpp b/test/src/unit-testsuites.cpp index bd813aa5bc..b2cbfbcf0c 100644 --- a/test/src/unit-testsuites.cpp +++ b/test/src/unit-testsuites.cpp @@ -1,11 +1,11 @@ /* __ _____ _____ _____ __| | __| | | | JSON for Modern C++ (test suite) -| | |__ | | | | | | version 3.0.1 +| | |__ | | | | | | version 3.1.0 |_____|_____|_____|_|___| https://github.com/nlohmann/json Licensed under the MIT License . -Copyright (c) 2013-2017 Niels Lohmann . +Copyright (c) 2013-2018 Niels Lohmann . Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/test/src/unit-to_chars.cpp b/test/src/unit-to_chars.cpp index dffeaed09a..f7c3136671 100644 --- a/test/src/unit-to_chars.cpp +++ b/test/src/unit-to_chars.cpp @@ -1,11 +1,11 @@ /* __ _____ _____ _____ __| | __| | | | JSON for Modern C++ (test suite) -| | |__ | | | | | | version 3.0.1 +| | |__ | | | | | | version 3.1.0 |_____|_____|_____|_|___| https://github.com/nlohmann/json Licensed under the MIT License . -Copyright (c) 2013-2017 Niels Lohmann . +Copyright (c) 2013-2018 Niels Lohmann . Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/test/src/unit-ubjson.cpp b/test/src/unit-ubjson.cpp index f049270208..175e5ed1f3 100644 --- a/test/src/unit-ubjson.cpp +++ b/test/src/unit-ubjson.cpp @@ -1,11 +1,11 @@ /* __ _____ _____ _____ __| | __| | | | JSON for Modern C++ (test suite) -| | |__ | | | | | | version 3.0.1 +| | |__ | | | | | | version 3.1.0 |_____|_____|_____|_|___| https://github.com/nlohmann/json Licensed under the MIT License . -Copyright (c) 2013-2017 Niels Lohmann . +Copyright (c) 2013-2018 Niels Lohmann . Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/test/src/unit-udt.cpp b/test/src/unit-udt.cpp index 442041514e..17baf4e524 100644 --- a/test/src/unit-udt.cpp +++ b/test/src/unit-udt.cpp @@ -1,11 +1,11 @@ /* __ _____ _____ _____ __| | __| | | | JSON for Modern C++ (test suite) -| | |__ | | | | | | version 3.0.1 +| | |__ | | | | | | version 3.1.0 |_____|_____|_____|_|___| https://github.com/nlohmann/json Licensed under the MIT License . -Copyright (c) 2013-2016 Niels Lohmann . +Copyright (c) 2013-2018 Niels Lohmann . Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/test/src/unit-unicode.cpp b/test/src/unit-unicode.cpp index 82a292042e..0991290c1b 100644 --- a/test/src/unit-unicode.cpp +++ b/test/src/unit-unicode.cpp @@ -1,11 +1,11 @@ /* __ _____ _____ _____ __| | __| | | | JSON for Modern C++ (test suite) -| | |__ | | | | | | version 3.0.1 +| | |__ | | | | | | version 3.1.0 |_____|_____|_____|_|___| https://github.com/nlohmann/json Licensed under the MIT License . -Copyright (c) 2013-2017 Niels Lohmann . +Copyright (c) 2013-2018 Niels Lohmann . Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/test/src/unit.cpp b/test/src/unit.cpp index 1ad77ce2a5..c3cfa0f524 100644 --- a/test/src/unit.cpp +++ b/test/src/unit.cpp @@ -1,11 +1,11 @@ /* __ _____ _____ _____ __| | __| | | | JSON for Modern C++ (test suite) -| | |__ | | | | | | version 3.0.1 +| | |__ | | | | | | version 3.1.0 |_____|_____|_____|_|___| https://github.com/nlohmann/json Licensed under the MIT License . -Copyright (c) 2013-2017 Niels Lohmann . +Copyright (c) 2013-2018 Niels Lohmann . Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal