diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 85ff9b504..8dbacb78a 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 5863d0b5f..d75a67b4d 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 6c284754f..ef06dbfa6 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 ca4f49a2d..22408ff66 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 bb95f937f..bc03ba203 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 00599afe6..8b0f7002e 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 4f064a477..5f6a9baba 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 46d3685c7..1ccbf260b 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 886378a4a..30ee74843 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 5a8ab38f2..04b488dbd 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 5403e0d82..365a883c6 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 b43be5a65..139b5ef10 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 cd77ed145..5f02f8c5c 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 0430617e4..202f8a2ee 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 b4d6efc81..bac67ae9a 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 9aa2ed33c..56ce57661 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 6e6ca3354..3000cc579 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 202e44b10..65baeddcf 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 5dec37524..b06ef70bf 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 33108ce86..faa4cffdd 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 7412f09fb..ba465d31e 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 f43b1bcca..ed450f70d 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 99ebf0193..4bae0ca35 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 8009e95ff..6f2b2f5ed 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 9011b99b1..21e000c59 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 cb227c2be..1439a8218 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 fa1ce912c..09a85fda5 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 694935591..d39fd7a43 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 a6e786ab1..6f401441c 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 cd5923b8f..2337e81fb 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 36c6f571f..ed5aff9a8 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 aad58f730..bd8170d93 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 98df6101d..17136f437 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 e894b6638..8e44fa7c5 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 4f1bc4394..2d8657400 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 eec9258f8..b558aa04a 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 ba1bce4ee..78611e1a3 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 75234b623..b92a9fa25 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 34827259e..48b68f61e 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 f90473027..c45e09bb6 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 886d5ea3c..7a4366650 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 003110f12..30568efb4 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 a021edda3..9ec767727 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 e48b9fd95..2b286dc1d 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 42d4aa314..9488d30ef 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 d01827817..df2bbdc58 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 4f6f999ec..f25b7736a 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 799f96f7d..3f393692d 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 d52e628b9..c306731ac 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 a66b1dd44..8dc41b22e 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 ebf97e5fe..42710d153 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 64ac5fba9..3875421d9 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 d12c86088..3226fd219 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 fe670f158..547ae4858 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 8d141acf1..9d7978d50 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 3c7264263..7b8bcba41 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 e892b13e9..f081e7eda 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 1123e2f3e..cad700c32 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 cd030fffc..0ea19b6c1 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 84666742b..9355bd2cf 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 6dc4a6f7d..dc3209cf8 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 f97dac66f..6079e7a30 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 9a00950c0..dff260931 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 208c7c96a..1263fc1f2 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 274e56bf0..a29f14d26 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 a02ddbdb6..dfd1772bd 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 1c4859724..4deb64a14 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 4de703433..c072c0d95 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 7e80b68cf..a5314910f 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 809cc21e8..36f2ed2f8 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 6a50fd20d..e979a945c 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 9397a892c..2ea20f36e 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 94bc46a3e..6ef6e40ed 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 90a6590ef..a182c1284 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 2984f9eae..5a5b6e728 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 2695e1d57..9ef322c4b 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 0ba7e6fca..bf5d3dd44 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 71d411466..67ea55abd 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 efbf789e4..7cddac6a2 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 9209f64cf..0ea298913 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 592aa020a..40c755110 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 b3ab45ef2..1d02dd58b 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 72021bada..b6d7b011c 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 33a124ca0..c3d94bb83 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 13926b25b..82696e614 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 7043792b2..ed4cb445a 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 c411ba4f6..685ba7763 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 0be7a24ad..f23abc827 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 908b371d5..2bd7e9e8f 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 d32588fef..8eb81a696 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 b37b375a5..633b3e796 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 6e1f4e246..6e27db911 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 84c7d1f1f..8a99b3c5f 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 493f44356..ddfdcb34a 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 2adca3c6c..b20999fd1 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 5ff36826f..2855f18c9 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 bbc372e06..a0f630689 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 4f8bcd779..172924f9a 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 29f9ad349..2f32ed7af 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 73a3fc518..1c67f7398 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 d78a6b260..7a703aaeb 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 7bf5e8a3b..a3de6d6e4 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 27deb1498..564ce0f4e 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 6c4a0684c..ab05e4a49 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 951fea3e4..ab25946bb 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 d5bb4cfd5..d458912b3 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 913ad09db..4ee609876 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 803d5c624..564226f5d 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 3c2ac24ae..ce33b93e4 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 a76cd8e29..100cd360d 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 90965b37c..a20766a14 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 387dce696..36b181dcb 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 5b0aa9ea6..92fe63b0d 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 cd8107c0b..00e83ac22 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 b811f8aa2..97373d3b4 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 7c67093b2..70d43ee90 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 2d613597f..5d3e622e6 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 0bb86950d..729243d35 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 1dbbf5d28..235dab769 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 7820d3368..4232a9223 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 485f97045..ccc202d03 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 9b56f6ed1..19f0b0081 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 0b0435c36..782e64998 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 f20d9ce90..9ec778f79 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 3043e1847..4a635092c 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 05b270180..dd1a5aab3 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 08fa138d1..eb23bd244 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 b1e9ad2a0..43c52b47a 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 aeef78e85..3435a7e09 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 17208079a..4d8f0ea86 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 90bd2146d..6f6e42043 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 a35be75d1..0233e0f72 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 499530c51..2ea2673e5 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 0a2ba0205..898176304 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 a0c03a769..42cedf8f0 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 0cf3d4add..5dd305bbb 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 ab329bdb4..d70c83e37 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 2a0e91b98..ae58b2d7c 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 44cb483ce..2679cd1c5 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 f3672db33..92b05e758 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 b7dfc858b..33e2bbd05 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 8ea3a75f3..44e06e9ff 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 b2224d603..9cd2b51b1 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 0b74c5b39..001c704a9 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 61687a92f..7ef5bc57e 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 0087d9a14..434031bb9 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 23e8e84f1..75b971758 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 3ba4355f7..952bd7490 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 70b72778e..da397cdf4 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 b1148125d..244c48154 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 8273f86f4..c2ffc5468 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 d49f5ea81..1212833df 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 77a5f2a25..b8804d7c5 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 7a6cbbace..41aa4effa 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 9194beae5..e800b9bed 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 f1d8c8695..4da2b02bc 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 1b3e2aa1d..04529057b 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 6c1177583..733b89b53 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 f86383349..fbed2f67d 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 2def5271b..66fcf310e 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 0c32d6319..798b8fdff 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 d541a2129..1426f489a 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 ae7c25ae6..6e1cc1cce 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 b5d0c6407..dbb210372 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 90cc17442..097da7769 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 a5c4f78a0..c632387cf 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 7f0827910..3fc848ea3 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 da014bde9..f8659ee07 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 599f5d7b2..62ce78a6a 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 3865847fb..64209a22a 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 0689f995e..52da7af1b 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 8e9a21f16..543b9543f 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 576818511..0c9ede3ab 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 debcdf8a4..43e89509c 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 c23e8263f..656ffa8a0 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 8d74e7136..dc7e6ac4c 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 49864d342..f9a17003f 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 087910a42..d9aac7978 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 7c22cd4a0..d2c38a37c 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 7a2cf23ad..bf2144801 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 d60e53013..72d7350e3 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 7f5563835..0c46f014a 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 f078934f1..57edc8cca 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 43ff8ad80..8db08d0bc 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 68a7a9c82..c1a534b19 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 2320e439e..1bdb34024 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 53a089249..9467ca2c1 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 bc8ecb96d..d6f3e153c 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 3e05678b9..018f0bde9 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 ec9fc30f3..1bd88bc10 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 2eb1a380a..8a9cd0b20 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 d40366732..7a0353a1c 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 92bf9d772..92468d781 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 52b2a9e89..a5a437b44 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 22a7c5cb6..836e755db 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 16b9657ac..2e7ccfbb8 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 a8dd89bc9..bdb11752b 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 adec741e6..e7116408a 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 3daa44ef2..790eec624 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 0857f9ae9..6083a959b 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 2c4a76875..017f9ff5b 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 29b548111..fe51560cf 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 2e7f62e16..2cc96595d 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 a20e81f58..92e62d9bf 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 7afa48bcf..64b703a61 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 6044021ca..b513fe779 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 093a2d181..9adda14f3 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 37ea6df76..4db82d90a 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 94643bb77..8eab4cd68 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 6802e7da7..9b27b58fa 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 89a31ea5c..7e3e8644a 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 fd0e6bf54..a3c64a611 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 7038cda61..19970624c 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 7b0ec488c..bbddf4f51 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 dc2b525e2..4ee15bf1c 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 d231e710c..e96645f16 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 f6796c25a..f18e96f44 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 27215fb8f..5d694e938 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 375315e46..396fdf25a 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 2e9824b4b..239f7a689 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 341742186..8c8c92416 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 0c81da12a..adadbbdc2 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 7c9360bdb..596faf602 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 07d1b6cdb..237548377 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 9042e08e0..7b2f25014 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 c83556eea..2119dd552 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 7562e7843..53670b8e6 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 d67801c4a..301b558d3 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 cc6a18bb5..256be861e 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 5223950cd..34182ad24 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 8c906769a..49207f61a 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 f5495bd55..96b07b094 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 aeea028bd..b5d58316f 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 29c2f9d00..b9fd75bd8 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 335a320a6..b4849c1a5 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 9c9f7a83d..31f4809fe 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 d0fd98163..8b18a1234 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 ad0c6ce31..dfc0d333d 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 a39bc0816..8a25e6188 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 919b8b9aa..add6fe49d 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 5979d0259..68fba3a91 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 a81ee1224..e027bd2c8 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 6df39f512..d4f18b180 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 fc160d070..6907fd7ab 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 dccbd7b72..32d3590cc 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 dad7eebfe..454da5193 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 cc672b5f7..5e3d65e04 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 20582c9d1..d13f17179 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 4383df7fa..b77c0fef5 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 46af9cbce..5ad367d07 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 7c56aad3a..88780fd41 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 1e90f66c4..d2d85a82d 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 66ad588cd..a3024a93b 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 2b5b58830..608df6aa6 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 0ab7d007c..8f04f510d 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 2cfc96285..cdbaad90e 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 6c19d1e4b..9b38efb4a 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 69fcec7c0..6a9c28819 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 72978e54f..2b00edf01 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 86a8f7fbe..5b4e0b08d 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 03da57592..021945c15 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 1980f684a..1ad07677f 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 001f566e4..a05eb953e 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 9fdb41cb6..75efaadc3 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 1c0d573a1..e1abe70a1 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 41b2e15cc..62accfcf6 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 cf6777e95..e5c239014 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 168988d60..260472975 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 4ae7e77cd..7850fe03c 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 ad1a97230..0be045b57 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 3ca7d552e..e591b0b02 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 29be62ddc..0079d78b1 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 b1aafc342..b4f4e83ac 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 5cb33fa45..9d34f562e 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 fc04d4a61..f9e992849 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 38c3d8dd1..99449784d 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 e790f21ae..f5a61ce64 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 cc9b3ff46..f7fd3e8d4 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 4a566b152..852a93c29 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 b4fdb9a6a..5facb1167 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 9d4552049..68663119f 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 ea789fa35..a63de5e4c 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 b778f040b..05509c313 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 c69b3f078..71dbc45b5 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 d6b614949..f572e1c1f 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 887207663..9dd7162fa 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 63d9abada..4aa3673d3 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 3b31bda9e..6d8d3a861 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 81aa36370..f8de13da0 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 6d0fd359b..9a42d0c31 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 eec88ed36..60520bd6b 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 ade0e0a56..dec879ef4 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 a87a0c543..c9f21f856 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 bcdb4ace1..c34285326 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 2f667f412..f5ad7f73a 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 bd813aa5b..b2cbfbcf0 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 dffeaed09..f7c313667 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 f04927020..175e5ed1f 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 442041514..17baf4e52 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 82a292042..0991290c1 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 1ad77ce2a..c3cfa0f52 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