Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Operator= ambiguous in C++1z and GCC 7.1.1 #670

Closed
nick-prat opened this issue Jul 29, 2017 · 7 comments · Fixed by #1496
Closed

Operator= ambiguous in C++1z and GCC 7.1.1 #670

nick-prat opened this issue Jul 29, 2017 · 7 comments · Fixed by #1496
Labels
state: please discuss please discuss the issue or vote for your favorite option

Comments

@nick-prat
Copy link

nick-prat commented Jul 29, 2017

With the new GCC 7.1.1 there is a bug with reassigning to strings.

In this code

#include <string>
#include <iostream>
#include <json.hpp>

using json = nlohmann::json;

int main() {
    json js;
    std::string name = "";
    name = js["name"];
}

it produces the error

In file included from /usr/include/c++/7.1.1/string:52:0,
                 from json_error.cc:1:
/usr/include/c++/7.1.1/bits/basic_string.h: In instantiation of ‘std::__cxx11::basic_string<_CharT, _Traits, _Alloc>::_If_sv<_Tp, std::__cxx11::basic_string<_CharT, _Traits, _Alloc>&> std::__cxx11::basic_string<_CharT, _Traits, _Alloc>::operator=(_Tp) [with _Tp = nlohmann::basic_json<>; _CharT = char; _Traits = std::char_traits<char>; _Alloc = std::allocator<char>; std::__cxx11::basic_string<_CharT, _Traits, _Alloc>::_If_sv<_Tp, std::__cxx11::basic_string<_CharT, _Traits, _Alloc>&> = std::__cxx11::basic_string<char>&]’:
json_error.cc:10:21:   required from here
/usr/include/c++/7.1.1/bits/basic_string.h:764:28: error: call of overloaded ‘assign(nlohmann::basic_json<>&)’ is ambiguous
  { return this->assign(__sv); }
                            ^
/usr/include/c++/7.1.1/bits/basic_string.h:1313:7: note: candidate: std::__cxx11::basic_string<_CharT, _Traits, _Alloc>& std::__cxx11::basic_string<_CharT, _Traits, _Alloc>::assign(const std::__cxx11::basic_string<_CharT, _Traits, _Alloc>&) [with _CharT = char; _Traits = std::char_traits<char>; _Alloc = std::allocator<char>]
       assign(const basic_string& __str)
       ^~~~~~
/usr/include/c++/7.1.1/bits/basic_string.h:1329:7: note: candidate: std::__cxx11::basic_string<_CharT, _Traits, _Alloc>& std::__cxx11::basic_string<_CharT, _Traits, _Alloc>::assign(std::__cxx11::basic_string<_CharT, _Traits, _Alloc>&&) [with _CharT = char; _Traits = std::char_traits<char>; _Alloc = std::allocator<char>]
       assign(basic_string&& __str)
       ^~~~~~
/usr/include/c++/7.1.1/bits/basic_string.h:1440:7: note: candidate: std::__cxx11::basic_string<_CharT, _Traits, _Alloc>& std::__cxx11::basic_string<_CharT, _Traits, _Alloc>::assign(std::__cxx11::basic_string<_CharT, _Traits, _Alloc>::__sv_type) [with _CharT = char; _Traits = std::char_traits<char>; _Alloc = std::allocator<char>; std::__cxx11::basic_string<_CharT, _Traits, _Alloc>::__sv_type = std::basic_string_view<char>]
       assign(__sv_type __sv)
       ^~~~~~

when built with g++ -std=c++1z filename.cpp but it will compile fine with c++ -std=c++14 filename.cpp

this also occurs if using clang if the GCC libs version is 7.1.1

@nlohmann
Copy link
Owner

nlohmann commented Jul 30, 2017

I cannot reproduce this on macOS with

  • g++ (GCC) 8.0.0 20170726 (experimental)
  • g++-7 (Homebrew GCC 7.1.0) 7.1.0

with -std=c++1z.

@nlohmann
Copy link
Owner

We further run GCC 7.1.0 with -std=c++17 without problems, see https://travis-ci.org/nlohmann/json/jobs/259074844.

@nlohmann
Copy link
Owner

May this be a bug in GCC?�

@nlohmann nlohmann added the state: please discuss please discuss the issue or vote for your favorite option label Jul 30, 2017
@nlohmann
Copy link
Owner

nlohmann commented Aug 1, 2017

Maybe related: #667

@nlohmann
Copy link
Owner

nlohmann commented Aug 1, 2017

Cannot reproduce.

@nlohmann nlohmann closed this as completed Aug 1, 2017
@lieff
Copy link
Contributor

lieff commented Feb 25, 2019

Can reproduce this on CentOS 7.6 machine using gcc 7.2.1. Not reproduced on Ubuntu with gcc 5.5 and 8.1.

@nickaein
Copy link
Contributor

It can be reproduced for version 3.5.0 of library using GCC 7.1.0 on Godbolt with -std=c++1z and even with -std=c++17 flag: https://godbolt.org/z/ff1t3Z. It compiles with -std=c++14 flag though.

Based on this documentation (under section Refereneces), while GCC support of C++17 core language has be complete since 7.1, the library support wasn't (and still isn't).

Therefore, this is either caused by a bug in GCC 7.1.0 (which seems unlikely as it cannot be reproduced in other environments) or an oversight in the libstdc++ that has been fixed in later versions.

Note on -std=c++1z

I'm not sure how far we should go to support it. The latest GCC documentation states that c++1z has been deprecated. Also, the documentation on GCC 7.1.0 states that (emphasis mine):

c++1z: The next revision of the ISO C++ standard, tentatively planned for 2017. Support is highly experimental, and will almost certainly change in incompatible ways in future releases.

So I believe c++1z should be abandoned in favor of -std=c++17.

jlconlin added a commit to njoy/json-adapter that referenced this issue Nov 21, 2019
456478b3 Merge branch 'release/3.7.3'
c5eafe74 :bookmark: set version to 3.7.3
c6e1e260 Merge pull request #1838 from nickaein/fix-quadratic-destruction
efa13c66 Reserve stack only for top-level items
948f98cf Cleanups
0f3ec003 Remove harmful vector::reserve during destruction (#1837)
be61ad14 :art: fix inconsistent operator style
411158d8 Merge branch 'release/3.7.2' into develop
5f09b502 Merge branch 'release/3.7.2'
56109eac :bookmark: set version to 3.7.2
7b0c50b9 :hammer: add path
0a513a35 Merge pull request #1436 from nickaein/iterate-on-destruction
7e2445a0 Move deep JSON test to a separate unit-test
68d0a7b2 Reduce depth in unit-test to avoid choking valgrind
eec19742 Merge remote-tracking branch 'nlohmann/develop' into iterate-on-destruction
67259d69 Merge pull request #1830 from nlohmann/whitesource/configure
760076ab Add .whitesource configuration file
1a9de881 :rotating_light: fix a linter warning
d98bf027 Merge branch 'release/3.7.1' into develop
43e4db61 Merge branch 'release/3.7.1'
aacdc6bb :bookmark: set version to 3.7.1
0f6a58ee :busts_in_silhouette: update contributors
1e9f16df :rotating_light: fix linter errors
c0ae88bf :rotating_light: fix linter errors
62dada05 :bug: fix conversion to std::valarray
7bcaba0c Merge pull request #1821 from AnthonyVH/develop
1ca6f290 Merge pull request #1826 from cbegue/develop
abccafa5 :arrow_up: upgrade Doctest to 2.3.5
c4923e3d Merge remote-tracking branch 'upstream/develop' into develop
ec9647ae Moved test for #1647 regression to regressions file.
8b686b30 Add restriction for tuple specialization of to_json
3790bd9a :construction_worker: add Xcode 10.2
42e9ad32 :hammer: remove full path
e779714d :construction_worker: add Xcode 10.2
bf2afaee :loud_sound: add version output
6a4cc29f :memo: update examples
dfe53c36 :rotating_light: fix UBSAN warnings
0db1692f :busts_in_silhouette: update contributors
1307862b Merge pull request #1694 from eli-schwartz/release-include-meson
4d1e4c6d Merge pull request #1780 from t-b/add-msvc-16-2019
a1828bbf Merge pull request #1806 from cbegue/develop
794a3d41 Fix issue #1805
ddda67a0 Don't capture json input by value (fixed #1822).
fb9a2643 Add test for #1647.
27d0dfc1 Fix #1647: non-member operator== breaks enum (de)serialization.
f272ad53 :busts_in_silhouette: add CODEOWNERS file
f7e7a623 :pencil: add comment on JSON_THROW_USER, JSON_TRY_USER, and JSON_CATCH_USER
507d5676 :rotating_light: fix warning
00cb98a3 Merge pull request #1803 from flopp/spelling
b93d414a Fix some spelling errors - mostly in comments & documentation.
f4332d40 README: describe how to use json as a meson subproject
84faa36e release: add singleinclude and meson.build to include.zip
0245ae51 Merge pull request #1797 from t-b/fix-integer-truncation
4c061918 Merge pull request #1799 from nemequ/develop
fbcbc76d Update Hedley to v11.
c6cbdf96 appveyor.yml: Add debug build on x64 and VS 2019
01e486bb appveyor.yml: Add MSVC 16 2019 support
35b47c27 iteration_proxy: Fix integer truncation from std::size_t to int
5541a2bd test/cmake_import: Pass the generator platform required by MSVC 2019
7a521150 appveyor: Pass the generator platform explicitly
ed554144 Merge pull request #1779 from t-b/avoid-using-glob-in-cmake
eb6fe421 test/CMakeLists.txt: Use an explicit list instead of GLOB
d187488e Merge pull request #1765 from crazyjul/fix/items-with-alt-string
dae0fe79 Merge pull request #1769 from chris0x44/json_pointer
d826282f Merge pull request #1767 from 0xflotus/patch-1
4615f5a9 Provide default implementation for int_to_string, but allow for overloaded function
7476f5ee Make json_pointer::back const (resolves #1764)
d7579b8c did you mean 'serialization'?
0f073e26 Allow items() to be used with custom string
99d7518d :memo: add OSS Fuzz status badge
e2c531a1 Merge pull request #1760 from Xav83/cppcheckFixes
87afee1c Runs make amalgamate on the project.
13a7c602 Correct a warning from cppcheck:
b9dfdbe6 Correct a warning from cppcheck:
771d5dad Merge pull request #1741 from tete17/Fix-SFINAE
e26a2904 Fix and add test's for SFINAE problem
06ccd43a Merge pull request #1722 from t-b/fix-int64-min-issue
a6bd798b Merge pull request #1728 from t-b/fix-clang-sanitizer-invocation
8067c3ca Add serialization unit tests for extreme integer values
70aa8a31 Add regression test for dumping the minimum value of int64_t
6ce2f35b Fix outputting extreme integer values in edge cases
6d701b29 .travis.yml: Increase the timeout to 45 minutes
d5c0d52f external_constructor<std::valarray>: Handle empty array properly
61fe5f1e input_buffer_adapter: Fix handling of nullptr input
9ea3e191 .travis/cmake: Rework clang sanitizer invocation
f0bff49f test/CMakeLists.txt: Remove trailing whitespace
eab68e77 :construction_worker: add test step
90c1c24c :construction_worker: try GitHub Actions
bf415605 :pencil2: fix a typo
b6ee34cc Merge branch 'develop' of https://github.com/nlohmann/json into develop
7dccfa53 Merge pull request #1724 from t-b/enhance-travis
a4eaaa56 .travis.yml: Add gcc 9 and compile with experimental C++20 support
fe618ac2 :construction_worker: adjust maintainer scripts
a015b78e :lock: add security policy
6291803f :busts_in_silhouette: update contributors
53c3eefa Merge branch 'release/3.7.0' into develop
ea60d40f Merge branch 'release/3.7.0'
d275d055 :pencil: update documentation
ddb7f70a :pencil: update documentation
48e1fe03 :bookmark: set version to 3.7.0
66d63abe Update Makefile
d4fd731f :hammer: fix release target
d80f8b09 :hammer: adjust version
7bf8a860 :hammer: adjust paths
65e4b973 :fire: remove leftover file
323cf95d :rotating_light: fix linter warning
3c4c69a2 :rotating_light: fix linter warning
ffe0e3d7 Merge pull request #1673 from remyabel/gnuinstalldirs
3184e9bd Use GNUInstallDirs instead of hard-coded path.
cf8251eb :ambulance: fix compiler errors
6c7cde18 Merge branch 'develop' of https://github.com/nlohmann/json into develop
a501365e Merge branch 'feature/hedley' into develop
8d059b96 Merge pull request #1670 from podsvirov/readme-package-managers-msys2
6a3cdb28 Package Manager: MSYS2 (pacman)
b17440c1 :rotating_light: fix compiler warnings
104c5c19 Merge branch 'feature/json_pointer_contains' into develop
7a23aa1c Merge branch 'feature/emplace_back' into develop
24fa285e :memo: remove HEDLEY annotation from documentation
94765654 :rotating_light: fix warnings
346e9813 :construction: add more annotations
9289a23a Merge pull request #1643 from kevinlul/develop
90798caa :truck: rename Hedley macros
025f4cea :rotating_light: fix warning
89736219 :hammer: add NLOHMANN_JSON prefix and undef macros
1720bfed :alembic: add Hedley annotations
e616d095 Remove boolean regression test for #1642
1be63431 :sparkles: make emplace_back return a reference #1609
258fa798 :sparkles: add contains function for JSON pointers
855156b5 Add regression tests for #1642
9a775bcb Merge pull request #1570 from nickaein/msvc-regression-tests
5b2e2305 CI: Skip test-unit_all on MSVC Debug builds
3db14cbf :memo: Improve doc on const_inter constructor
0a137b78 Appveyor: Set timeout of unit-tests in appveyor.yml instead of CMake
f5591420 Appveyor: Set build mode explicitly
eba8244e Avoid collision of ::max with windows.h macro
798e83a0 Workaround msvc2015 bug with explicit copy-constructor for const_iterator
d28b4b90 Add a separate build with Windows.h included
4ac0fe26 Increase timeout of test-unicode_all in Debug build
ec43d27f Add Debug builds for AppVeyor
39011a17 :memo: mention json type in documentation start page #1616
3b82a350 :memo: mention 302 exception in value() documentation #1601
13d4f8f5 Merge pull request #1639 from taylorhoward92/develop
f4fca2d5 Fix #1642
2f389cdd Added explicit converstion to std::string_view. Fixes failing test with GCC 8.3
4fc98e0b Merge pull request #1625 from nickaein/fix-docs
0c214949 :pencil2: Fix links to create an issue page
b22c577e :pencil2: Fix brew instructions in README
0d55ddc5 :pencil2: Fix a typo in README
17c0849a Merge pull request #1585 from Macr0Nerd/iss916
9f2179de Merge pull request #1598 from nickaein/patch-2
40c3d502 Fix broken links to documentation
26952500 Merge branch 'iss916' of https://github.com/Macr0Nerd/json into iss916
aa4c45ee Added to_string (with ugly macro) and tests
293cd6b7 Added to_string and added basic tests
ee4028b8 Merge branch 'feature/fastcov' into develop
cf6b6692 Merge branch 'develop' into feature/fastcov
f0bc16d8 :hammer: overworked coverage targets
b4b06d89 :arrow_up: updated fastcov
e65cff2a :hammer: small cleanup
63fe1cbb :memo: updated README
0bdadb12 Merge branch 'feature/circleci' into develop
0a1ddd68 :arrow_up: updated fastcov
4676f759 :arrow_up: updated fastcov
da279234 Merge branch 'develop' into feature/fastcov
f05614b2 :building_construction: adding anonymous namespace
0da99027 :rotating_light: silenced a warning
1f03395e Merge branch 'develop' of https://github.com/nlohmann/json into develop
2f9095dd :hammer: relaxed requirements to coverage
ee8732c3 Merge pull request #1555 from theodelrieu/fix/1511
d1ef7531 Merge pull request #1439 from onqtam/doctest
d66abda4 tests: fix coverage
e6e6805c add built-in array support in get_to
2806b201 make sure values are overwritten in from_json overloads
da5b7833 fixing the remaining of the pedantic gcc/clang target warnings
64873fb5 Merge branch 'develop' into doctest
80daa193 :construction_worker: Ninja seems not to work
0a57c51a :construction_worker: adding concurrency
a5e00f2c :construction_worker: fixed path
5ebe7220 :construction_worker: full workflow
ecf4d5e9 :construction_worker: trying CircleCI
53001414 :hammer: using --exclude-gcov to exclude files
b12287b3 :alembic: trying fastcov
b21c04c9 :fire: removed unsupported flag
c7878173 :hammer: minor changes to maintainer targets
b52c3638 Merge pull request #1551 from heavywatal/fix-1535-nodiscard-clang
d21d2983 :art: fixed indentation
23635704 :arrow_up: added script to update cpplint
191aa0fd :wrench: overworked maintaner targets
5ccdaf64 Remove C++17 extension warning from clang; #1535
b4def6dc tabs instead of spaces...
a0000c32 finished the last of the warnings
5d511a6e fixed a bunch of warnings from the Makefile from the root of the repo
82af0ecd Merge branch 'develop' into doctest
d79c1680 Merge branch 'feature/doozer' into develop
24d91cf3 :memo: added Doozer to README
09918245 :construction_worker: version output
0caf9865 reverted the removal of this if/else branching - this is the easiest way to get -std=c++0x support
9d2f0391 :construction_worker: fixed timeout
af9da22b :construction_worker: adding xenial-armhf
0a67b51f :construction_worker: forgot path to ctest
e27b2820 :construction_worker: skip certificate check
cde0b243 :construction_worker: fixed required packages
f091fe31 :construction_worker: increased timeout
28dfbedd :construction_worker: fixed timeout
ff51a32b updated doctest to version 2.3.1 released today
2b346099 Merge branch 'develop' of https://github.com/nlohmann/json into doctest
dcbc028b :construction_worker: fixed syntax
842d42b1 :construction_worker: unified paths
1e86976c :construction_worker: fixed paths
30211477 :construction_worker: fixed package name
5e1cae0a :construction_worker: install g++
c871c9a0 :construction_worker: install correct g++
63d619e2 :construction_worker: need to install g++
c94b764a :construction_worker: fixed installation
65cdccfa :construction_worker: fixed syntax error
a72ac185 :construction_worker: use recent cmake
4327ae0b :construction_worker: need more recent cmake for CentOS
fabf9533 :construction_worker: fixed a typo
6e3e2ee2 :construction_worker: fixed buildenv values
bc5089e8 :construction_worker: add test output to avoid timeout
7dd3e638 :construction_worker: added Fedora and CentOS
490c6e92 :construction_worker: using raspbian
2fcca259 :construction_worker: added cmake
72dd6f34 :construction_worker: trying doozer
baaa2a4d :checkered_flag: trying to use constructors from std::allocator #1536
1126c9ca Merge branch 'release/3.6.1' into develop
295732a8 Merge branch 'release/3.6.1'
efa1b9a7 :bookmark: set version to 3.6.1
b33093d6 :bug: fixed regression #1530
9d6ab901 :checkered_flag: fixed a compilation error in MSVC #1531
c790b9f8 :bug: fixed regression #1530
483a0865 :alembic: added funding link
d2a08dda Merge branch 'develop' of https://github.com/nlohmann/json into develop
7c55510f :rotating_light: fixed some warnings #1527
3ac5fa31 :speech_balloon: update issue templates
51e1564c Merge branch 'release/3.6.0' into develop
944267f5 Merge branch 'release/3.6.0'
0abf0f80 :bookmark: set version to 3.6.0
b37392b7 :bookmark: set version to 3.6.0
002addab :rotating_light: fixed a warning
a6f9b4e3 :busts_in_silhouette: added contributors
18cc7ddd :memo: completed documentation index page
e07e8e79 :memo: updated documentation
710f26f9 :memo: added documentation
b224c523 :art: cleanup
37a72dac :green_heart: forgot two semicolons
155d196b Update CMakeLists.txt
365944b0 Merge branch 'develop' into doctest
8d3f4f21 :hammer: clean up
9fc093c9 :construction_worker: added targets for infer and oclint
22c733e6 :memo: added documentation
56f6d1d6 :green_heart: fix CI and #1521
df0f7f2b :construction_worker: overworked clang-tidy target
9f26dac9 :arrow_up: updated Doxyfile
b8451c23 :rotating_light: fixed warnings
d6c4cd3b :rotating_light: adding targets for static analyzers
baf8b4be :heavy_plus_sign: adding cpplint
34f8b4f7 :rotating_light: fixed more warnings
02b34947 :fire: removing unstable macOS builds on Traivs
b02ee167 :rotating_light: fixed warnings
8d6c033f Merge branch 'develop' of https://github.com/nlohmann/json into develop
27011e37 :rotating_light: fixed warnings
9dc35529 Merge pull request #1514 from naszta/macrofix
0067ea8f Change macros to numeric_limits #1483
0c65ba96 Merge branch 'develop' of https://github.com/nlohmann/json into develop
546e2cbf :rotating_light: fixed some warnings
c6fc9021 Merge pull request #1489 from andreas-schwab/develop
d39842e6 Merge pull request #1330 from ax3l/topic-installEmbed
670f42b5 :fire: removing Xcode 6.4 builder
c983b671 Merge pull request #1469 from garethsb-sony/json_pointer-append
c11bead2 :construction_worker: removing more retired Travis images
3cd1dac6 :rotating_light: fix MSVC warning #1502
cabe2357 Merge pull request #1492 from stac47/fix_gcc9_allocator
16d9cdce :memo: updated documentation of CI
e3729ba0 :green_heart: fix compiler selection
e5c7fd48 :construction_worker: trying new Travis workers
5047c7a2 :bug: added missing include #1500
8eb7db72 Merge pull request #1441 from iwanders/support-cmake-older-than-3-8-with-if
393410e6 Merge pull request #1495 from njlr/patch-1
30edcaab Merge pull request #1496 from lieff/develop
7b31e56f fix GCC 7.1.1 - 7.2.1 on CentOS closes https://github.com/nlohmann/json/issues/670
bb22b100 Do proper endian conversions
8aeee4f7 Update README.md
d183bd04 Tests for json_pointer::empty and json_pointer::parent_pointer
08de9eea Add json_pointer::parent_pointer (cf. std::filesystem::path::parent_path)
164e0e54 Rename private json_pointer::is_root as public json_pointer::empty for consistency with std::filesystem::path
ddc9f201 Fix gcc9 build error test/src/unit-allocator.cpp (Issue #1472)
21516f2b Merge pull request #1491 from nickaein/patch-1
088a2452 Fix typo in README.ME
e326df21 Merge pull request #1474 from nickaein/develop
c55cacee Merge pull request #1477 from nickaein/fix-doc
e93f3054 Add unit-test for contains() member function
6a5db009 Implement contains() to check existence of a key
fb5ceb26 Fix documentation
46ff13d3 Merge pull request #1468 from past-due/disable_Wmismatched_tags_on_tuple
eee3bc0c Merge pull request #1464 from elvisoric/update_meson_install_step
5da757bb Attempt to satisfy Coveralls by adding a test for (unchanged) operator std::string
c850e9d8 Add operator/= and operator/ to construct a JSON pointer by appending two JSON pointers, as well as convenience op/= and op= to append a single unescaped token or array index; inspired by std::filesystem::path
45819dce Disable -Wmismatched-tags warning on tuple_size / tuple_element
77d1d372 Disable installation when used as meson subproject. #1463
372c4d21 Merge branch 'develop' into iterate-on-destruction
68ec3eb8 Merge pull request #1451 from Afforix/Afforix-fix-extra-semicolon
de14b5ee Merge pull request #1455 from wythe/patch-2
cca6d0db docs: README type
a06e7f5d JSON-pointer: add operator+() returning a new json_pointer
dc21cbb7 remove extra semicolon
e89c9464 Merge branch 'feature/nodiscard' into develop
6de4df23 :bug: fixed integer overflow in dump function #1447
e17e0d03 Merge pull request #1446 from scinart/develop
e36593e9 :hammer: trying code from https://godbolt.org/z/-tLO1K
20db020c move newly-added tests in unit-regression.cpp
d359fd3a :construction: trying nodiscard attribute #1433
b9a39b38 Merge pull request #1434 from pboettch/develop
83e84446 fix typo
899bd94b flush buffer in serializer::dump_escaped case UTF8_REJECT
4fd9b52f Use C++11 features supported by CMake 3.1.
dffae108 Merge pull request #1435 from pboettch/warning-fix
851fe8a5 Merge pull request #1430 from nicoddemus/conda-docs
a2c074fd this should really fix the XCode 6/7 builds
3340162e fixing osx builds - had forgotten to define this for the object file where the test runner is compiled
2f44ac1d moved from Catch to doctest for unit tests
f0883dda During destruction, flatten children of objects to avoid recursion
47fe4b9c Add unit test for parsing deeply-nested array
d0c0d161 :rotating_light: fixed unused variable warning
9225cf2f allow push_back() and pop_back() calls on json_pointer
b025d66e Add instructions about using nlohmann/json with the conda package manager
e5753b14 :rotating_light: fixed another linter warning #1400
5c04cc10 :hammer: fixed includes
8e9ad346 :rotating_light: fixed another linter warning
ad01736d :bulb: improved documentation for parsing without exceptions #1405
06731b14 :arrow_up: upgraded Catch and Google Benchmark
daeb48b0 Merge pull request #1411 from nickaein/develop
29a03f46 Merge pull request #1414 from nickaein/mydevel-appveyor-x64
c9dd260a Add unit tests for dump_integer
be9b4cbd Add benchmark for small integers
6503e83e Improve dump_integer performance by implementing a more efficient int2ascii
f1643283 Increase stack size for VS2017 Win x64 on Appveyor
b39f34e0 Merge pull request #1425 from hijxf/patch-1
7f73915d Updated year in README.md
df460c96 Merge pull request #1423 from skypjack/patch-1
6546cad7 Fixed broken links in the README file
847dd2a9 Merge pull request #1420 from skypjack/patch-1
937b642e :memo: added description on how to use NuGet package #1132
975dc970 Merge pull request #1417 from wythe/patch-1
b8be0f64 Fixed broken links to operator[]() and at()
619bf9c2 Fixed broke links to RFC7159
a559ff8f typo in README
2c0c2ca6 Specify target platform in generator name
676c847c Merge pull request #1409 from yann-morin-1998/yem/cmake-version
e8b6b7ad buildsystem: relax requirement on cmake version
c682b987 :rotating_light: fixed PVS V567 warning
6f89613a :rotating_light: fixed some warnings
db53bdac Merge branch 'release/3.5.0' into develop
cebb4e05 Merge branch 'release/3.5.0'
78348afe :bookmark: set version to 3.5.0
1107f8cd :memo: updated documentation for items() function
98f4e31c :memo: formatted picture
58c269b0 :memo: updated documentation
2182157d :memo: update documentation
45f5611d :rotating_light: fixed two warnings
117c1d14 :memo: added contributors to 3.5.0
d584ab26 :art: fixed header
45a8a093 :rotating_light: fixed a warning
85849940 Merge pull request #1391 from pratikpc/develop
ebd3f458 Added Support for Structured Bindings
4f270e38 Merge pull request #1342 from davedissian/bugfix/sfinae-iterator-traits
f1080d7c Code review.
5d390e91 Merge pull request #1392 from mtalliance/feature/addFileInputAdapter
c1c85b02 Forget one std::FILE
635a4fc3 use namespace std when possible. Change the name of private variable.
cf31193d create single json.hpp file
a794cfdb refactor unit test in case of throw, the fclose will not be called. using unique_ptr with custom destructor will ensure that
91ff96a7 remove the const attribute
b7a2642f remove comment
fa7f1a52 new unified json.hpp generated with make amalgamate
ef283e0c add tests to cover the new input adapter
3335da62 remove non usefull code.
ae48acbb remove non usefull code. Add small description
52f6fd1d Add the possibility of using FILE * from cstdio library to read a file. This enable the possibility of using low eand device with this library.
67b0daf2 Add the possibility of using FILE * from cstdio library to read a file. This enable the possibility of using low eand device with this library.
2c23f0a3 Changes requested from code review.
e73dfef6 Merge pull request #1382 from kjpus/patch-1
767a3a32 Link to issue #958 broken
d53873a2 Merge pull request #1363 from theodelrieu/doc/implicit_conversions
7a56f5a4 Merge pull request #1380 from manu-chroma/patch-1
5de184b8 readme: fix typo
ef90d62d :rotating_light: fixed warning #1364
7b961368 recommend using explicit from JSON conversions
da81e7be :checkered_flag: adding parentheses around std::snprintf calls #1337
f80efd39 :lipstick: cleanup
35829928 Merge pull request #1343 from mefyl/develop
f86090aa Merge pull request #1345 from mpoquet/feature/meson-install-pkgconfig
30e1cbb0 Merge pull request #1346 from ax3l/fix-mergePatchShadowParam
aa103826 Set eofbit on exhausted input stream.
798754df Amalgamate Headers
97b81da8 merge_patch: rename parameter
ffe08983 :meson: install headers + pkg-config
f665a923 Implement SFINAE friendly iterator_traits and use that instead.
d2e6e1bf Merge pull request #1329 from ax3l/fix-typosWhitespaces
a7567bc5 Remove EOL whitespaces in natvis
f049836d CMake: Optional Install if Embedded
689382a7 Fix EOL Whitespaces & CMake Spelling
2f73a4d1 :rotating_light: fixed a linter warning
e3c28afb Merge branch 'release/3.4.0' into develop
6708f22c Merge branch 'release/3.4.0'
0f3c74d8 :bookmark: set version to 3.4.0
7b2f8cce :bookmark: set version to 3.4.0
8cee0e38 :ambulance: fixed #1319
856fc31d :lipstick: fixed indentation
39419cd5 :rotating_light: fixed another linter warning
86b5ce95 :memo: added examples for BSON functions
d2e4f0b0 :pencil2: fixed some typos
f0c14595 :bug: fixed a bug parsing BSON strings #1320
24946f67 :rotating_light: fixed some more linter warnings
7d0dc101 :rotating_light: fixed a linter warning
45a761bd Merge branch 'develop' of https://github.com/nlohmann/json into develop
4e765596 :hammer: small improvements
1308ea05 Merge pull request #1315 from nlohmann/feature/convert_char
0e7be06b Merge pull request #1323 from nlohmann/feature/enum_json_mapping
85aaf91b Merge branch 'develop' into feature/enum_json_mapping
5a6bdf59 Merge branch 'develop' into feature/convert_char
037e93f5 Merge pull request #1320 from nlohmann/julian-becker-feature/bson
9f48bb69 :zap: replaced vector by array #1323
6384fe28 :rotating_light: fixed another linter warning
ad639ad5 :sparkles: added NLOHMANN_JSON_SERIALIZE_ENUM marco #1208
544150d5 :rotating_light: fixed another linter warning
c2e17576 :ok_hand: added another conversion function #1315
d97fa307 :ok_hand: fixed comment #1320
7ce720b7 :rotating_light: fixed coverage
19647e08 :rotating_light: fixed compiler warnings
62126278 :hammer: added fix for arrays
1968e5c7 :art: clean up binary formats
4d1eaace :hammer: fixed fuzz code to avoid false positives in case of discarded values
e2c5913a :construction: some changes to the BSON code
bba15912 Merge branch 'feature/bson' of https://github.com/julian-becker/json into julian-becker-feature/bson
f102df3c :memo: updated documentation #1314
7b501de0 Merge pull request #1314 from nlohmann/feature/codec_errors
20038e27 :memo: added a note to the discussion #1286
87ef3f25 :pencil2: fixed a typo #1314
b49f7693 :ok_hand: replaced static_cast to CharType by conversion function #1286
2343d9ca :green_heart: additional tests from the Unicode spec #1198
951a7a64 :construction: fixed test cases #1198
c51b1e6f :construction: fixed an issue with ensure_ascii #1198
c7af027c :construction: respect ensure_ascii parameter #1198
e5dce641 :green_heart: added tests #1198
c5821d91 :construction: overworked error handlers #1198
ad11b6c3 BSON: Improved exception-related tests and report location of U+0000 in the key-string as part of `out_of_range.409`-message
9294e25c Merge pull request #1301 from theodelrieu/fix/1299
b553a8a9 Merge pull request #1305 from koponomarenko/add-meson-info
5ba812d5 BSON: fixed incorrect casting in unit-bson.cpp
8de10c51 BSON: Hopefully fixing ambiguity (on some compilers) to call to string::find()
f0c55ce0 Add Meson related info to README
2a638691 Merge branch 'develop' of https://github.com/nlohmann/json into feature/bson
4b2a0064 Merge pull request #1303 from nlohmann/feature/binary_errors
dbb0b631 :wheelchair: improved error messages for binary formats #1288
a946dfc1 add a note to maintainers in type_traits.hpp
978c3c41 BSON: throw `json.exception.out_of_range.409` in case a key to be serialized to BSON contains a U+0000
0671e92c :construction: proposal for different error handlers #1198
daa3ca8a BSON: Adjusted documentation of `binary_writer::to_bson()`
5bccacda BSON: throw json.exception.out_of_range.407 in case a value of type `std::uint64_t` is serialized to BSON. Also, added a missing EOF-check to binary_reader.
45c8af2c add new is_constructible_* traits used in from_json
dd672939 Merge pull request #1294 from theodelrieu/fix/json_ref_ctor
11fecc25 add constraints for variadic json_ref constructors
e4262192 Merge pull request #1282 from nlohmann/feature/lines_columns
adfa961e Merge pull request #1280 from nlohmann/feature/linter
6d34d64b :ambulance: fixed compilation error
74a31075 :wheelchair: improved parse error messages
6e49d9f5 :ambulance: fixed compilation error
f8158997 :memo: fixed documentation
df0f612d BSON: allow and discard values and object entries of type `value_t::discarded`
3abb7881 :rotating_light: fixed some more clang-tidy warnings
858e75c4 :rotating_light: fixed some clang-tidy warnings
062aeaf7 BSON: Reworked the `binary_writer` such that it precomputes the size of the BSON-output. This way, the output_adapter can work on simple output iterators and no longer requires random access iterators.
6d09cdec :bug: fixed a bug in the unget function
011b15dd :wheelchair: added line positions to error messages
81f4b34e BSON: Improved documentation and error handling/reporting
ac38e957 Merge pull request #1277 from performous/fix-clang-detection
fa722d5a :rotating_light: fixed another linter warning
ec95438a :rotating_light: fixed some linter warnings
f1768a54 Merge branch 'release/3.3.0' into develop
aafad2be Merge branch 'release/3.3.0'
cdfe6ced :bookmark: set version to 3.3.0
b968faa8 :bookmark: set version to 3.3.0
cd518fbb :memo: small update to pass test suite
e8427061 Thirdparty benchmark: Fix Clang detection.
b9116548 :memo: updated contributor list
bb558852 :lipstick: cleaned code
5c7d27c3 Merge pull request #1272 from antonioborondo/fix_warning
b6fdad9a Remove anonymous namespace
7c385a48 Fix error: 'wide_string_input_helper' was not declared in this scope
9ba3f796 Fix error: explicit specialization in non-namespace scope
8d1585f0 Change implementation to use templates
ad3c216b Generate header
02310592 Fix warning
9f18e170 Merge pull request #1270 from chuckatkins/add-more-cmake-docs
53ec0a16 Merge pull request #1271 from chuckatkins/cleanup-deprecated-warnings
4c617611 docs: Add additional CMake documentation
829571ab Turn off additional deprecation warnings for GCC.
c8231eff Merge pull request #1260 from chuckatkins/fix-cmake-target-alias
02e653bd docs: add a note in the readme about using the CMake imported target
564506a8 cmake: add import config tests
1729db85 cmake: fix package config to deal with versioning and namespaces
910a8950 Merge pull request #1238 from theodelrieu/fix/1237
1fae82b7 Merge branch 'develop' into fix/1237
22e55349 :memo: added Wandbox link #1227
70e587c3 :memo: added Wandbox link #1227
d26f3946 Merge pull request #1231 from theodelrieu/feature/get_with_parameter
c61a9071 :rotating_light: fixed a compilation issue with ICPC #755
e8730e5e BSON: Reworked `binary_reader::get_bson_cstr()`
b59a5840 Merge branch 'develop' of https://github.com/nlohmann/json into develop
4e54c9a1 :rotating_light: fixed a compilation issue with ICPC #755
0a09db9c BSON: Extend `binary_reader::get_number` to be able to hanlde little endian input to get rid of `binary_reader::get_number_little_endian`
95432c34 Merge pull request #1262 from knilch0r/patch-1
8c1387cf unit-testsuites.cpp: fix hangup if file not found
521fe49f Add basic_json::get_to function.
680a4ab6 Merge pull request #1257 from henryiii/gcc48
7a37ba0c Adding 4.8 test to travis
ef358ae6 BSON: Fixed hangup in case of incomplete bson input and improved test coverage
99b7c7c8 Patch nlohmann/json for GCC 4.8
bce48162 BSON: Added test case for the different input/output_adapters
763705c2 Fix: Add missing `begin()` and `end()` member functions to `alt_string`
e184b6ec Merge pull request #1252 from koponomarenko/fix-meson-build
88b055c2 Merge pull request #1249 from LEgregius/clang-3.4.2-crash-workaround
8799759b Add version and license to meson.build
4e52277b Fix issue #1237
e4bc98d0 Merge pull request #1245 from chuckatkins/fix-target-namespace-backward-compatibility
4d780b09 Reordered the code. It seems to stop clang 3.4.2 in RHEL 7 from crashing intermittently.
3b1a5caf Use a version check to provide backwards comatible imported target names.
99939d63 :memo: added lgtm.com badge
4e2f35d4 :construction_worker: adding Xcode 10 worker
7fa3b886 Merge pull request #1221 from rivertam/better-error-305
8f07ab63 Replace "key-style argument" with "string argument"
df33a907 BSON: Bugfix for non-empty arrays
cf485c29 BSON: Support for arrays
120d1d77 BSON: test case for a more complex document
5ce7d6bd BSON: support objects with objects as members
83b427ad BSON: unsigned integers
c0d8921a BSON: support objects with int64 members
7ee361f7 BSON: support objects with int32 members
c5ef0231 BSON: support objects with null members
6c447de0 BSON: Support objects with string members
0c0f2e44 BSON: support doubles
9a0dddc5 BSON: Object with single boolean
5f5836ce BSON: Support empty objects
f06c8fd8 BSON: serialization of non-objects is not supported
186c747a Merge pull request #1230 from mandreyel/lambda-unevaluated-context-fix
6b5334c1 Move lambda out of unevaluated context
ebb3c032 :art: cleanup after #1228
d3428b35 Merge pull request #1228 from theodelrieu/remove_static_asserts
aea648bb remove now-useless traits. check for is_basic_json where needed
4b4bbcee make from_json SFINAE-correct
f7971f04 make to_json SFINAE-correct
f7c8a214 refactor from/to_json(CompatibleArrayType)
628f7672 do not check for compatible_object_type in compatible_array_type
29f72966 refactor is_compatible_type, remove conjunction & co
77967e65 refactor is_compatible_integer_type
13760857 refactor is_compatible_array_type
924e95c6 refactor is_compatible_string_type
e84195ab refactor is_compatible_object_type
b59c3367 use detected instead of has_* traits
1ea8cd12 fix void_t for older compilers
eb30ff06 :rotating_light: fixed a compiler warning #1224
ad053ef0 Fix tests for improved error 305(hopefully)
bbdfe7de Improve error messages for error 305
d713727f Merge pull request #1202 from dennisfischer/develop
04597c3a Merge pull request #1214 from devsisters/fix-1213
aada309f Fix #1213
359f98d1 Merge branch 'release/3.2.0' into develop
8c205711 Merge branch 'release/3.2.0'
dfe607c6 Export package to allow builds without installing
9f3857ef :bookmark: set version to 3.2.0
7608a64e :hammer: fixed amalgamation
a7b02bdc :bookmark: preparing 3.2.0 release
c6a482b1 :memo: added example for sax_parse
5ad52f41 :arrow_up: Catch 1.12.0
3811daa8 :memo: release preparation
6899fa30 Merge branch 'develop' of https://github.com/nlohmann/json into develop
57faaf42 :rotating_light: fixed a compiler warning
f78ac4fb Merge pull request #1200 from thyu/develop
3004a739 Fix -Wno-sometimes-uninitialized by initializing "result" in parse_sax
e33b31e6 :bug: fixed callback-related issue (https://github.com/nlohmann/json/issues/971#issuecomment-413678360)
b5c54b41 :memo: overworked documentation
07494e06 :rotating_light: fixed some compiler warnings
d5b21b05 Merge pull request #1153 from theodelrieu/refactor/no_virtual_sax
0cc3db4f add static_asserts on SAX interface
38f8a51a use abstract sax class in parser tests
9bbb1330 remove no_limit constant and default values
442886d0 use templates in the sax interface instead of virtuals
f6febbe3 split meta.hpp, add detected_t (used to define concepts)
3ac2d81a :hammer: fixed a MinGW error #1193
be2065dc :rotating_light: fixing a MinGW warning #1192
fed70f6b :art: reindented code
0e748f2f Merge pull request #1187 from devsisters/json-internal-catch
861ee400 Merge pull request #1176 from grembo/develop
3ce43253 :memo: updated documentation of used compilers
ba4a19d4 :construction_worker: added more CI workers
043eff5b :construction_worker: added more CI workers
05b27e83 Exclude bytewise comparison in certain tests. These tests never worked - they weren't run before d5aaeb4.
d5aaeb4c Make section names unique in loops, as catch doesn't support duplicate sections, see also https://github.com/catchorg/Catch2/issues/816#issuecomment-278268122
3760a38b :checkered_flag: implicit conversion is not allowed with MSVC
5b144116 :checkered_flag: trying to fix C2440 error
347e77bd :ambulance: fix for #1169
04372a8c :checkered_flag: fix for #1168
d0e60de4 Add new JSON_INTERNAL_CATCH macro function
7bfc406d :memo: added note about CocoaPods #1148
d456a2d7 Merge pull request #1151 from sonulohani/bigObjFix
b8ad3388 Fixed compiler error in VS 2015 for debug mode https://github.com/nlohmann/json/issues/1114
39dd775e :hammer: cleanup after #1134
86a96b05 Merge pull request #1134 from Daniel599/feature/items_iterator
396a914f :hammer: added macro to disable compiler check #1128
bab58265 Merge pull request #1144 from jrakow/cppreference-link-fix
515cfc2d Merge pull request #1142 from jrakow/develop
963d06a1 :memo: fix links to cppreference named requirements
9f00db48 :memo: link to cppreference via HTTPS
ec2ebd5e meson: add multiple headers target
0bb36bb1 meson: fix include directory
62457729 :memo: mentioned MinGW in README
09c0df4a :construction_worker: choosing correct image
1bbc4a08 :construction_worker: using Ninja to speed up build
d8fe13fc :hammer: fixed escaping for MinGW
e59b9309 :construction_worker: trying a more recent compiler
937d68e2 :construction_worker: forgot old PATH
989ad9b7 :construction_worker: using help from https://stackoverflow.com/a/48509334/266378
067e2882 :construction_worker: set build type
7bbc06b4 :construction_worker: forgot quotes
441e5d87 :construction_worker: experimenting with AppVeyor and MinGW
7fa4ddf9 :lipstick: fixed indentation
bf348ca8 Merge pull request #1028 from gracicot/develop
ed6a0686 :hammer: small refactoring to improve branch coverage
c8bfdfd9 :construction_worker: tryping different platforms for AppVeyor
c02de445 :rotating_light: fixed more compiler warnings
66dd1a84 :rotating_light: fixed more compiler warnings
85092226 :rotating_light: removed compiler warnings
0460b909 :memo: fix for #1052 #1139
85f35a1d :memo: documentation fix
e7c1638d :lipstick: cleanup
1c81e9f5 Merge pull request #1130 from agrianius/develop
d505ed7b Merge pull request #1138 from theodelrieu/feature/unordered_map_conversion
2c920a10 run make amalgamate
2b37d7ed from_json: add overload for std::unordered_map
299469cf from_json: add missing template arguments for std::map
1566ad40 fixed compile error for #1045; to_json for iternation_proxy_internal was needed
f574d7e0 simplify templates for operators, add more checks
cd28d872 forward declarations to make new compilers happy
3d305590 define global operator< for const char* and alt_string
4feb8211 test (non)equality for alt_string implementation
14e6278c Merge branch 'develop' of github.com:gracicot/json into develop
7acd90b6 Fixed check for compatible string type
5676a2a0 Aligned template declaration
e0e7fa39 Re-added external_constructor with string compatible types
4778c02a Set MSVC version from 1514 and older
714c5926 Disabled implicit conversion to string_view on MSVC 15.13 and older
e830bc50 Merge pull request #1117 from TinyTinni/develop
ecadcdb5 added char cast
48656a49 typo
64acb42a remove stringstream dependency
8efbf8d7 :memo: documentation to avoid future issues like #1108
e5a67fc3 Merge branch 'develop' of https://github.com/nlohmann/json into develop
a49644ab :ambulance: adjusted Fuzzer to new parser
0efaf891 Merge pull request #1089 from theodelrieu/feature/map_conversion
c5e63fd6 Provide a from_json overload for std::map
db03d093 Merge branch 'feature/key_ref' into develop (fixes #1098)
cf9299d2 Merge branch 'feature/sax2' into develop #971
3cdc4d78 :memo: added documentation
adf09726 Merge branch 'develop' into feature/sax2
481ace65 :hammer: only calculate array index string when needed #1098
1c6b332d :ok_hand: mitigating cppcheck bug #1101
90eb0a91 :zap: keys are now returned as const reference #1098
1f84cc2c :white_check_mark: adjusted test cases
717301d1 Merge branch 'testsuite' into feature/sax2
4639bb2c :white_check_mark: added more tests from recent nst's JSONTestSuite
e94862a6 :ambulance: fixed error in callback logic
ae213721 :hammer: removed unget function for wstring parsers
5ff2abb9 Merge branch 'develop' into feature/sax2
567fe9b7 Merge pull request #1078 from martin-mfg/patch-1
377e9566 fix typo in readme
5da59638 Update issue templates
7bbe7bb9 :fire: removed old issue template
14f01e19 :wrench: update issue templates
86b0732a :memo: added public key used for commits and releases
ed69e50a :page_facing_up: added SPDX-License-Identifier
5bc4ff9d Merge branch 'feature/wstring' into develop
fa3e42f8 Merge branch 'develop' into feature/wstring
b5d1755d :fire: removed commented-out test cases #1060
0ab8fab3 Merge pull request #1058 from dns13/patch-1
65b4d825 Fix typo in single_include, too
53fb2300 Fix typo
46ec2fdd :memo: updated THANKS list
b8bfd114 Merge pull request #1048 from chuckatkins/misc-cmake-packaging-enhancements
33a2154f Enable target namespaces and build dir project config
29362c6a Merge pull request #1047 from jammehcow/patch-1
c02a3155 :construction_worker: added Xcode 9.3 builder
8d8f8907 :hankey: first try on #1045
7f20e9dd Fixed incorrect version number in README
031b88d3 Make the CMake install dir user-configurable
aaee18ce Added test for string conversion with string_view
7c503c64 Merge pull request #1043 from coryan/patch-1
4286b16b Fix trivial typo in comment.
cf91b4f2 Merge branch 'develop' into feature/wstring
f924df18 Merge branch 'develop' into feature/sax2
acf10d9a Merge pull request #1041 from ax3l/topic-spack
e1ea8369 Merge branch 'develop' into feature/sax2
40f279c5 Merge branch 'feature/issue1021' into develop
18a0271a Merge branch 'develop' into feature/issue1021
1ae98963 Package Manager: Spack
83b14338 Merge pull request #1040 from ax3l/topic-debugViewMSVCcmakeMin
e439a1a9 CMake: 3.8+ is Sufficient
495436a5 Merge pull request #1026 from ktonon/develop
a35d414c Update CMake to latest on Travis
08a7233d :ambulance: fixed commit 1e08654
1e08654f :hammer: cleanup
aa89c5e0 :hammer: removing unget_character() function from input adapters #834
6678eb2b :white_check_mark: improved test coverage #1031
16c5bfea :ok_hand: fixed compiler warnings #1031
727dd466 :hammer: trying to make tests run with MSVC #1031
ab89ae4e :hammer: trying to make tests run with MSVC #1031
eb06d053 :construction: added input adapter for wide strings #1031
ba6edd56 :hammer: cleanup
850671b9 :hammer: using a vector<bool> for the parser hierarchy
4efa8cdb :green_heart: fixed Valgrind options #1030
830c93fd :memo: fixed example for operator> #1029
c78dbc36 Added test for conversion to string_view
53d8d579 Amalgamate single include
5f723bbe :hammer: realized callback parser wirh SAX interface #971
896a9db4 :hammer: improved code #1021
73cc5089 Using target_compile_features to specify C++ 11 standard
a9baab76 :ambulance: fix for #1021
4f6b2b64 :hammer: changed SAX interface
2537677e :white_check_mark: improved test coverage
9e1abb48 :white_check_mark: improved coverage
1e38ffc0 :white_check_mark: more tests
25f56ff2 :memo: updated documentation
99ecca55 :white_check_mark: improved test coverage
9e07e9b4 :sparkles: implemented non-throwing binary reader
a271ee5f :recycle: proper use of SAX parser for binary formats
943d6410 :hammer: some refactoring
22929fe1 :construction: started a SAX/DOM/callback parser
375b05a1 :hammer: cleanup
606a2519 :white_check_mark: improved test coverage
c87ffad4 :recycle: implemented a non-recursive parser
2a5506ed Amalgamated headers
81657079 basic_json now supports getting many type of strings
27cf05af Merge branch 'develop' into feature/sax2
d2dd27dc Merge branch 'release/3.1.2' into develop
183390c1 Merge branch 'release/3.1.2'
8a6c8cb0 :bookmark: set version to 3.1.2
afef474c :bookmark: set version to 3.1.2
a52e8355 :rewind: oops
21410d50 :checkered_flag: moved /Wall to CMake
829ed74d :checkered_flag: experimenting with /Wall
1262d474 :checkered_flag: fixed an MSVC warning
282bafae :hammer: fixed compilation error
abac6a0e Merge branch 'develop' into feature/sax2
919d1fef Merge pull request #1009 from nlohmann/user_string_parser
8557151d :recycle: adjusting lexer/parser in symmetry to #1006
b56ac864 :memo: thanks for #1006
0cab3b2c Merge pull request #1006 from agrianius/dump-template
3d4f6a29 :hammer: cleaner exception interface
ad47b0fb :recycle: refactored binary readers to use a SAX parser
392c0338 test refactoring
51349537 add unit test: checking dump to alternative string type
830f3e52 forward alternative string class from output_adapter to output_string_adapter
ed6b1464 dump to alternate implementation of string, as defined in basic_json template (changes to amalgamated code)
faccc37d dump to alternate implementation of string, as defined in basic_json template
149d2fd0 :green_heart: improved test coverage
6399cd30 Merge branch 'develop' into feature/sax2
6151dfae :ok_hand: made changes proposed in #1001
35e43df6 Merge branch 'develop' into feature/sax2
99185230 :memo: cleanup after #1001
e737de89 Merge pull request #1001 from nlohmann/leak
aa8fc2a4 :ambulance: hopefully fixed the memory leak
7c1a7888 Merge branch 'develop' into feature/sax2
cf60e18c :fire: removing failing test (work on this in branch "leak")
97559bb1 :hammer: trying to fix the leak
38345fd0 :ok_hand: fixed some more warnings
8b379948 :fire: replaced acceptor with SAX parser
303a0c58 Merge branch 'develop' into feature/sax2
d183d34b :green_heart: added another test case
d2d65bb2 :recycle: refined SFINAE to fix some warnings
476b2e09 :green_heart: added regression tests for #972 and #977
62030615 Merge pull request #986 from theodelrieu/fix/basic_json_conversion
5beab805 :hammer: using the SAX-DOM parser
faf2546a :hammer: simplified SAX-DOM parser
5b9d03cf :hammer: added SAX-DOM-Parser
9d274295 :hammer: added error messages to SAX interface
86991d52 Merge branch 'develop' into feature/sax2
fdecbf6e Merge pull request #992 from bogemic/pvs_studio_fix_misprinted_condition
fd30ad8a did make amalgamate
2a2ed799 pvs_studio fix. misprinted condition
8d104e6f :green_heart: fixed test case
5773e164 :rotating_light: fixed a linter warning
8711ec60 support construction from other basic_json types
c22f2d41 missing CHECK_NOTHROW in unit-udt
3ff94553 :hammer: added a SAX-DOM-Parser
21352c4d :recycle: refactored SAX parser
981e226c Merge branch 'develop' into feature/sax2
1f3d2a3b :memo: overworked README
13ca723c Merge pull request #981 from wla80/develop
05d3bf16 Make integration section concise
8d6b3d44 :ok_hand: fixed some compiler warnings
8c7f46f7 :hammer: removed a logic error and improved coverage
922f7a3d :white_check_mark: added more tests for SAX parsing
ac230e8b :hammer: fixed test cases to be more robust
374ebacc :sparkles: added a SAX parser #971
8968adcd Merge branch 'release/3.1.1' into develop
c8ea63a3 Merge branch 'release/3.1.1'
8424d10e :bookmark: set version to 3.1.1
938c861a :bookmark: set version to 3.1.1
94b7a8da :lipstick: fixed indentation
20b5f4d8 Merge pull request #969 from theodelrieu/fix/924
01d61188 Fix constraints on from_json(CompatibleArrayType)
b02e3bb0 Merge pull request #957 from theodelrieu/fix_coveralls
41db7cd8 Make the coveralls job use the multiple header version
447f5421 :hammer: overworked release target
61f0bfb1 :hammer: enforce using Python 2 for the wandbox script
548f4889 :hammer: overworked Makefile
865ff00d :memo: updated documentation wrt. objects #963
addbbbe1 Merge branch 'develop' of https://github.com/nlohmann/json into develop
0a64982e :memo: cleanup after #954
e5d538c5 Merge pull request #954 from pfultz2/patch-1
2dda87c3 Merge branch 'feature/coverage_multi' into develop
5731695d Clarify dev version and add space after the word flag.
74675dd6 :rewind: back to the original version
50863c5a Latest updates based on feedback
ab05df3a :hammer: another try
b455154c :hammer: another try
1e8f4d6a :hammer: more trying
316634e1 :hammer: added quotes around parameters
0111f318 :hammer: working on #953
83db7876 :checkered_flag: removing test case that fails on MSVC #962
33a9b00c :bug: fix for #962
8b457ace :bug: fixing CBOR's indefinity length strings #961
556e30f7 Merge pull request #955 from patrikhuber/patch-1
ee764365 Change to angle brackets
737cffe0 :hammer: fixed directory for lcov coverage
ae688016 Changed links from master to develop branch
2b7b39c7 :rocket: added release target #956
44b40d7c Fix links in README.md
34022609 Add a note about installing the library with cget
3a887dc9 :construction_worker: fixed coveralls
5c2a0a51 :construction_worker: fixed coveralls
b7796669 :construction_worker: re-added homebrew tests
97309f0d Merge branch 'release/3.1.0' into develop
15acf260 Merge branch 'release/3.1.0'
a8fcfd98 :construction_worker: fixed travis file
f5c03999 :hammer: fixed benchmark compilation
02584846 :bookmark: set version to 3.1.0
ce7d0ebf Merge pull request #944 from theodelrieu/fix/cmake_install
14cd0198 fix cmake install directory (for real this time)
9958dde3 Merge pull request #950 from kaidokert/develop
aed4a080 Templatize std::string in binary_reader #941
e8bf1f62 :sparkles: added define for library version #948 #943
552d1538 :memo: added more statistics on binary formats
60e2d28e :bug: fix for #947
51c774f2 :memo: added documentation for binary formats
57e6fddd :rotating_light: fixed warnings
f7131715 Merge branch 'develop' of https://github.com/nlohmann/json into develop
ce273af9 :memo: added documentation for binary formats
ae235139 Merge pull request #940 from kaidokert/develop
8049442c :hammer: rename yytext to token_buffer (fixes #933)
d0c9e5ff Allow overriding THROW/CATCH/TRY macros with no-exceptions (redo) #938
b3bd3b72 :memo: added link to OSS-Fuzz project repository
52e94495 :memo: added more functions to overview
cb4a9c85 :hammer: excluded code from coverage
1483d39c :hammer: moved class json_pointer into separate file #920
e95578f8 :memo: documented JSON Merge Patch (RFC 7386)
102c4743 :hammer: clean up
6855bbb9 :hammer: split "parsing" directory to "input" and "output"
05f49fa4 :white_check_mark: added roundtrip tests for UBJSON
f0b26c8f :white_check_mark: added fuzzer for UBJSON input
b0a68f54 :white_check_mark: added roundtrip tests for UBJSON
1be3935e :memo: cleanup after #936
7aace7c9 Merge pull request #936 from zerodefect/improvement/fix_kmin_compiler_warning
0e2211df Merge pull request #925 from zerodefect/improvement/improve_readme_json_fwd
95cf1fef Removed compiler warning about unused variable 'kMinExp'.
355c1e94 :construction_worker: added task to check amalgamation #906
dbfd7e53 Merge branch 'develop' of https://github.com/nlohmann/json into develop
3c68a796 :fire: deprecated iterator_wrapper #874
f05c3edc Merge pull request #930 from Pipeliner/develop
f5c4e9f3 Merge pull request #919 from theodelrieu/fix/sfinae_for_incomplete_types
7eabb6ba :memo: updated documentation for UBJSON functions
fc32b8a9 Fix a typo in README.md
3cca6308 :hammer: cleanup after #915
010e5960 Merge pull request #915 from abolz/dtoa
3d776b05 :memo: updated README
9e5d901f Merge branch 'feature/ubjson' into develop
327b8bb0 Merge branch 'feature/strings' into develop
d2b3fd15 Updated README.md to explain how installation of json_fwd.hpp can be achieved as part of install step.
b406e370 :heavy_plus_sign: using Google Benchmark #921
a8f711a2 :heavy_plus_sign: using Google Benchmark #921
6402077a Merge pull request #876 from nlohmann/feature/rfc7396
dcee778c fix sfinae on basic_json UDT constructor
7456f1d8 :recycle: re-used existing UTF-8 decoder to simplfy string serialization
afe45713 :hammer: cleanup + some noexcept
b182308e :hammer: cleanup
9b9919d4 Use max_digits10 in dump_float for float->text->float round-trip
810f81bb Regenerate src/json.hpp
787204f0 Add unit-tests for detail::to_chars
9f7c2c04 Use the Grisu2 algorithm for formatting 'float's and 'double's
332f3520 Add an implementation of the Grisu2 algorithm for binary to decimal floating-point conversion
0695ac40 Add tests for #360
68a97367 Tests: Re-enable some round-trip tests
6e2e466c Tests: Don't rely on the format used for floating-point formatting
107c21a4 Tests: Exponents are formatted with a leading '+' sign
3ae82d91 Tests: Floating-point formatting uses lower case 'e'
92f72950 :hammer: cleanup
3ac67456 :hammer: clean up
d9446b0e Merge pull request #911 from theodelrieu/fix/cmake_install
9d6b3731 :white_check_mark: improved test coverage
06cddd37 :hammer: removed failing amalgamation test
f85f4967 :white_check_mark: improved test coverage
6965ff00 Merge branch 'develop' into feature/ubjson
411c16cb :memo: overworked documentation wrt. amalgamation #906
fea5f379 :memo: it's 2018
541b4613 :recycle: adjusted code to split headers
0e8f01a9 Merge branch 'develop' into feature/rfc7396
c772c01a :recycle: refactored code to split headers
1b54d4a5 Merge branch 'develop' into feature/ubjson
420dcf1f :construction: added check whether code is amalgamated
5775084f cmake: add option to use/install the non-amalgamated version
84bffd5d move amalgamate tool to third_party folder
922b56e4 cmake: add back trailing slash to NLOHMANN_JSON_SOURCE_DIR
a66b2d20 :rotating_light: removed linter warnings for Python code
f4a55f26 :heavy_plus_sign: added amalgamate Python script
241eea0c :memo: documentation
10bad938 :construction: added size benchmark for binary formats
3a7585e7 :white_check_mark: added more tests
31bfabc4 :hammer: optimized input format
965a70e3 :hammer: optimized output format
85173f56 :hammer: some clean up
ce53537b :heavy_minus_sign: :heavy_plus_sign: replaces amalgamation tool
0a2920e0 :recycle: reorganized code
b67e00b9 Merge pull request #700 from theodelrieu/refactor/split_it
fd049676 :bug: fixed copy-paste error
fb1154c2 :construction: debug
97e0d20c :construction: debug
ebf28a26 :construction: another try
7e4ee23f add single_header CMake target
57d822b6 add missing includes, put back include comments
9cab30cf add adl_serializer.hpp
8e9714fe add detail/json_ref.hpp
a3473fda add detail/serializer.hpp
c117515e add detail/parsing/binary_writer.hpp
d620f76f add detail/parsing/binary_reader.hpp
4dbb433a add detail/parsing/output_adapters.hpp
ae6f6604 add detail/iterators/json_reverse_iterator.hpp
5fc9ef2b add detail/iterators/iteration_proxy.hpp
bf06cf6c add detail/iterators/iter_impl.hpp
3e65a652 add detail/iterators/internal_iterator.hpp
51ecc31d add detail/iterators/primitive_iterator.hpp
9ea25685 add detail/parsing/parser.hpp
3a0743db add detail/parsing/lexer.hpp
7ab3e8d7 add detail/parsing/input_adapters.hpp
21881606 add detail/conversions/to_json.hpp
e0c02c14 add detail/conversions/from_json.hpp
7056b375 add detail/value_t.hpp
8c555db9 add detail/exceptions.hpp
f364f5ac add detail/meta.hpp
d686713f add detail/macro_{un}scope.hpp
5bffc957 add json_fwd.hpp
3d7658da :construction: working on AppVeyor's errors
126ce2e5 :construction: further UBJSON
c9938ea8 :construction: started UBJSON implementation
15b6421d :white_check_mark: added UTF-8 decoder capability and stress test
78f8f837 added items() function #874
96b40b27 :memo: fixed Doxygen warnings
337e9824 Merge pull request #900 from Dobiasd/patch-1
ba231637 fix link to the documentation of the emplace function
a43347e1 Merge branch 'develop'
ce1dccf3 Merge branch 'release/3.0.1' into develop
5681e55d Merge branch 'release/3.0.1'
92484f0c :bookmark: set version to 3.0.1
ebc6849b :white_check_mark: added test for #894
3c76ff35 :memo: updated docs after PRs
d45183d4 Merge branch 'develop' of https://github.com/nlohmann/json into develop
3b3b6e8e :ambulance: fix for #894
f28fc226 Merge pull request #858 from mattismyname/develop
72bff90e :wrench: Fix up a few more effc++ items
3113a52a :memo: added exception 403 to documentation of at (#888)
184e9c6a Merge pull request #885 from TinyTinni/develop
d1cda688 includes CTest module resp. BUILD_TESTING option
88ddb12a :memo: fix for #883
e54b6ace Merge pull request #882 from erengy/fix-msvc-c4819
ab0e8b2f Fix MSVC warning C4819
1ca6ec1d Merge pull request #880 from nlohmann/coverity_scan
1856f38c :memo: removed paragraph on version 3.0.0
afebb6a3 Merge branch 'release/3.0.0' into develop
9f81beb5 Merge branch 'release/3.0.0'
106f9f54 :arrow_up: updated git-update-ghpages script
9eb5e2c2 :bookmark: set version to 3.0.0
9e3c4ad1 :bookmark: set version to 3.0.0
314e4e76 :memo: improved documentation for dump and iterator_wrapper
9a51fb4d :rotating_light: fixed some warnings
7bf007f2 Merge pull request #879 from nlohmann/feature/algorithms
980795b6 :pencil2: fixed typos
f3bd755c :heavy_minus_sign: removing <iomanip> header
4c871c58 :white_check_mark: re-added tests for algorithms
c23f5dce :memo: fixed year
2e1b1061 Merge pull request #875 from nlohmann/feature/spelling
261caec2 :busts_in_silhouette: added contributor image
f80827d0 Merge pull request #873 from nlohmann/feature/issue872
9a70c60f Revert ":arrow_up: updated to Catch 2.0.1"
fb8482db :ok_hand: fixed some issues from the last commit #875
c6e7eae3 :sparkles: implemented JSON Merge Patch (RFC 7396)
920f64c0 :arrow_up: updated to Catch 2.0.1
293748a9 :memo: overworked README
e8d9963a :ok_hand: cosmetic changes and overworked spelling
a9a4ff61 :rotating_light: remove C4996 warnings #872
f7ae143a Merge pull request #870 from nlohmann/feature/issue838
8419bfbb :white_check_mark: improved test coverage
569d275f :boom: throwing an exception in case dump encounters a non-UTF-8 string #838
383743c6 Merge pull request #868 from nlohmann/feature/issue867
7de009ed :pencil2: fixing typos #869
772bb3cc :memo: fixing documentation #867
06939452 Merge pull request #860 from bogemic/std_iterator_conformance_cpp17
64d6daa7 iter_impl template conformance with C++17
7c2d4f18 :construction_worker: added Xcode 9.1 and 9.2
9e2f185a :lipstick: reformatted code after PRs
c5e73177 Merge pull request #856 from bogemic/std_allocator_conformance_cpp17
25d205c1 :memo: clarified difference between serialization and string value retrieval #853
fa76f2ef Merge pull request #855 from theodelrieu/fix/cmake_include_directories
8890b935 fixed merge conflicts
daba1b6a fixed conformance with C++17, some members of allocator are depricated and should be used via allocator_traits
0e3a0b73 Merge pull request #854 from theodelrieu/fix/force_msvc_stacktrace
541ee62a cmake: use BUILD_INTERFACE/INSTALL_INTERFACE in target_include_directories
c9a02cbc to/from_json: add a MSVC-specific static_assert to force a stacktrace
f4c01601 Merge pull request #844 from TinyTinni/develop
24fe572d missing new line
8e9a8792 moved natis to root dir
af775ddb add compiler & cmake version check
48d7a32d add .natvis for MSVC debug view
5b4855de fix targetname
cc937dea :ambulance: the last commit contained a bug #821
430f0351 :rotating_light: fixed some warnings #821
ea5aed07 Merge branch 'feature/to_array' into develop
de75cf89 :white_check_mark: improved test coverage
52ca35b2 Merge pull request #829 from jowr/patch-1
7b8ddadd removed hunter badge
b5ddd99a Updated hunter package links
4c4f60f4 :memo: fixes #820
1af5601a Merge pull request #811 from Itja/patch-1
e423aea6 Typos README
5696660e :hammer: another try to fix #714
c4d66267 :rocket: installed Request Info Bot
6d2981db :memo: overworked templates
87df1d67 Merge branch 'develop' of https://github.com/nlohmann/json into develop
fa1425b8 :rocket: installed Sentiment Bot
73d00951 Merge pull request #807 from theodelrieu/fix/805
4b46abf9 add forwarding references to json_ref constructor
8e067c0c :hammer: set bidirectional iterator tag #593
cea3f24f :memo: comment to address #561
61cc07ff :memo: some documentation
734e2b73 :hammer: cleanup
7820b5ec :memo: thanks for #795
77f8e2f9 Merge pull request #795 from jseward/develop
c215b779 :rocket: installed Stale Bot
992c836b Add missing spaces
715c98b4 Remove extra spaces
6c9a401e Remove old non-perfect forwarding find and count
16ffdbcb Remove c++17 support flag in cmake
73b1629a Remove tabs for spaces
1b1bd0e3 :rewind: #714 is still not fixed
33c6511d Remove JSON_HAS_STRING_VIEW
89650c99 :construction: checking if #714 is now fixed with MSVC
b0c380b0 :memo: cleanup after the last PRs
be4fba7b Merge branch 'develop' of https://github.com/nlohmann/json into develop
f193427e :hammer: some simplifications
24b6e028 :white_check_mark: improved test coverage
30946404 Merge pull request #764 from pjkundert/develop-simplify-istream
ef40673a Merge branch 'develop' into develop-simplify-istream
d468f8c4 Use consistent logic to determine if string_view exists
59cde1ad Fix for _HAS_CXX17 == 0
1a666799 Add string_view support
33df3250 Merge pull request #793 from sonulohani/develop
92da3348 Error : 'identifier "size_t" is undefined' in linux
2e281ba6 Merge pull request #788 from jseward/develop
a99fcb4e Add comments and newline
917d9d8b Fix Visual Studio 2017 warnings
7c8f0a41 Merge pull request #785 from jseward/develop
b27a142e Merge pull request #783 from eld00d/patch-1
a8cc7a1b Consistently use std::char_traits int_type-->char conversion intrinsics
af990907 Disable warning C4389: '==': signed/unsigned mismatch
8ba7f69a Fix whitespace
8a4af820 Fix warning C4706
19f8f1c0 Add missing "u8"
5ec44fe9 Add /W4 for MSVS
727ee7d0 Set GENERATE_TAGFILE in Doxyfile
d300a8e2 :rotating_light: fixed warnings #776
0b803d0a Simplify the json/src/benchmarks.cpp to allow more optimal code gen. o For some unknown reason, the complexity of the benchmark platform   prevented some C++ compilers from generating optimal code, properly   reflective of the real performance in actual deployment. o Added the json_benchmarks_simple target, which performs the same   suite of tests as json_benchmarks. o Simplified the benchmark platform, and emit an "Average" TPS   (Transactions Per Second) value reflective of aggregate parse/output   performance.
23440eb8 Remove outdated commentary about the value of eof(), retain input type o We assume the same character int_type as the unerlying std::istream o There are no assumptions on the value of eof(), other than that it   will not be a valid unsigned char value. o To retain performance, we do not allow swapping out the underlying   std::streambuf during our use of the std::istream for parsing.
45e1e3d4 Revert some unnecessary member initializer changes.
5e480b56 Further simplify character type handling
1b43a45b Implement correct handling of std::streambuf int_type, eof() o Make no assumptions about eof(), other than that it is somewhere   outside of the valid range of char_type.
184dab60 Accelerate access to underlying std::istream streambuf
f775922c Specify initializers for yytest, token_string using initializer-lists o We can retain -Weffc++ and specify default initializers by using   initializer lists.  The risks are low (of additional non-conformat   compilers), because there is already one other such initialization   used in the code-base.
546e148b Further performance improvements, and corrections in get_token_string o An (-'ve valued, typically -1) EOF must never be allowed in   token_string, as it be converted to 255 -- a legitimate value. o Comparing against a specific eof() (-1, typically) is more costly than   detecting +'ve/-'ve.  Since EOF is the only non-positive value allowed   we can use the simpler test. o Removed unnecessary test for token_string size, as it is already   tested in the method, and must never occur in correct code; used an   assert instead.
8665e259 Rename get_string to move_string to imply side-effect
e0d890cc Corrected unnnecessary const restriction on returned std::string
97a38880 Improve performance by constructing yytext as a std::string o Return its contents when necessary.  In many cases, this avoids   construction of multiple copies of the yytext token.  Exceeds   performance of current develop branch.
7c523338 Remove unnnecessary NUL termination of yytext (as it may contain NULs)
14ca1f6f Restore istream performance #764 o Use std::streambuf I/O instead of std::istream; does not maintain   (unused) istream flags. o Further simplify get/unget handling. o Restore original handling of NUL in input stream; ignored during   token_string escaping.
12efeadc Further simplify istream handling; use native unget
f585fe4e Test to confirm parsing of multiple JSON records in a istream #367
90adf6ec Simplify get_token_string, unnecessary buffering, handle Byte Order Mark
0c0851db :memo: comment how to integrate tsl::ordered_map (#546)
bab4a157 :memo: comment how to integrate fifo_map (#485)
60439aff :memo: different cmake call
73d1b55a :wrench: executing tests in parallel
61536644 :wrench: removing -Weffc++ warnings
73727c98 Merge branch 'feature/coveralls' into develop
75f4678b :hammer: added filter script for branch coverage
c204ac82 :hammer: adjusted Coverity script to work without Makefile
7b82e4b4 :hammer: added Makefile target to calculate lcov coverage
1b3df3a6 :hammer: trying to use Coveralls with CMake #698
99ee4c1e :hammer: cleaned up Makefiles and docs #698
5cb6d718 :rotating_light: fixing last warning in #755
4e81c1db Merge pull request #765 from nlohmann/feature/issue698
e2045eae :checkered_flag: and another try
a85bc358 :checkered_flag: another try
3457e7bc :checkered_flag: try to get MSVC 2017 running again
54bd1b51 Merge branch 'develop' into feature/issue698
7435d54e :hammer: clean up
49122314 Merge branch 'develop' into feature/issue698
b91805e1 :rotating_light: removing a compiler warning #755
f89f8b2d Merge branch 'develop' into feature/issue698
8be303d4 :checkered_flag: fixing a min() call for MSVC #762
1df836ce :rewind: removed call to std::signbit #761
8af49d4b :rotating_light: removing compiler warnings #755
1a66527d :memo: fixed documentation #745
b05ea3de Merge pull request #753 from gregmarr/patch-1
ec60ff34 Add info for the vcpkg package.
647711fa :white_check_mark: improved test coverage
737816d0 :construction_worker: another try with Travis
e75adc21 Merge branch 'develop' into feature/issue698
b90529c3 :white_check_mark: improved test coverage
82c93680 Merge branch 'develop' into feature/issue698
e2e0ecd8 :white_check_mark: improved test coverage
248db1e4 Merge branch 'develop' into feature/issue698
74107637 :white_check_mark: improved test coverage
cafc2d05 Merge branch 'develop' into feature/issue698
da97cf78 :white_check_mark: improved test coverage
295d65ad Merge branch 'develop' into feature/issue698
fcba9ec5 :hammer: clean up
41994ba0 Merge branch 'develop' into feature/issue698
b21d7810 :white_check_mark: improved test coverage
c1d64785 Merge branch 'develop' into feature/issue698
9ae6796a :white_check_mark: improved test coverage
31ce7e1e Merge branch 'develop' into feature/issue698
fd250ae2 :white_check_mark: improved test coverage
5c08b84d :rewind: back to previous MSVC 2017
da14286a :construction_worker: try to use MSVC 2017 again
c607b5c2 :memo: improved documentation
91e00328 :memo: improved documentation
b41b1304 :construction_worker: removed unneccessary test
15e757c4 :hammer: trying to fix memory issue with valarray
0e94ba88 :construction_worker: using the same compilers
4f5c3458 :construction_worker: run sanitizer another time to check if it works
8608f421 :construction_worker: trying to use libstdc++
5e7acbf0 :construction_worker: adjusted flags for Clang sanitizer
268f5a3d :construction_worker: added option to switch off exceptions
839681ff :construction_worker: using Ninja
3dcd3601 :construction_worker: adding status messages
05b97c47 :construction_worker: added flags for Valgrind and Clang sanitizer
c87b080c :construction_worker: new cmake file for test cases
5b71bf09 Merge pull request #708 from theodelrieu/fix/from_json_tuple_pair
bb1b4c93 fix from_json implementation for pair/tuple
e45eaf6e Revert ":construction_worker: using libc++ with Clang"
0b5e8f85 :hammer: cleanup
9fd031b6 :bug: re-added support for std::valarray #702
41b2c69b :construction_worker: using libc++ with Clang
cd537909 :construction_worker: using Clang 5.0
e569b973 :construction_worker: trying to fix build error
ba5d37ba :construction_worker: added Clang 5.0 (see https://docs.travis-ci.com/user/languages/cpp/#clang)
64ef100e Revert ":boom: changed iterators to andom_access_iterator #593"
8acaf5bd :rotating_light: fixing two compiler warnings
c77a0be5 :boom: changed iterators to andom_access_iterator #593
aba8b584 :hammer: approach to un-break the changes for #462
22b59…
jcfr added a commit to jcfr/SlicerJupyter that referenced this issue Apr 28, 2020
List of changes:

$ git shortlog v3.1.1..v3.7.3 --no-merges
0xflotus (1):
      did you mean 'serialization'?

Andreas Schwab (1):
      Do proper endian conversions

Anthony VH (1):
      Moved test for #1647 regression to regressions file.

Anthony Van Herrewege (3):
      Fix #1647: non-member operator== breaks enum (de)serialization.
      Add test for #1647.
      Don't capture json input by value (fixed #1822).

Antonio Borondo (6):
      Fix warning
      Generate header
      Change implementation to use templates
      Fix error: explicit specialization in non-namespace scope
      Fix error: 'wide_string_input_helper' was not declared in this scope
      Remove anonymous namespace

Axel Huebl (7):
      CMake: 3.8+ is Sufficient
      Package Manager: Spack
      Fix EOL Whitespaces & CMake Spelling
      CMake: Optional Install if Embedded
      Remove EOL whitespaces in natvis
      merge_patch: rename parameter
      Amalgamate Headers

Ben Berman (3):
      Improve error messages for error 305
      Fix tests for improved error 305(hopefully)
      Replace "key-style argument" with "string argument"

Bruno Oliveira (1):
      Add instructions about using nlohmann/json with the conda package manager

Camille Bégué (2):
      Fix issue #1805
      Add restriction for tuple specialization of to_json

Carlos O'Ryan (1):
      Fix trivial typo in comment.

Chris Harris (1):
      Patch nlohmann/json for GCC 4.8

Chuck Atkins (8):
      Make the CMake install dir user-configurable
      Enable target namespaces and build dir project config
      Use a version check to provide backwards comatible imported target names.
      cmake: fix package config to deal with versioning and namespaces
      cmake: add import config tests
      docs: add a note in the readme about using the CMake imported target
      Turn off additional deprecation warnings for GCC.
      docs: Add additional CMake documentation

Danielc (1):
      fixed compile error for #1045; to_json for iternation_proxy_internal was needed

David Avedissian (3):
      Implement SFINAE friendly iterator_traits and use that instead.
      Changes requested from code review.
      Code review.

David Guthrie (1):
      Reordered the code. It seems to stop clang 3.4.2 in RHEL 7 from crashing intermittently.

Dennis Fischer (1):
      Export package to allow builds without installing

Eli Schwartz (2):
      release: add singleinclude and meson.build to include.zip
      README: describe how to use json as a meson subproject

Elvis Oric (1):
      Disable installation when used as meson subproject. #1463

Evan Nemerson (1):
      Update Hedley to v11.

Ferenc Nasztanovics (1):
      Change macros to numeric_limits #1483

Florian Pigorsch (1):
      Fix some spelling errors - mostly in comments & documentation.

Gregorio Litenstein (1):
      Thirdparty benchmark: Fix Clang detection.

Guillaume Racicot (10):
      basic_json now supports getting many type of strings
      Amalgamated headers
      Amalgamate single include
      Added test for conversion to string_view
      Added test for string conversion with string_view
      Disabled implicit conversion to string_view on MSVC 15.13 and older
      Set MSVC version from 1514 and older
      Re-added external_constructor with string compatible types
      Aligned template declaration
      Fixed check for compatible string type

Henry Fredrick Schreiner (1):
      Adding 4.8 test to travis

Hyeon Kim (2):
      Add new JSON_INTERNAL_CATCH macro function
      Fix #1213

Isaac Nickaein (29):
      Specify target platform in generator name
      Increase stack size for VS2017 Win x64 on Appveyor
      Improve dump_integer performance by implementing a more efficient int2ascii
      Add benchmark for small integers
      Add unit tests for dump_integer
      Add unit test for parsing deeply-nested array
      During destruction, flatten children of objects to avoid recursion
      Fix documentation
      Implement contains() to check existence of a key
      Add unit-test for contains() member function
      Fix typo in README.ME
      Fix broken links to documentation
      ✏️ Fix a typo in README
      ✏️ Fix brew instructions in README
      ✏️ Fix links to create an issue page
      Add Debug builds for AppVeyor
      Increase timeout of test-unicode_all in Debug build
      Add a separate build with Windows.h included
      Workaround msvc2015 bug with explicit copy-constructor for const_iterator
      Avoid collision of ::max with windows.h macro
      Appveyor: Set build mode explicitly
      Appveyor: Set timeout of unit-tests in appveyor.yml instead of CMake
      📝 Improve doc on const_inter constructor
      CI: Skip test-unit_all on MSVC Debug builds
      Reduce depth in unit-test to avoid choking valgrind
      Move deep JSON test to a separate unit-test
      Remove harmful vector::reserve during destruction (#1837)
      Cleanups
      Reserve stack only for top-level items

Ivor Wanders (1):
      Use C++11 features supported by CMake 3.1.

James Upjohn (1):
      Fixed incorrect version number in README

Jan Schöppach (2):
      Fix typo
      Fix typo in single_include, too

Jef LeCompte (1):
      Updated year in README.md

Jonathan Dumaresq (12):
      Add the possibility of using FILE * from cstdio library to read a file. This enable the possibility of using low eand device with this library.
      Add the possibility of using FILE * from cstdio library to read a file. This enable the possibility of using low eand device with this library.
      remove non usefull code. Add small description
      remove non usefull code.
      add tests to cover the new input adapter
      new unified json.hpp generated with make amalgamate
      remove comment
      remove the const attribute
      refactor unit test in case of throw, the fclose will not be called. using unique_ptr with custom destructor will ensure that
      create single json.hpp file
      use namespace std when possible. Change the name of private variable.
      Forget one std::FILE

Julian Becker (27):
      BSON: serialization of non-objects is not supported
      BSON: Support empty objects
      BSON: Object with single boolean
      BSON: support doubles
      BSON: Support objects with string members
      BSON: support objects with null members
      BSON: support objects with int32 members
      BSON: support objects with int64 members
      BSON: unsigned integers
      BSON: support objects with objects as members
      BSON: test case for a more complex document
      BSON: Support for arrays
      BSON: Bugfix for non-empty arrays
      Fix: Add missing `begin()` and `end()` member functions to `alt_string`
      BSON: Added test case for the different input/output_adapters
      BSON: Fixed hangup in case of incomplete bson input and improved test coverage
      BSON: Extend `binary_reader::get_number` to be able to hanlde little endian input to get rid of `binary_reader::get_number_little_endian`
      BSON: Reworked `binary_reader::get_bson_cstr()`
      BSON: Improved documentation and error handling/reporting
      BSON: Reworked the `binary_writer` such that it precomputes the size of the BSON-output. This way, the output_adapter can work on simple output iterators and no longer requires random access iterators.
      BSON: allow and discard values and object entries of type `value_t::discarded`
      BSON: throw json.exception.out_of_range.407 in case a value of type `std::uint64_t` is serialized to BSON. Also, added a missing EOF-check to binary_reader.
      BSON: Adjusted documentation of `binary_writer::to_bson()`
      BSON: throw `json.exception.out_of_range.409` in case a key to be serialized to BSON contains a U+0000
      BSON: Hopefully fixing ambiguity (on some compilers) to call to string::find()
      BSON: fixed incorrect casting in unit-bson.cpp
      BSON: Improved exception-related tests and report location of U+0000 in the key-string as part of `out_of_range.409`-message

Julien Hamaide (2):
      Allow items() to be used with custom string
      Provide default implementation for int_to_string, but allow for overloaded function

Julius Rakow (4):
      meson: fix include directory
      meson: add multiple headers target
      📝 link to cppreference via HTTPS
      📝 fix links to cppreference named requirements

Kevin Tonon (2):
      Using target_compile_features to specify C++ 11 standard
      Update CMake to latest on Travis

Konstantin Podsvirov (1):
      Package Manager: MSYS2 (pacman)

Kostiantyn Ponomarenko (2):
      Add version and license to meson.build
      Add Meson related info to README

Laurent Stacul (1):
      Fix gcc9 build error test/src/unit-allocator.cpp (Issue #1472)

Macr0Nerd (2):
      Added to_string and added basic tests
      Added to_string (with ugly macro) and tests

Manvendra Singh (1):
      readme: fix typo

Mark Beckwith (2):
      typo in README
      docs: README type

Matthias Möller (3):
      remove stringstream dependency
      typo
      added char cast

Matěj Plch (1):
      remove extra semicolon

Michael Gmelin (2):
      Make section names unique in loops, as catch doesn't support duplicate sections, see also catchorg/Catch2#816 (comment)
      Exclude bytewise comparison in certain tests. These tests never worked - they weren't run before d5aaeb4.

Michele Caini (3):
      Fixed broke links to RFC7159
      Fixed broken links to operator[]() and at()
      Fixed broken links in the README file

Miguel Sacristan (1):
      Fix and add test's for SFINAE problem

Mike Bogdanov (2):
      pvs_studio fix. misprinted condition
      did make amalgamate

Millian Poquet (1):
      :meson: install headers + pkg-config

Niels Lohmann (343):
      ✨ added a SAX parser #971
      🔨 fixed test cases to be more robust
      ✅ added more tests for SAX parsing
      🔨 removed a logic error and improved coverage
      👌 fixed some compiler warnings
      📝 overworked README
      ♻️ refactored SAX parser
      🔨 added a SAX-DOM-Parser
      🚨 fixed a linter warning
      💚 fixed test case
      🔨 added error messages to SAX interface
      🔨 added SAX-DOM-Parser
      🔨 simplified SAX-DOM parser
      🔨 using the SAX-DOM parser
      💚 added regression tests for #972 and #977
      ♻️ refined SFINAE to fix some warnings
      💚 added another test case
      🔥 replaced acceptor with SAX parser
      👌 fixed some more warnings
      🔨 trying to fix the leak
      🔥 removing failing test (work on this in branch "leak")
      🚑 hopefully fixed the memory leak
      📝 cleanup after #1001
      👌 made changes proposed in #1001
      💚 improved test coverage
      ♻️ refactored binary readers to use a SAX parser
      🔨 cleaner exception interface
      📝 thanks for #1006
      ♻️ adjusting lexer/parser in symmetry to #1006
      🔨 fixed compilation error
      🏁 fixed an MSVC warning
      🏁 experimenting with /Wall
      🏁 moved /Wall to CMake
      ⏪ oops
      🔖 set version to 3.1.2
      🔖 set version to 3.1.2
      ♻️ implemented a non-recursive parser
      ✅ improved test coverage
      🔨 cleanup
      🚧 started a SAX/DOM/callback parser
      🔨 some refactoring
      ♻️ proper use of SAX parser for binary formats
      ✨ implemented non-throwing binary reader
      ✅ improved test coverage
      📝 updated documentation
      ✅ more tests
      ✅ improved coverage
      ✅ improved test coverage
      🔨 changed SAX interface
      🚑 fix for #1021
      🔨 improved code #1021
      🔨 realized callback parser wirh SAX interface #971
      📝 fixed example for operator> #1029
      💚 fixed Valgrind options #1030
      🔨 using a vector<bool> for the parser hierarchy
      🔨 cleanup
      🚧 added input adapter for wide strings #1031
      🔨 trying to make tests run with MSVC #1031
      🔨 trying to make tests run with MSVC #1031
      👌 fixed compiler warnings #1031
      ✅ improved test coverage #1031
      🔨 removing unget_character() function from input adapters #834
      🔨 cleanup
      🚑 fixed commit 1e08654
      💩 first try on #1045
      👷 added Xcode 9.3 builder
      📝 updated THANKS list
      🔥 removed commented-out test cases #1060
      📄 added SPDX-License-Identifier
      📝 added public key used for commits and releases
      🔧 update issue templates
      🔥 removed old issue template
      Update issue templates
      🔨 removed unget function for wstring parsers
      🚑 fixed error in callback logic
      ✅ added more tests from recent nst's JSONTestSuite
      ✅ adjusted test cases
      ⚡ keys are now returned as const reference #1098
      👌 mitigating cppcheck bug #1101
      🔨 only calculate array index string when needed #1098
      📝 added documentation
      🚑 adjusted Fuzzer to new parser
      📝 documentation to avoid future issues like #1108
      💄 cleanup
      📝 documentation fix
      📝 fix for #1052 #1139
      🚨 removed compiler warnings
      🚨 fixed more compiler warnings
      🚨 fixed more compiler warnings
      👷 tryping different platforms for AppVeyor
      🔨 small refactoring to improve branch coverage
      💄 fixed indentation
      👷 experimenting with AppVeyor and MinGW
      👷 forgot quotes
      👷 set build type
      👷 using help from https://stackoverflow.com/a/48509334/266378
      👷 forgot old PATH
      👷 trying a more recent compiler
      🔨 fixed escaping for MinGW
      👷 using Ninja to speed up build
      👷 choosing correct image
      📝 mentioned MinGW in README
      🔨 added macro to disable compiler check #1128
      🔨 cleanup after #1134
      📝 added note about CocoaPods #1148
      🏁 fix for #1168
      🚑 fix for #1169
      🏁 trying to fix C2440 error
      🏁 implicit conversion is not allowed with MSVC
      👷 added more CI workers
      👷 added more CI workers
      📝 updated documentation of used compilers
      🎨 reindented code
      🚨 fixing a MinGW warning #1192
      🔨 fixed a MinGW error #1193
      🚨 fixed some compiler warnings
      📝 overworked documentation
      🐛 fixed callback-related issue (nlohmann/json#971 (comment))
      🚨 fixed a compiler warning
      📝 release preparation
      ⬆️ Catch 1.12.0
      📝 added example for sax_parse
      🔖 preparing 3.2.0 release
      🔨 fixed amalgamation
      🔖 set version to 3.2.0
      🚨 fixed a compiler warning #1224
      🎨 cleanup after #1228
      👷 adding Xcode 10 worker
      📝 added lgtm.com badge
      🚨 fixed a compilation issue with ICPC #755
      🚨 fixed a compilation issue with ICPC #755
      📝 added Wandbox link #1227
      📝 added Wandbox link #1227
      💄 cleaned code
      📝 updated contributor list
      📝 small update to pass test suite
      🔖 set version to 3.3.0
      🔖 set version to 3.3.0
      🚨 fixed some linter warnings
      🚨 fixed another linter warning
      ♿ added line positions to error messages
      🐛 fixed a bug in the unget function
      🚨 fixed some clang-tidy warnings
      🚨 fixed some more clang-tidy warnings
      📝 fixed documentation
      🚑 fixed compilation error
      ♿ improved parse error messages
      🚑 fixed compilation error
      🚧 proposal for different error handlers #1198
      ♿ improved error messages for binary formats #1288
      🚧 overworked error handlers #1198
      💚 added tests #1198
      🚧 respect ensure_ascii parameter #1198
      🚧 fixed an issue with ensure_ascii #1198
      🚧 fixed test cases #1198
      💚 additional tests from the Unicode spec #1198
      👌 replaced static_cast to CharType by conversion function #1286
      ✏️ fixed a typo #1314
      📝 added a note to the discussion #1286
      📝 updated documentation #1314
      🚧 some changes to the BSON code
      🔨 fixed fuzz code to avoid false positives in case of discarded values
      🎨 clean up binary formats
      🔨 added fix for arrays
      🚨 fixed compiler warnings
      🚨 fixed coverage
      👌 fixed comment #1320
      👌 added another conversion function #1315
      🚨 fixed another linter warning
      ✨ added NLOHMANN_JSON_SERIALIZE_ENUM marco #1208
      🚨 fixed another linter warning
      ⚡ replaced vector by array #1323
      🔨 small improvements
      🚨 fixed a linter warning
      🚨 fixed some more linter warnings
      🐛 fixed a bug parsing BSON strings #1320
      ✏️ fixed some typos
      📝 added examples for BSON functions
      🚨 fixed another linter warning
      💄 fixed indentation
      🚑 fixed #1319
      🔖 set version to 3.4.0
      🔖 set version to 3.4.0
      🚨 fixed a linter warning
      💄 cleanup
      🏁 adding parentheses around std::snprintf calls #1337
      🚨 fixed warning #1364
      🚨 fixed a warning
      🎨 fixed header
      📝 added contributors to 3.5.0
      🚨 fixed two warnings
      📝 update documentation
      📝 updated documentation
      📝 formatted picture
      📝 updated documentation for items() function
      🔖 set version to 3.5.0
      🚨 fixed some warnings
      🚨 fixed PVS V567 warning
      📝 added description on how to use NuGet package #1132
      ⬆️ upgraded Catch and Google Benchmark
      💡 improved documentation for parsing without exceptions #1405
      🚨 fixed another linter warning
      🔨 fixed includes
      🚨 fixed another linter warning #1400
      🚧 trying nodiscard attribute #1433
      🔨 trying code from https://godbolt.org/z/-tLO1K
      🐛 fixed integer overflow in dump function #1447
      🐛 added missing include #1500
      👷 trying new Travis workers
      💚 fix compiler selection
      📝 updated documentation of CI
      🚨 fix MSVC warning #1502
      👷 removing more retired Travis images
      🔥 removing Xcode 6.4 builder
      🚨 fixed some warnings
      🚨 fixed warnings
      🚨 fixed warnings
      🔥 removing unstable macOS builds on Traivs
      🚨 fixed more warnings
      ➕ adding cpplint
      🚨 adding targets for static analyzers
      🚨 fixed warnings
      ⬆️ updated Doxyfile
      👷 overworked clang-tidy target
      💚 fix CI and #1521
      📝 added documentation
      👷 added targets for infer and oclint
      🔨 clean up
      💚 forgot two semicolons
      🎨 cleanup
      📝 added documentation
      📝 updated documentation
      📝 completed documentation index page
      👥 added contributors
      🚨 fixed a warning
      🔖 set version to 3.6.0
      🔖 set version to 3.6.0
      💬 update issue templates
      🚨 fixed some warnings #1527
      ⚗️ added funding link
      🐛 fixed regression #1530
      🏁 fixed a compilation error in MSVC #1531
      🐛 fixed regression #1530
      🔖 set version to 3.6.1
      🏁 trying to use constructors from std::allocator #1536
      👷 trying doozer
      👷 added cmake
      👷 using raspbian
      👷 added Fedora and CentOS
      👷 add test output to avoid timeout
      👷 fixed buildenv values
      👷 fixed a typo
      👷 need more recent cmake for CentOS
      👷 use recent cmake
      👷 fixed syntax error
      👷 fixed installation
      👷 need to install g++
      👷 install correct g++
      👷 install g++
      👷 fixed package name
      👷 fixed paths
      👷 unified paths
      👷 fixed syntax
      👷 fixed timeout
      👷 increased timeout
      👷 fixed required packages
      👷 skip certificate check
      👷 forgot path to ctest
      👷 adding xenial-armhf
      👷 fixed timeout
      👷 version output
      📝 added Doozer to README
      🔧 overworked maintaner targets
      ⬆️ added script to update cpplint
      🎨 fixed indentation
      🔨 minor changes to maintainer targets
      🔥 removed unsupported flag
      ⚗️ trying fastcov
      🔨 using --exclude-gcov to exclude files
      👷 trying CircleCI
      👷 full workflow
      👷 fixed path
      👷 adding concurrency
      👷 Ninja seems not to work
      🔨 relaxed requirements to coverage
      🚨 silenced a warning
      🏗️ adding anonymous namespace
      ⬆️ updated fastcov
      ⬆️ updated fastcov
      📝 updated README
      🔨 small cleanup
      ⬆️ updated fastcov
      🔨 overworked coverage targets
      📝 mention 302 exception in value() documentation #1601
      📝 mention json type in documentation start page #1616
      ✨ add contains function for JSON pointers
      ✨ make emplace_back return a reference #1609
      ⚗️ add Hedley annotations
      🔨 add NLOHMANN_JSON prefix and undef macros
      🚨 fix warning
      🚚 rename Hedley macros
      🚧 add more annotations
      🚨 fix warnings
      📝 remove HEDLEY annotation from documentation
      🚨 fix compiler warnings
      🚑 fix compiler errors
      🚨 fix linter warning
      🔥 remove leftover file
      🔨 adjust paths
      🔨 adjust version
      🔨 fix release target
      Update Makefile
      🔖 set version to 3.7.0
      📝 update documentation
      📝 update documentation
      👥 update contributors
      🔒 add security policy
      👷 adjust maintainer scripts
      ✏️ fix a typo
      👷 try GitHub Actions
      👷 add test step
      📝 add OSS Fuzz status badge
      🚨 fix warning
      📝 add comment on JSON_THROW_USER, JSON_TRY_USER, and JSON_CATCH_USER
      👥 add CODEOWNERS file
      👥 update contributors
      🚨 fix UBSAN warnings
      📝 update examples
      🔊 add version output
      👷 add Xcode 10.2
      🔨 remove full path
      👷 add Xcode 10.2
      ⬆️ upgrade Doctest to 2.3.5
      🐛 fix conversion to std::valarray
      🚨 fix linter errors
      🚨 fix linter errors
      👥 update contributors
      🔖 set version to 3.7.1
      🚨 fix a linter warning
      🔨 add path
      🔖 set version to 3.7.2
      🎨 fix inconsistent operator style
      🔖 set version to 3.7.3

Patrick Boettcher (3):
      allow push_back() and pop_back() calls on json_pointer
      🚨 fixed unused variable warning
      JSON-pointer: add operator+() returning a new json_pointer

Pratik Chowdhury (1):
      Added Support for Structured Bindings

Sonu Lohani (1):
      Fixed compiler error in VS 2015 for debug mode nlohmann/json#1114

Taylor Howard (1):
      Added explicit converstion to std::string_view. Fixes failing test with GCC 8.3

Thomas Braun (15):
      .travis.yml: Add gcc 9 and compile with experimental C++20 support
      test/CMakeLists.txt: Remove trailing whitespace
      .travis/cmake: Rework clang sanitizer invocation
      input_buffer_adapter: Fix handling of nullptr input
      external_constructor<std::valarray>: Handle empty array properly
      .travis.yml: Increase the timeout to 45 minutes
      Fix outputting extreme integer values in edge cases
      Add regression test for dumping the minimum value of int64_t
      Add serialization unit tests for extreme integer values
      test/CMakeLists.txt: Use an explicit list instead of GLOB
      appveyor: Pass the generator platform explicitly
      test/cmake_import: Pass the generator platform required by MSVC 2019
      iteration_proxy: Fix integer truncation from std::size_t to int
      appveyor.yml: Add MSVC 16 2019 support
      appveyor.yml: Add debug build on x64 and VS 2019

Théo DELRIEU (32):
      missing CHECK_NOTHROW in unit-udt
      support construction from other basic_json types
      Provide a from_json overload for std::map
      from_json: add missing template arguments for std::map
      from_json: add overload for std::unordered_map
      run make amalgamate
      split meta.hpp, add detected_t (used to define concepts)
      use templates in the sax interface instead of virtuals
      remove no_limit constant and default values
      use abstract sax class in parser tests
      add static_asserts on SAX interface
      fix void_t for older compilers
      use detected instead of has_* traits
      refactor is_compatible_object_type
      refactor is_compatible_string_type
      refactor is_compatible_array_type
      refactor is_compatible_integer_type
      refactor is_compatible_type, remove conjunction & co
      do not check for compatible_object_type in compatible_array_type
      refactor from/to_json(CompatibleArrayType)
      make to_json SFINAE-correct
      make from_json SFINAE-correct
      remove now-useless traits. check for is_basic_json where needed
      Fix issue #1237
      Add basic_json::get_to function.
      add constraints for variadic json_ref constructors
      add new is_constructible_* traits used in from_json
      add a note to maintainers in type_traits.hpp
      recommend using explicit from JSON conversions
      make sure values are overwritten in from_json overloads
      add built-in array support in get_to
      tests: fix coverage

Tommy Nguyen (1):
      Use GNUInstallDirs instead of hard-coded path.

Tsz-Ho Yu (1):
      Fix -Wno-sometimes-uninitialized by initializing "result" in parse_sax

Viktor Kirilov (1):
      Update CMakeLists.txt

Vitaliy (4):
      test (non)equality for alt_string implementation
      define global operator< for const char* and alt_string
      forward declarations to make new compilers happy
      simplify templates for operators, add more checks

Vitaliy Manushkin (5):
      dump to alternate implementation of string, as defined in basic_json template
      dump to alternate implementation of string, as defined in basic_json template (changes to amalgamated code)
      forward alternative string class from output_adapter to output_string_adapter
      add unit test: checking dump to alternative string type
      test refactoring

Watal M. Iwasaki (1):
      Remove C++17 extension warning from clang; #1535

Wilson (1):
      Make integration section concise

Xav83 (3):
      Correct a warning from cppcheck:
      Correct a warning from cppcheck:
      Runs make amalgamate on the project.

Yann E. MORIN (1):
      buildsystem: relax requirement on cmake version

christian (1):
      Make json_pointer::back const (resolves #1764)

garethsb-sony (5):
      Add operator/= and operator/ to construct a JSON pointer by appending two JSON pointers, as well as convenience op/= and op= to append a single unescaped token or array index; inspired by std::filesystem::path
      Attempt to satisfy Coveralls by adding a test for (unchanged) operator std::string
      Rename private json_pointer::is_root as public json_pointer::empty for consistency with std::filesystem::path
      Add json_pointer::parent_pointer (cf. std::filesystem::path::parent_path)
      Tests for json_pointer::empty and json_pointer::parent_pointer

kevinlul (3):
      Fix #1642
      Add regression tests for #1642
      Remove boolean regression test for #1642

kjpus (1):
      Link to issue #958 broken

knilch (1):
      unit-testsuites.cpp: fix hangup if file not found

lieff (1):
      fix GCC 7.1.1 - 7.2.1 on CentOS closes nlohmann/json#670

mandreyel (1):
      Move lambda out of unevaluated context

martin-mfg (1):
      fix typo in readme

mefyl (1):
      Set eofbit on exhausted input stream.

njlr (1):
      Update README.md

onqtam (9):
      moved from Catch to doctest for unit tests
      fixing osx builds - had forgotten to define this for the object file where the test runner is compiled
      this should really fix the XCode 6/7 builds
      updated doctest to version 2.3.1 released today
      reverted the removal of this if/else branching - this is the easiest way to get -std=c++0x support
      fixed a bunch of warnings from the Makefile from the root of the repo
      finished the last of the warnings
      tabs instead of spaces...
      fixing the remaining of the pedantic gcc/clang target warnings

past-due (1):
      Disable -Wmismatched-tags warning on tuple_size / tuple_element

scinart (3):
      flush buffer in serializer::dump_escaped case UTF8_REJECT
      fix typo
      move newly-added tests in unit-regression.cpp

whitesource-bolt-for-github[bot] (1):
      Add .whitesource configuration file
victorxcl added a commit to victorxcl/CLIPS-unicode that referenced this issue Jun 29, 2020
972d6a3842 1. 将CLIPS的代码(包含扩展)做成了CMakeLists.txt的模式:便于多项目之间自动管理依赖和链接:)
3c5a3237ad 1. 清理了xclips的冗余花括号;)
b475573a4b 1. xclips的扩展zmq发送数据的长度不正确的BUG得到了修复:) 2. xclips的zmq扩展添加了一个zmq_close函数:)
0d06803c41 1. 补充了一个macos遗漏的xcconfig数据
b7884259b2 1. 将在xcode里面配置的各种项目属性拿到了独立的xcconfig文件中:这样后面类似的项目使用起来更方便:)
01b78370fc 1. 将CLIPS扩展里面的CLIPS协议更换为SEXP协议,同时将read-clips修改为read-sexp:这样,就可以用到CLIPS之外的LISP语言上:)
1d04fcff41 1. 完善了CLIPS的JSON扩展的value_for_path和set_value_for_path函数:)
6ccbcfcfe5 1. CLIPS的JSON扩展库,第一次编译测试通过了;)
187a3624a1 1. 给socket的扩展添加了block_reading的读取功能:实现【等待】能力;)
243f672a5d 1. 添加了zmq扩展的version函数;)
a58373b275 1. 给zmq的扩展添加了RAW的protocol
5c8b442d8c 1. 删除router的回显显示:这是多余的操作,用户可以自己来操作
c0f2d17728 1. socket可以发送任意的子节序列了:将之前的protocol从socket里面剔除了;同时读取的时候,不会发生阻塞了;)
873e4d9283 1. 修正了uuidgen的编译错误:因为我clips.h头文件里面定义了太多的【短宏】和boost的uuid库里面的LHS和RHS冲突了!
8fcd588bf6 1. 给CLIPS的扩展添加了一系列的utility函数:)
5481c08a71 1. 添加了expand-for-eval和expand-and-eval两个函数:但是有些限制,暂时没用上:(
8607930317 1. 添加了read-until的CLIPS扩展函数:主要用于process的处理:)
e6ca7a0ef3 1. 用宏的方式来简化了CLIPS扩展的代码量:主要是重复代码
9c0361dd82 1. 发现了一处zmq解析协议的BUG:需要同时支持CLIPS和JSON格式:)
0041fc0f82 1. 添加了process的terminal的支持:使得CLIPS可以直接利用第三方的命令行工具作为自己的子函数(微服务):O) 2. 结果process的system-output函数也做到process模块里面了;) 3. 修复了一个clips::boolean类型的一个bug
9037810238 1. 重命名read-system为system-output:语义更加明确
b0757bba84 1. 调整了CLIPS的扩展,使其能够在iOS下也能正常工作了;)
1b2f1be749 1. 添加了read-system的函数:能够从命令行的输出中返回结果了;)
d5a4c88c4a 1. 添加了boost_1_73_0的代码:)
dedb452bfd 1. 关闭了一处CLIPS扩展的日志输出
c08ab5dafd 1. 给CLIPS扩展添加了mustache_render_with_partials函数:用于使用mustache模版引擎的partials功能:) 2. 重命名test-bench-execute为:test-benchmark:)
6af0c40726 1. 添加了CLIPS扩展支持的协议:CLIPS和JSON两种协议:)并改善了错误报告:)
bd391aa7c5 1. 修正了CLIPS的String扩展在输出给router时候的问题:之前只处理了输入,现在处理输出
71bfba3252 1. 将readcommand调整为read-command:这样就和CLIPS的read-number的习惯吻合了;)
cfb3ad7811 1. 给CLIPS的扩展添加了readcommand命令:用于读取一个完整的command:在使用ZMQ和socket的时候很必要:)
487dabcb55 1. CLIPS的socket扩展也能够一次读取一个完整的命令了;)
8182908268 1. 现在ZMQ的CLIPS绑定已经可以按照CompleteCommand的方式来缓存一个完整的命令在发送出去了;)
51177fed47 1. 给CLIPS的String的词法在只有【双引号】的基础上添加了【反引号】【单引号】功能支持:尽量减少了使用【 斜杠\】转义的需求!
a5c9065cbe 1. 给CLIPS扩展添加了mustache的模版引擎支持:)
84a678c09b 1. 成功的引入了ZMQ的功能到CLIPS扩展中:)
fd2d7f74dc 1. 发现CLIPS的API里面的argumentCode和expectBits有关系,但是并不一样!!!
013f018f34 1. 发现了测试中的一些bug:对CLIPS的扩展的test_bench功能进行了测试:)
791cd81896 1. 重命名select_action为create_primitive_value:更加贴近具体的意义
f37bdc52fb 1. CLIPS的扩展终于完全正确了:(read)已经可以读取到正确的值了:)之前没有使用RouterUnreadFunction
9b102f94bb 1. 清理了clips扩展中的不需要的内容
8c5f26bb33 1. boost::asio的socket添加到了CLIPS中:也就是说,从今以后,xclips可以直接使用网络了;)
d6fa51b303 1. 改写了clips.hpp和clips.cpp文件,首次支持了network的router功能:还未经过严格的测试!
9d31a33723 1. 添加了libzmq的ios版本的ignore描述
ed464d0dc0 1. 添加了mstch.git的submodule:git的submodule被提交了;)
c0b533a865 Merge commit '7f82b73a2f035d403a7130fc1f24af8bdea2603d' as 'lib3rd/mstch.git'
7f82b73a2f Squashed 'lib3rd/mstch.git/' content from commit 0fde1cf94
774da9e0ef 1. 添加README的内容描述了mstch.git的subtree和submodule:)
77f83483f2 1. rpc.git子模块的路径错误:删除之!
a6c208be67 1. 添加了rpclib.git的子模块:)
3859c03acd Merge commit '2c2a7ed46e66d3f950e8b6a7535a426d74e9ba05' as 'lib3rd/grpc.git'
2c2a7ed46e Squashed 'lib3rd/grpc.git/' content from commit c07ddb4504
8f9fb5bb54 1. 添加了grpc的子模块 2. 添加了备注到README
e36912c152 1. 确保CLIPS_unicode的clips_core_6_40在macOS和iOS下都可用:主要区别是system函数,iOS下不可用
3424cfdfa5 Merge commit 'ddec83cd12c8291848d6f0fffffd2d6632d46f4c' as 'lib3rd/nlohmann-json.git'
ddec83cd12 Squashed 'lib3rd/nlohmann-json.git/' content from commit 456478b3c
2e40a6d3ae 1. 忽略了libzmq.git和rttr.git的build文件:)
243f5ce3a3 1. 调整了yoga.git的编译选项:使得其能够在iOS和macOS下都能够使用:)
4144a547fa 1. nlohmann-json.git的subtree制作错误:需要修正!
56385dfb0c 1. 修正GraphViz的sincos链接的问题:系统的sincos是C++的Symbol,C暂时不能用!!!
5c752390a7 1. 调整GraphViz的plugin代码从【SHARED】改为【STATIC】形式:且在xcode的linker中添加【-all_load】链接选项;然后将union_find.c从libspine.a中剔除(和libcommon.a重复了),终于链接通过了:)
9fa0502000 1. 修改graphviz.git的subtree代码:使其能够在macOS和iOS下正常使用:)
d22bbd6573 1. 添加了boost_1_72_0的源代码:)
6a1e39def2 Merge commit 'c599d74aa6c40018e53a4248c4df0ef3da4be3ac' as 'lib3rd/clips_uml.git'
c599d74aa6 Squashed 'lib3rd/clips_uml.git/' content from commit 7bd70cb68
ab6550485e Merge commit 'b674b6386c63840269a33c3ae6c9ebdcad4499d0' as 'lib3rd/clips_core_6_40.git'
b674b6386c Squashed 'lib3rd/clips_core_6_40.git/' content from commit 516c97053
eb2a817ed4 1. 更正了添加subtree的脚本:前面有错误!
772fdd4309 Merge commit '65f786ffecb67ad12562461c5004ae1243d3d1b8' as 'lib3rd/graphviz.git'
65f786ffec Squashed 'lib3rd/graphviz.git/' content from commit f8b9e0351
93e55cb88a Merge commit '958153ed0dc0c1eb8d56efddfff1b3b2eba06f91' as 'lib3rd/nlohmann-json.git'
958153ed0d Squashed 'lib3rd/nlohmann-json.git/' content from commit 6ad0a586e
b00486b488 Merge commit '1bdf861f36fe2684a8a8c8ab33b2fef4c416234f' as 'lib3rd/rttr.git'
1bdf861f36 Squashed 'lib3rd/rttr.git/' content from commit b16fccf0f
5fc0beca1a Merge commit '3dff2711ebf2329c63a2321ec4f4e760e202cbfc' as 'lib3rd/cucumber-cpp.git'
3dff2711eb Squashed 'lib3rd/cucumber-cpp.git/' content from commit dd424c1a9
dd876f76fd Merge commit '67e0ed5d6c1dfdbe59205bf56afc354e54416261' as 'lib3rd/yoga.git'
67e0ed5d6c Squashed 'lib3rd/yoga.git/' content from commit a96a36ef5
e61dae7b09 Merge commit 'b2454f0c14c18e13cb71a8be0b25ec8d0c96591b' as 'lib3rd/fmt.git'
b2454f0c14 Squashed 'lib3rd/fmt.git/' content from commit 5944fcad3
07d93fd16b Merge commit '6f6c4814e5c78cea60e31b9921ce50e8a8f86402' as 'lib3rd/rpclib.git'
6f6c4814e5 Squashed 'lib3rd/rpclib.git/' content from commit 3b00c4ccf
53274f487f Merge commit '1dd083468264c4604aee3ae024704ba5e4e973cf' as 'lib3rd/libzmq.git'
1dd0834682 Squashed 'lib3rd/libzmq.git/' content from commit f00f46456
2f22b31685 Merge commit 'aacec21578be08301d16795093d53773ac327f0d' as 'lib3rd/cppzmq.git'
aacec21578 Squashed 'lib3rd/cppzmq.git/' content from commit a3e5b54c3
ee739256ef Merge commit '9f189958342e9b6a9d40afd6e455835953c86145' as 'lib3rd/cpplinq.git'
9f18995834 Squashed 'lib3rd/cpplinq.git/' content from commit 581f9a981
3b0c13428b Merge commit '802b64f830c24b12bab1877d888fc48ddf479f79' as 'lib3rd/cppcoro.git'
802b64f830 Squashed 'lib3rd/cppcoro.git/' content from commit 92892f31d
6034403f33 Merge commit '5ad8caf8f6a59fd769d6f71edd718ab594dccb07' as 'lib3rd/catch2.git'
5ad8caf8f6 Squashed 'lib3rd/catch2.git/' content from commit 37cbf4a4f
ff27304c91 Merge commit 'a03ac0b68644c6e26c26d4a8134656bfb50bcf89' as 'lib3rd/rxcpp.git'
a03ac0b686 Squashed 'lib3rd/rxcpp.git/' content from commit a71a89a27
6ad0a586e4 1. 添加了更新submodule的子子孙孙的README
07b5419f00 1. 添加完成了所有的submodule:)
1dc9e87948 1. 增加了subtree和submodule的说明文件
978b3336ff 1. 提交一个README来初始化git仓库
REVERT: 456478b3c5 Merge branch 'release/3.7.3'
REVERT: c5eafe74e8 :bookmark: set version to 3.7.3
REVERT: c6e1e26018 Merge pull request #1838 from nickaein/fix-quadratic-destruction
REVERT: efa13c663d Reserve stack only for top-level items
REVERT: 948f98cf4a Cleanups
REVERT: 0f3ec003bb Remove harmful vector::reserve during destruction (#1837)
REVERT: be61ad1470 :art: fix inconsistent operator style
REVERT: 411158d896 Merge branch 'release/3.7.2' into develop
REVERT: 5f09b502b6 Merge branch 'release/3.7.2'
REVERT: 56109eacd7 :bookmark: set version to 3.7.2
REVERT: 7b0c50b9a5 :hammer: add path
REVERT: 0a513a35cb Merge pull request #1436 from nickaein/iterate-on-destruction
REVERT: 7e2445a0f4 Move deep JSON test to a separate unit-test
REVERT: 68d0a7b246 Reduce depth in unit-test to avoid choking valgrind
REVERT: eec1974218 Merge remote-tracking branch 'nlohmann/develop' into iterate-on-destruction
REVERT: 67259d698f Merge pull request #1830 from nlohmann/whitesource/configure
REVERT: 760076abca Add .whitesource configuration file
REVERT: 1a9de88117 :rotating_light: fix a linter warning
REVERT: d98bf0278d Merge branch 'release/3.7.1' into develop
REVERT: 43e4db6141 Merge branch 'release/3.7.1'
REVERT: aacdc6bbe3 :bookmark: set version to 3.7.1
REVERT: 0f6a58eeaf :busts_in_silhouette: update contributors
REVERT: 1e9f16dff0 :rotating_light: fix linter errors
REVERT: c0ae88bf50 :rotating_light: fix linter errors
REVERT: 62dada05ca :bug: fix conversion to std::valarray
REVERT: 7bcaba0ca9 Merge pull request #1821 from AnthonyVH/develop
REVERT: 1ca6f2901b Merge pull request #1826 from cbegue/develop
REVERT: abccafa5c5 :arrow_up: upgrade Doctest to 2.3.5
REVERT: c4923e3d05 Merge remote-tracking branch 'upstream/develop' into develop
REVERT: ec9647ae63 Moved test for #1647 regression to regressions file.
REVERT: 8b686b30eb Add restriction for tuple specialization of to_json
REVERT: 3790bd9ae0 :construction_worker: add Xcode 10.2
REVERT: 42e9ad32c6 :hammer: remove full path
REVERT: e779714dd8 :construction_worker: add Xcode 10.2
REVERT: bf2afaeee6 :loud_sound: add version output
REVERT: 6a4cc29f01 :memo: update examples
REVERT: dfe53c36da :rotating_light: fix UBSAN warnings
REVERT: 0db1692f45 :busts_in_silhouette: update contributors
REVERT: 1307862b1d Merge pull request #1694 from eli-schwartz/release-include-meson
REVERT: 4d1e4c6d93 Merge pull request #1780 from t-b/add-msvc-16-2019
REVERT: a1828bbf57 Merge pull request #1806 from cbegue/develop
REVERT: 794a3d411a Fix issue #1805
REVERT: ddda67a096 Don't capture json input by value (fixed #1822).
REVERT: fb9a2643c8 Add test for #1647.
REVERT: 27d0dfc17a Fix #1647: non-member operator== breaks enum (de)serialization.
REVERT: f272ad533d :busts_in_silhouette: add CODEOWNERS file
REVERT: f7e7a62358 :pencil: add comment on JSON_THROW_USER, JSON_TRY_USER, and JSON_CATCH_USER
REVERT: 507d5676ad :rotating_light: fix warning
REVERT: 00cb98a3d1 Merge pull request #1803 from flopp/spelling
REVERT: b93d414a35 Fix some spelling errors - mostly in comments & documentation.
REVERT: f4332d4097 README: describe how to use json as a meson subproject
REVERT: 84faa36ec5 release: add singleinclude and meson.build to include.zip
REVERT: 0245ae5157 Merge pull request #1797 from t-b/fix-integer-truncation
REVERT: 4c06191836 Merge pull request #1799 from nemequ/develop
REVERT: fbcbc76d10 Update Hedley to v11.
REVERT: c6cbdf96a9 appveyor.yml: Add debug build on x64 and VS 2019
REVERT: 01e486bb55 appveyor.yml: Add MSVC 16 2019 support
REVERT: 35b47c2793 iteration_proxy: Fix integer truncation from std::size_t to int
REVERT: 5541a2bd25 test/cmake_import: Pass the generator platform required by MSVC 2019
REVERT: 7a521150aa appveyor: Pass the generator platform explicitly
REVERT: ed5541440a Merge pull request #1779 from t-b/avoid-using-glob-in-cmake
REVERT: eb6fe421ae test/CMakeLists.txt: Use an explicit list instead of GLOB
REVERT: d187488e0d Merge pull request #1765 from crazyjul/fix/items-with-alt-string
REVERT: dae0fe79af Merge pull request #1769 from chris0x44/json_pointer
REVERT: d826282f53 Merge pull request #1767 from 0xflotus/patch-1
REVERT: 4615f5a980 Provide default implementation for int_to_string, but allow for overloaded function
REVERT: 7476f5ee0c Make json_pointer::back const (resolves #1764)
REVERT: d7579b8cbf did you mean 'serialization'?
REVERT: 0f073e26eb Allow items() to be used with custom string
REVERT: 99d7518d21 :memo: add OSS Fuzz status badge
REVERT: e2c531a1f7 Merge pull request #1760 from Xav83/cppcheckFixes
REVERT: 87afee1c39 Runs make amalgamate on the project.
REVERT: 13a7c60257 Correct a warning from cppcheck:
REVERT: b9dfdbe6be Correct a warning from cppcheck:
REVERT: 771d5dadc6 Merge pull request #1741 from tete17/Fix-SFINAE
REVERT: e26a2904fc Fix and add test's for SFINAE problem
REVERT: 06ccd43a2a Merge pull request #1722 from t-b/fix-int64-min-issue
REVERT: a6bd798bfa Merge pull request #1728 from t-b/fix-clang-sanitizer-invocation
REVERT: 8067c3ca5b Add serialization unit tests for extreme integer values
REVERT: 70aa8a31a2 Add regression test for dumping the minimum value of int64_t
REVERT: 6ce2f35ba8 Fix outputting extreme integer values in edge cases
REVERT: 6d701b29df .travis.yml: Increase the timeout to 45 minutes
REVERT: d5c0d52f37 external_constructor<std::valarray>: Handle empty array properly
REVERT: 61fe5f1eee input_buffer_adapter: Fix handling of nullptr input
REVERT: 9ea3e19121 .travis/cmake: Rework clang sanitizer invocation
REVERT: f0bff49ffd test/CMakeLists.txt: Remove trailing whitespace
REVERT: eab68e7750 :construction_worker: add test step
REVERT: 90c1c24ccb :construction_worker: try GitHub Actions
REVERT: bf4156056b :pencil2: fix a typo
REVERT: b6ee34cc99 Merge branch 'develop' of https://github.com/nlohmann/json into develop
REVERT: 7dccfa5355 Merge pull request #1724 from t-b/enhance-travis
REVERT: a4eaaa56d1 .travis.yml: Add gcc 9 and compile with experimental C++20 support
REVERT: fe618ac246 :construction_worker: adjust maintainer scripts
REVERT: a015b78e81 :lock: add security policy
REVERT: 6291803f59 :busts_in_silhouette: update contributors
REVERT: 53c3eefa2c Merge branch 'release/3.7.0' into develop
REVERT: ea60d40f4a Merge branch 'release/3.7.0'
REVERT: d275d05514 :pencil: update documentation
REVERT: ddb7f70a12 :pencil: update documentation
REVERT: 48e1fe03b5 :bookmark: set version to 3.7.0
REVERT: 66d63abe6d Update Makefile
REVERT: d4fd731f1f :hammer: fix release target
REVERT: d80f8b09f5 :hammer: adjust version
REVERT: 7bf8a86090 :hammer: adjust paths
REVERT: 65e4b973bd :fire: remove leftover file
REVERT: 323cf95d8c :rotating_light: fix linter warning
REVERT: 3c4c69a24e :rotating_light: fix linter warning
REVERT: ffe0e3d70f Merge pull request #1673 from remyabel/gnuinstalldirs
REVERT: 3184e9bd8b Use GNUInstallDirs instead of hard-coded path.
REVERT: cf8251eb54 :ambulance: fix compiler errors
REVERT: 6c7cde181c Merge branch 'develop' of https://github.com/nlohmann/json into develop
REVERT: a501365ea2 Merge branch 'feature/hedley' into develop
REVERT: 8d059b96a1 Merge pull request #1670 from podsvirov/readme-package-managers-msys2
REVERT: 6a3cdb281e Package Manager: MSYS2 (pacman)
REVERT: b17440c12f :rotating_light: fix compiler warnings
REVERT: 104c5c1996 Merge branch 'feature/json_pointer_contains' into develop
REVERT: 7a23aa1c0d Merge branch 'feature/emplace_back' into develop
REVERT: 24fa285edb :memo: remove HEDLEY annotation from documentation
REVERT: 947656544d :rotating_light: fix warnings
REVERT: 346e9813c5 :construction: add more annotations
REVERT: 9289a23a76 Merge pull request #1643 from kevinlul/develop
REVERT: 90798caa62 :truck: rename Hedley macros
REVERT: 025f4cea42 :rotating_light: fix warning
REVERT: 897362191d :hammer: add NLOHMANN_JSON prefix and undef macros
REVERT: 1720bfedd1 :alembic: add Hedley annotations
REVERT: e616d095ab Remove boolean regression test for #1642
REVERT: 1be63431f3 :sparkles: make emplace_back return a reference #1609
REVERT: 258fa798f1 :sparkles: add contains function for JSON pointers
REVERT: 855156b5e8 Add regression tests for #1642
REVERT: 9a775bcb14 Merge pull request #1570 from nickaein/msvc-regression-tests
REVERT: 5b2e2305a0 CI: Skip test-unit_all on MSVC Debug builds
REVERT: 3db14cbfae :memo: Improve doc on const_inter constructor
REVERT: 0a137b78ac Appveyor: Set timeout of unit-tests in appveyor.yml instead of CMake
REVERT: f559142008 Appveyor: Set build mode explicitly
REVERT: eba8244ead Avoid collision of ::max with windows.h macro
REVERT: 798e83a038 Workaround msvc2015 bug with explicit copy-constructor for const_iterator
REVERT: d28b4b900e Add a separate build with Windows.h included
REVERT: 4ac0fe2628 Increase timeout of test-unicode_all in Debug build
REVERT: ec43d27f9f Add Debug builds for AppVeyor
REVERT: 39011a1759 :memo: mention json type in documentation start page #1616
REVERT: 3b82a350ed :memo: mention 302 exception in value() documentation #1601
REVERT: 13d4f8f5ad Merge pull request #1639 from taylorhoward92/develop
REVERT: f4fca2d59a Fix #1642
REVERT: 2f389cdde7 Added explicit converstion to std::string_view. Fixes failing test with GCC 8.3
REVERT: 4fc98e0b34 Merge pull request #1625 from nickaein/fix-docs
REVERT: 0c214949f5 :pencil2: Fix links to create an issue page
REVERT: b22c577e83 :pencil2: Fix brew instructions in README
REVERT: 0d55ddc5bf :pencil2: Fix a typo in README
REVERT: 17c0849a63 Merge pull request #1585 from Macr0Nerd/iss916
REVERT: 9f2179deb1 Merge pull request #1598 from nickaein/patch-2
REVERT: 40c3d5024a Fix broken links to documentation
REVERT: 26952500b8 Merge branch 'iss916' of https://github.com/Macr0Nerd/json into iss916
REVERT: aa4c45ee4d Added to_string (with ugly macro) and tests
REVERT: 293cd6b794 Added to_string and added basic tests
REVERT: ee4028b8e4 Merge branch 'feature/fastcov' into develop
REVERT: cf6b6692aa Merge branch 'develop' into feature/fastcov
REVERT: f0bc16d899 :hammer: overworked coverage targets
REVERT: b4b06d89b5 :arrow_up: updated fastcov
REVERT: e65cff2a8f :hammer: small cleanup
REVERT: 63fe1cbbcf :memo: updated README
REVERT: 0bdadb12c7 Merge branch 'feature/circleci' into develop
REVERT: 0a1ddd6882 :arrow_up: updated fastcov
REVERT: 4676f759e8 :arrow_up: updated fastcov
REVERT: da279234d5 Merge branch 'develop' into feature/fastcov
REVERT: f05614b240 :building_construction: adding anonymous namespace
REVERT: 0da99027b7 :rotating_light: silenced a warning
REVERT: 1f03395e2c Merge branch 'develop' of https://github.com/nlohmann/json into develop
REVERT: 2f9095ddab :hammer: relaxed requirements to coverage
REVERT: ee8732c359 Merge pull request #1555 from theodelrieu/fix/1511
REVERT: d1ef75316e Merge pull request #1439 from onqtam/doctest
REVERT: d66abda4ee tests: fix coverage
REVERT: e6e6805c6c add built-in array support in get_to
REVERT: 2806b201a8 make sure values are overwritten in from_json overloads
REVERT: da5b7833a0 fixing the remaining of the pedantic gcc/clang target warnings
REVERT: 64873fb5b8 Merge branch 'develop' into doctest
REVERT: 80daa19331 :construction_worker: Ninja seems not to work
REVERT: 0a57c51a69 :construction_worker: adding concurrency
REVERT: a5e00f2cf7 :construction_worker: fixed path
REVERT: 5ebe722045 :construction_worker: full workflow
REVERT: ecf4d5e91d :construction_worker: trying CircleCI
REVERT: 53001414c7 :hammer: using --exclude-gcov to exclude files
REVERT: b12287b362 :alembic: trying fastcov
REVERT: b21c04c938 :fire: removed unsupported flag
REVERT: c7878173f9 :hammer: minor changes to maintainer targets
REVERT: b52c3638f5 Merge pull request #1551 from heavywatal/fix-1535-nodiscard-clang
REVERT: d21d298397 :art: fixed indentation
REVERT: 23635704c3 :arrow_up: added script to update cpplint
REVERT: 191aa0fd6f :wrench: overworked maintaner targets
REVERT: 5ccdaf643f Remove C++17 extension warning from clang; #1535
REVERT: b4def6dcba tabs instead of spaces...
REVERT: a0000c3235 finished the last of the warnings
REVERT: 5d511a6e96 fixed a bunch of warnings from the Makefile from the root of the repo
REVERT: 82af0ecdc1 Merge branch 'develop' into doctest
REVERT: d79c16801a Merge branch 'feature/doozer' into develop
REVERT: 24d91cf36f :memo: added Doozer to README
REVERT: 0991824584 :construction_worker: version output
REVERT: 0caf986505 reverted the removal of this if/else branching - this is the easiest way to get -std=c++0x support
REVERT: 9d2f0391e0 :construction_worker: fixed timeout
REVERT: af9da22b87 :construction_worker: adding xenial-armhf
REVERT: 0a67b51fce :construction_worker: forgot path to ctest
REVERT: e27b282033 :construction_worker: skip certificate check
REVERT: cde0b24389 :construction_worker: fixed required packages
REVERT: f091fe31bc :construction_worker: increased timeout
REVERT: 28dfbedda7 :construction_worker: fixed timeout
REVERT: ff51a32be1 updated doctest to version 2.3.1 released today
REVERT: 2b346099df Merge branch 'develop' of https://github.com/nlohmann/json into doctest
REVERT: dcbc028b5b :construction_worker: fixed syntax
REVERT: 842d42b135 :construction_worker: unified paths
REVERT: 1e86976cfe :construction_worker: fixed paths
REVERT: 30211477b7 :construction_worker: fixed package name
REVERT: 5e1cae0a7d :construction_worker: install g++
REVERT: c871c9a01c :construction_worker: install correct g++
REVERT: 63d619e21f :construction_worker: need to install g++
REVERT: c94b764a6e :construction_worker: fixed installation
REVERT: 65cdccfa8a :construction_worker: fixed syntax error
REVERT: a72ac18514 :construction_worker: use recent cmake
REVERT: 4327ae0bef :construction_worker: need more recent cmake for CentOS
REVERT: fabf953305 :construction_worker: fixed a typo
REVERT: 6e3e2ee2e4 :construction_worker: fixed buildenv values
REVERT: bc5089e803 :construction_worker: add test output to avoid timeout
REVERT: 7dd3e6384b :construction_worker: added Fedora and CentOS
REVERT: 490c6e926e :construction_worker: using raspbian
REVERT: 2fcca259b0 :construction_worker: added cmake
REVERT: 72dd6f349e :construction_worker: trying doozer
REVERT: baaa2a4d0f :checkered_flag: trying to use constructors from std::allocator #1536
REVERT: 1126c9ca74 Merge branch 'release/3.6.1' into develop
REVERT: 295732a817 Merge branch 'release/3.6.1'
REVERT: efa1b9a7bb :bookmark: set version to 3.6.1
REVERT: b33093d610 :bug: fixed regression #1530
REVERT: 9d6ab9014f :checkered_flag: fixed a compilation error in MSVC #1531
REVERT: c790b9f8c0 :bug: fixed regression #1530
REVERT: 483a086562 :alembic: added funding link
REVERT: d2a08ddafd Merge branch 'develop' of https://github.com/nlohmann/json into develop
REVERT: 7c55510f76 :rotating_light: fixed some warnings #1527
REVERT: 3ac5fa31c5 :speech_balloon: update issue templates
REVERT: 51e1564c9e Merge branch 'release/3.6.0' into develop
REVERT: 944267f522 Merge branch 'release/3.6.0'
REVERT: 0abf0f80c9 :bookmark: set version to 3.6.0
REVERT: b37392b7ac :bookmark: set version to 3.6.0
REVERT: 002addabd8 :rotating_light: fixed a warning
REVERT: a6f9b4e36d :busts_in_silhouette: added contributors
REVERT: 18cc7ddd62 :memo: completed documentation index page
REVERT: e07e8e7912 :memo: updated documentation
REVERT: 710f26f95c :memo: added documentation
REVERT: b224c52376 :art: cleanup
REVERT: 37a72dac48 :green_heart: forgot two semicolons
REVERT: 155d196bfa Update CMakeLists.txt
REVERT: 365944b0bc Merge branch 'develop' into doctest
REVERT: 8d3f4f21bc :hammer: clean up
REVERT: 9fc093c9e0 :construction_worker: added targets for infer and oclint
REVERT: 22c733e6fe :memo: added documentation
REVERT: 56f6d1d68e :green_heart: fix CI and #1521
REVERT: df0f7f2b5d :construction_worker: overworked clang-tidy target
REVERT: 9f26dac9b3 :arrow_up: updated Doxyfile
REVERT: b8451c236f :rotating_light: fixed warnings
REVERT: d6c4cd3b6d :rotating_light: adding targets for static analyzers
REVERT: baf8b4be7c :heavy_plus_sign: adding cpplint
REVERT: 34f8b4f711 :rotating_light: fixed more warnings
REVERT: 02b3494711 :fire: removing unstable macOS builds on Traivs
REVERT: b02ee16721 :rotating_light: fixed warnings
REVERT: 8d6c033f80 Merge branch 'develop' of https://github.com/nlohmann/json into develop
REVERT: 27011e3718 :rotating_light: fixed warnings
REVERT: 9dc3552931 Merge pull request #1514 from naszta/macrofix
REVERT: 0067ea8f9e Change macros to numeric_limits #1483
REVERT: 0c65ba960e Merge branch 'develop' of https://github.com/nlohmann/json into develop
REVERT: 546e2cbf5e :rotating_light: fixed some warnings
REVERT: c6fc902184 Merge pull request #1489 from andreas-schwab/develop
REVERT: d39842e68f Merge pull request #1330 from ax3l/topic-installEmbed
REVERT: 670f42b561 :fire: removing Xcode 6.4 builder
REVERT: c983b67112 Merge pull request #1469 from garethsb-sony/json_pointer-append
REVERT: c11bead2ae :construction_worker: removing more retired Travis images
REVERT: 3cd1dac653 :rotating_light: fix MSVC warning #1502
REVERT: cabe2357b8 Merge pull request #1492 from stac47/fix_gcc9_allocator
REVERT: 16d9cdce45 :memo: updated documentation of CI
REVERT: e3729ba0a5 :green_heart: fix compiler selection
REVERT: e5c7fd488d :construction_worker: trying new Travis workers
REVERT: 5047c7a217 :bug: added missing include #1500
REVERT: 8eb7db7277 Merge pull request #1441 from iwanders/support-cmake-older-than-3-8-with-if
REVERT: 393410e61a Merge pull request #1495 from njlr/patch-1
REVERT: 30edcaab3a Merge pull request #1496 from lieff/develop
REVERT: 7b31e56fbf fix GCC 7.1.1 - 7.2.1 on CentOS closes https://github.com/nlohmann/json/issues/670
REVERT: bb22b1003f Do proper endian conversions
REVERT: 8aeee4f7e3 Update README.md
REVERT: d183bd0456 Tests for json_pointer::empty and json_pointer::parent_pointer
REVERT: 08de9eeaca Add json_pointer::parent_pointer (cf. std::filesystem::path::parent_path)
REVERT: 164e0e54d9 Rename private json_pointer::is_root as public json_pointer::empty for consistency with std::filesystem::path
REVERT: ddc9f201f4 Fix gcc9 build error test/src/unit-allocator.cpp (Issue #1472)
REVERT: 21516f2bae Merge pull request #1491 from nickaein/patch-1
REVERT: 088a245218 Fix typo in README.ME
REVERT: e326df211b Merge pull request #1474 from nickaein/develop
REVERT: c55cacee1e Merge pull request #1477 from nickaein/fix-doc
REVERT: e93f305494 Add unit-test for contains() member function
REVERT: 6a5db00951 Implement contains() to check existence of a key
REVERT: fb5ceb26ac Fix documentation
REVERT: 46ff13d39e Merge pull request #1468 from past-due/disable_Wmismatched_tags_on_tuple
REVERT: eee3bc0c79 Merge pull request #1464 from elvisoric/update_meson_install_step
REVERT: 5da757bbb3 Attempt to satisfy Coveralls by adding a test for (unchanged) operator std::string
REVERT: c850e9d82d Add operator/= and operator/ to construct a JSON pointer by appending two JSON pointers, as well as convenience op/= and op= to append a single unescaped token or array index; inspired by std::filesystem::path
REVERT: 45819dce54 Disable -Wmismatched-tags warning on tuple_size / tuple_element
REVERT: 77d1d37290 Disable installation when used as meson subproject. #1463
REVERT: 372c4d2125 Merge branch 'develop' into iterate-on-destruction
REVERT: 68ec3eb8d6 Merge pull request #1451 from Afforix/Afforix-fix-extra-semicolon
REVERT: de14b5ee2f Merge pull request #1455 from wythe/patch-2
REVERT: cca6d0dbae docs: README type
REVERT: a06e7f5d80 JSON-pointer: add operator+() returning a new json_pointer
REVERT: dc21cbb751 remove extra semicolon
REVERT: e89c946451 Merge branch 'feature/nodiscard' into develop
REVERT: 6de4df23e4 :bug: fixed integer overflow in dump function #1447
REVERT: e17e0d031f Merge pull request #1446 from scinart/develop
REVERT: e36593e960 :hammer: trying code from https://godbolt.org/z/-tLO1K
REVERT: 20db020c1f move newly-added tests in unit-regression.cpp
REVERT: d359fd3a8d :construction: trying nodiscard attribute #1433
REVERT: b9a39b38bf Merge pull request #1434 from pboettch/develop
REVERT: 83e84446d6 fix typo
REVERT: 899bd94b43 flush buffer in serializer::dump_escaped case UTF8_REJECT
REVERT: 4fd9b52fc2 Use C++11 features supported by CMake 3.1.
REVERT: dffae1082f Merge pull request #1435 from pboettch/warning-fix
REVERT: 851fe8a5ef Merge pull request #1430 from nicoddemus/conda-docs
REVERT: a2c074fd4d this should really fix the XCode 6/7 builds
REVERT: 3340162efd fixing osx builds - had forgotten to define this for the object file where the test runner is compiled
REVERT: 2f44ac1def moved from Catch to doctest for unit tests
REVERT: f0883dda8f During destruction, flatten children of objects to avoid recursion
REVERT: 47fe4b9cee Add unit test for parsing deeply-nested array
REVERT: d0c0d16110 :rotating_light: fixed unused variable warning
REVERT: 9225cf2f57 allow push_back() and pop_back() calls on json_pointer
REVERT: b025d66eb5 Add instructions about using nlohmann/json with the conda package manager
REVERT: e5753b14a8 :rotating_light: fixed another linter warning #1400
REVERT: 5c04cc1009 :hammer: fixed includes
REVERT: 8e9ad346d9 :rotating_light: fixed another linter warning
REVERT: ad01736d55 :bulb: improved documentation for parsing without exceptions #1405
REVERT: 06731b14d7 :arrow_up: upgraded Catch and Google Benchmark
REVERT: daeb48b01a Merge pull request #1411 from nickaein/develop
REVERT: 29a03f465e Merge pull request #1414 from nickaein/mydevel-appveyor-x64
REVERT: c9dd260a4c Add unit tests for dump_integer
REVERT: be9b4cbd60 Add benchmark for small integers
REVERT: 6503e83e74 Improve dump_integer performance by implementing a more efficient int2ascii
REVERT: f16432832c Increase stack size for VS2017 Win x64 on Appveyor
REVERT: b39f34e046 Merge pull request #1425 from hijxf/patch-1
REVERT: 7f73915d4f Updated year in README.md
REVERT: df460c96cf Merge pull request #1423 from skypjack/patch-1
REVERT: 6546cad7bf Fixed broken links in the README file
REVERT: 847dd2a954 Merge pull request #1420 from skypjack/patch-1
REVERT: 937b642e0e :memo: added description on how to use NuGet package #1132
REVERT: 975dc970d1 Merge pull request #1417 from wythe/patch-1
REVERT: b8be0f64ae Fixed broken links to operator[]() and at()
REVERT: 619bf9c20d Fixed broke links to RFC7159
REVERT: a559ff8fc6 typo in README
REVERT: 2c0c2ca698 Specify target platform in generator name
REVERT: 676c847c55 Merge pull request #1409 from yann-morin-1998/yem/cmake-version
REVERT: e8b6b7adc1 buildsystem: relax requirement on cmake version
REVERT: c682b9879b :rotating_light: fixed PVS V567 warning
REVERT: 6f89613acd :rotating_light: fixed some warnings
REVERT: db53bdac19 Merge branch 'release/3.5.0' into develop
REVERT: cebb4e052a Merge branch 'release/3.5.0'
REVERT: 78348afeb6 :bookmark: set version to 3.5.0
REVERT: 1107f8cd82 :memo: updated documentation for items() function
REVERT: 98f4e31c3e :memo: formatted picture
REVERT: 58c269b039 :memo: updated documentation
REVERT: 2182157dc1 :memo: update documentation
REVERT: 45f5611d9b :rotating_light: fixed two warnings
REVERT: 117c1d14fb :memo: added contributors to 3.5.0
REVERT: d584ab269a :art: fixed header
REVERT: 45a8a093d7 :rotating_light: fixed a warning
REVERT: 85849940ba Merge pull request #1391 from pratikpc/develop
REVERT: ebd3f45808 Added Support for Structured Bindings
REVERT: 4f270e38cc Merge pull request #1342 from davedissian/bugfix/sfinae-iterator-traits
REVERT: f1080d7c39 Code review.
REVERT: 5d390e91ff Merge pull request #1392 from mtalliance/feature/addFileInputAdapter
REVERT: c1c85b025c Forget one std::FILE
REVERT: 635a4fc344 use namespace std when possible. Change the name of private variable.
REVERT: cf31193de2 create single json.hpp file
REVERT: a794cfdba3 refactor unit test in case of throw, the fclose will not be called. using unique_ptr with custom destructor will ensure that
REVERT: 91ff96a737 remove the const attribute
REVERT: b7a2642fba remove comment
REVERT: fa7f1a524e new unified json.hpp generated with make amalgamate
REVERT: ef283e0cf8 add tests to cover the new input adapter
REVERT: 3335da622a remove non usefull code.
REVERT: ae48acbb23 remove non usefull code. Add small description
REVERT: 52f6fd1d91 Add the possibility of using FILE * from cstdio library to read a file. This enable the possibility of using low eand device with this library.
REVERT: 67b0daf27b Add the possibility of using FILE * from cstdio library to read a file. This enable the possibility of using low eand device with this library.
REVERT: 2c23f0a346 Changes requested from code review.
REVERT: e73dfef6e5 Merge pull request #1382 from kjpus/patch-1
REVERT: 767a3a327d Link to issue #958 broken
REVERT: d53873a251 Merge pull request #1363 from theodelrieu/doc/implicit_conversions
REVERT: 7a56f5a42b Merge pull request #1380 from manu-chroma/patch-1
REVERT: 5de184b8fb readme: fix typo
REVERT: ef90d62ddf :rotating_light: fixed warning #1364
REVERT: 7b961368d5 recommend using explicit from JSON conversions
REVERT: da81e7be22 :checkered_flag: adding parentheses around std::snprintf calls #1337
REVERT: f80efd3954 :lipstick: cleanup
REVERT: 35829928da Merge pull request #1343 from mefyl/develop
REVERT: f86090aafc Merge pull request #1345 from mpoquet/feature/meson-install-pkgconfig
REVERT: 30e1cbb0df Merge pull request #1346 from ax3l/fix-mergePatchShadowParam
REVERT: aa10382629 Set eofbit on exhausted input stream.
REVERT: 798754dfb6 Amalgamate Headers
REVERT: 97b81da840 merge_patch: rename parameter
REVERT: ffe08983dd :meson: install headers + pkg-config
REVERT: f665a92330 Implement SFINAE friendly iterator_traits and use that instead.
REVERT: d2e6e1bf58 Merge pull request #1329 from ax3l/fix-typosWhitespaces
REVERT: a7567bc596 Remove EOL whitespaces in natvis
REVERT: f049836d68 CMake: Optional Install if Embedded
REVERT: 689382a722 Fix EOL Whitespaces & CMake Spelling
REVERT: 2f73a4d1f3 :rotating_light: fixed a linter warning
REVERT: e3c28afb61 Merge branch 'release/3.4.0' into develop
REVERT: 6708f22cd4 Merge branch 'release/3.4.0'
REVERT: 0f3c74d821 :bookmark: set version to 3.4.0
REVERT: 7b2f8cce03 :bookmark: set version to 3.4.0
REVERT: 8cee0e38d9 :ambulance: fixed #1319
REVERT: 856fc31d0a :lipstick: fixed indentation
REVERT: 39419cd5c4 :rotating_light: fixed another linter warning
REVERT: 86b5ce953a :memo: added examples for BSON functions
REVERT: d2e4f0b0d9 :pencil2: fixed some typos
REVERT: f0c1459554 :bug: fixed a bug parsing BSON strings #1320
REVERT: 24946f67f1 :rotating_light: fixed some more linter warnings
REVERT: 7d0dc10169 :rotating_light: fixed a linter warning
REVERT: 45a761bd60 Merge branch 'develop' of https://github.com/nlohmann/json into develop
REVERT: 4e765596f7 :hammer: small improvements
REVERT: 1308ea055d Merge pull request #1315 from nlohmann/feature/convert_char
REVERT: 0e7be06bef Merge pull request #1323 from nlohmann/feature/enum_json_mapping
REVERT: 85aaf91b85 Merge branch 'develop' into feature/enum_json_mapping
REVERT: 5a6bdf5934 Merge branch 'develop' into feature/convert_char
REVERT: 037e93f5c0 Merge pull request #1320 from nlohmann/julian-becker-feature/bson
REVERT: 9f48bb6937 :zap: replaced vector by array #1323
REVERT: 6384fe28db :rotating_light: fixed another linter warning
REVERT: ad639ad5e6 :sparkles: added NLOHMANN_JSON_SERIALIZE_ENUM marco #1208
REVERT: 544150d5a5 :rotating_light: fixed another linter warning
REVERT: c2e175763c :ok_hand: added another conversion function #1315
REVERT: d97fa30795 :ok_hand: fixed comment #1320
REVERT: 7ce720b700 :rotating_light: fixed coverage
REVERT: 19647e083c :rotating_light: fixed compiler warnings
REVERT: 62126278a6 :hammer: added fix for arrays
REVERT: 1968e5c793 :art: clean up binary formats
REVERT: 4d1eaace8c :hammer: fixed fuzz code to avoid false positives in case of discarded values
REVERT: e2c5913a50 :construction: some changes to the BSON code
REVERT: bba159121f Merge branch 'feature/bson' of https://github.com/julian-becker/json into julian-becker-feature/bson
REVERT: f102df3cba :memo: updated documentation #1314
REVERT: 7b501de054 Merge pull request #1314 from nlohmann/feature/codec_errors
REVERT: 20038e2703 :memo: added a note to the discussion #1286
REVERT: 87ef3f25f2 :pencil2: fixed a typo #1314
REVERT: b49f76931f :ok_hand: replaced static_cast to CharType by conversion function #1286
REVERT: 2343d9caeb :green_heart: additional tests from the Unicode spec #1198
REVERT: 951a7a6455 :construction: fixed test cases #1198
REVERT: c51b1e6fab :construction: fixed an issue with ensure_ascii #1198
REVERT: c7af027cbb :construction: respect ensure_ascii parameter #1198
REVERT: e5dce64115 :green_heart: added tests #1198
REVERT: c5821d91e5 :construction: overworked error handlers #1198
REVERT: ad11b6c35e BSON: Improved exception-related tests and report location of U+0000 in the key-string as part of `out_of_range.409`-message
REVERT: 9294e25c98 Merge pull request #1301 from theodelrieu/fix/1299
REVERT: b553a8a93c Merge pull request #1305 from koponomarenko/add-meson-info
REVERT: 5ba812d518 BSON: fixed incorrect casting in unit-bson.cpp
REVERT: 8de10c518b BSON: Hopefully fixing ambiguity (on some compilers) to call to string::find()
REVERT: f0c55ce0e0 Add Meson related info to README
REVERT: 2a63869159 Merge branch 'develop' of https://github.com/nlohmann/json into feature/bson
REVERT: 4b2a00641c Merge pull request #1303 from nlohmann/feature/binary_errors
REVERT: dbb0b63187 :wheelchair: improved error messages for binary formats #1288
REVERT: a946dfc19c add a note to maintainers in type_traits.hpp
REVERT: 978c3c4116 BSON: throw `json.exception.out_of_range.409` in case a key to be serialized to BSON contains a U+0000
REVERT: 0671e92ced :construction: proposal for different error handlers #1198
REVERT: daa3ca8a2e BSON: Adjusted documentation of `binary_writer::to_bson()`
REVERT: 5bccacda30 BSON: throw json.exception.out_of_range.407 in case a value of type `std::uint64_t` is serialized to BSON. Also, added a missing EOF-check to binary_reader.
REVERT: 45c8af2c46 add new is_constructible_* traits used in from_json
REVERT: dd672939a0 Merge pull request #1294 from theodelrieu/fix/json_ref_ctor
REVERT: 11fecc25af add constraints for variadic json_ref constructors
REVERT: e426219256 Merge pull request #1282 from nlohmann/feature/lines_columns
REVERT: adfa961ed0 Merge pull request #1280 from nlohmann/feature/linter
REVERT: 6d34d64bfd :ambulance: fixed compilation error
REVERT: 74a31075e3 :wheelchair: improved parse error messages
REVERT: 6e49d9f5ff :ambulance: fixed compilation error
REVERT: f8158997b5 :memo: fixed documentation
REVERT: df0f612d1b BSON: allow and discard values and object entries of type `value_t::discarded`
REVERT: 3abb788139 :rotating_light: fixed some more clang-tidy warnings
REVERT: 858e75c4df :rotating_light: fixed some clang-tidy warnings
REVERT: 062aeaf7b6 BSON: Reworked the `binary_writer` such that it precomputes the size of the BSON-output. This way, the output_adapter can work on simple output iterators and no longer requires random access iterators.
REVERT: 6d09cdec34 :bug: fixed a bug in the unget function
REVERT: 011b15dd08 :wheelchair: added line positions to error messages
REVERT: 81f4b34e06 BSON: Improved documentation and error handling/reporting
REVERT: ac38e95780 Merge pull request #1277 from performous/fix-clang-detection
REVERT: fa722d5ac3 :rotating_light: fixed another linter warning
REVERT: ec95438a59 :rotating_light: fixed some linter warnings
REVERT: f1768a540a Merge branch 'release/3.3.0' into develop
REVERT: aafad2be1f Merge branch 'release/3.3.0'
REVERT: cdfe6ceda6 :bookmark: set version to 3.3.0
REVERT: b968faa882 :bookmark: set version to 3.3.0
REVERT: cd518fbbab :memo: small update to pass test suite
REVERT: e8427061a0 Thirdparty benchmark: Fix Clang detection.
REVERT: b911654857 :memo: updated contributor list
REVERT: bb55885215 :lipstick: cleaned code
REVERT: 5c7d27c338 Merge pull request #1272 from antonioborondo/fix_warning
REVERT: b6fdad9acd Remove anonymous namespace
REVERT: 7c385a4844 Fix error: 'wide_string_input_helper' was not declared in this scope
REVERT: 9ba3f79667 Fix error: explicit specialization in non-namespace scope
REVERT: 8d1585f065 Change implementation to use templates
REVERT: ad3c216bb5 Generate header
REVERT: 0231059290 Fix warning
REVERT: 9f18e17063 Merge pull request #1270 from chuckatkins/add-more-cmake-docs
REVERT: 53ec0a16f3 Merge pull request #1271 from chuckatkins/cleanup-deprecated-warnings
REVERT: 4c617611e2 docs: Add additional CMake documentation
REVERT: 829571ab5c Turn off additional deprecation warnings for GCC.
REVERT: c8231eff75 Merge pull request #1260 from chuckatkins/fix-cmake-target-alias
REVERT: 02e653bdf7 docs: add a note in the readme about using the CMake imported target
REVERT: 564506a885 cmake: add import config tests
REVERT: 1729db85c1 cmake: fix package config to deal with versioning and namespaces
REVERT: 910a895027 Merge pull request #1238 from theodelrieu/fix/1237
REVERT: 1fae82b7a7 Merge branch 'develop' into fix/1237
REVERT: 22e55349a6 :memo: added Wandbox link #1227
REVERT: 70e587c3da :memo: added Wandbox link #1227
REVERT: d26f39466e Merge pull request #1231 from theodelrieu/feature/get_with_parameter
REVERT: c61a9071ae :rotating_light: fixed a compilation issue with ICPC #755
REVERT: e8730e5e82 BSON: Reworked `binary_reader::get_bson_cstr()`
REVERT: b59a58406e Merge branch 'develop' of https://github.com/nlohmann/json into develop
REVERT: 4e54c9a13d :rotating_light: fixed a compilation issue with ICPC #755
REVERT: 0a09db9cc2 BSON: Extend `binary_reader::get_number` to be able to hanlde little endian input to get rid of `binary_reader::get_number_little_endian`
REVERT: 95432c34f9 Merge pull request #1262 from knilch0r/patch-1
REVERT: 8c1387cfb3 unit-testsuites.cpp: fix hangup if file not found
REVERT: 521fe49fec Add basic_json::get_to function.
REVERT: 680a4ab672 Merge pull request #1257 from henryiii/gcc48
REVERT: 7a37ba0c02 Adding 4.8 test to travis
REVERT: ef358ae695 BSON: Fixed hangup in case of incomplete bson input and improved test coverage
REVERT: 99b7c7c8ef Patch nlohmann/json for GCC 4.8
REVERT: bce4816275 BSON: Added test case for the different input/output_adapters
REVERT: 763705c2a7 Fix: Add missing `begin()` and `end()` member functions to `alt_string`
REVERT: e184b6ecf2 Merge pull request #1252 from koponomarenko/fix-meson-build
REVERT: 88b055c2df Merge pull request #1249 from LEgregius/clang-3.4.2-crash-workaround
REVERT: 8799759b85 Add version and license to meson.build
REVERT: 4e52277b70 Fix issue #1237
REVERT: e4bc98d036 Merge pull request #1245 from chuckatkins/fix-target-namespace-backward-compatibility
REVERT: 4d780b091b Reordered the code. It seems to stop clang 3.4.2 in RHEL 7 from crashing intermittently.
REVERT: 3b1a5cafad Use a version check to provide backwards comatible imported target names.
REVERT: 99939d6340 :memo: added lgtm.com badge
REVERT: 4e2f35d4c2 :construction_worker: adding Xcode 10 worker
REVERT: 7fa3b8865c Merge pull request #1221 from rivertam/better-error-305
REVERT: 8f07ab6392 Replace "key-style argument" with "string argument"
REVERT: df33a90774 BSON: Bugfix for non-empty arrays
REVERT: cf485c2907 BSON: Support for arrays
REVERT: 120d1d77d4 BSON: test case for a more complex document
REVERT: 5ce7d6bdd7 BSON: support objects with objects as members
REVERT: 83b427ad67 BSON: unsigned integers
REVERT: c0d8921a67 BSON: support objects with int64 members
REVERT: 7ee361f7ad BSON: support objects with int32 members
REVERT: c5ef023171 BSON: support objects with null members
REVERT: 6c447de076 BSON: Support objects with string members
REVERT: 0c0f2e44b5 BSON: support doubles
REVERT: 9a0dddc5d2 BSON: Object with single boolean
REVERT: 5f5836ce1c BSON: Support empty objects
REVERT: f06c8fd8e3 BSON: serialization of non-objects is not supported
REVERT: 186c747a19 Merge pull request #1230 from mandreyel/lambda-unevaluated-context-fix
REVERT: 6b5334c167 Move lambda out of unevaluated context
REVERT: ebb3c03293 :art: cleanup after #1228
REVERT: d3428b35c5 Merge pull request #1228 from theodelrieu/remove_static_asserts
REVERT: aea648bb7a remove now-useless traits. check for is_basic_json where needed
REVERT: 4b4bbceebf make from_json SFINAE-correct
REVERT: f7971f04a5 make to_json SFINAE-correct
REVERT: f7c8a2145a refactor from/to_json(CompatibleArrayType)
REVERT: 628f76729e do not check for compatible_object_type in compatible_array_type
REVERT: 29f72966c3 refactor is_compatible_type, remove conjunction & co
REVERT: 77967e6548 refactor is_compatible_integer_type
REVERT: 13760857ff refactor is_compatible_array_type
REVERT: 924e95c6e8 refactor is_compatible_string_type
REVERT: e84195ab7b refactor is_compatible_object_type
REVERT: b59c3367c9 use detected instead of has_* traits
REVERT: 1ea8cd128c fix void_t for older compilers
REVERT: eb30ff0615 :rotating_light: fixed a compiler warning #1224
REVERT: ad053ef09c Fix tests for improved error 305(hopefully)
REVERT: bbdfe7dea6 Improve error messages for error 305
REVERT: d713727f22 Merge pull request #1202 from dennisfischer/develop
REVERT: 04597c3a66 Merge pull request #1214 from devsisters/fix-1213
REVERT: aada309f61 Fix #1213
REVERT: 359f98d140 Merge branch 'release/3.2.0' into develop
REVERT: 8c20571136 Merge branch 'release/3.2.0'
REVERT: dfe607c6ff Export package to allow builds without installing
REVERT: 9f3857ef6f :bookmark: set version to 3.2.0
REVERT: 7608a64e1e :hammer: fixed amalgamation
REVERT: a7b02bdce0 :bookmark: preparing 3.2.0 release
REVERT: c6a482b16c :memo: added example for sax_parse
REVERT: 5ad52f4167 :arrow_up: Catch 1.12.0
REVERT: 3811daa8a3 :memo: release preparation
REVERT: 6899fa304c Merge branch 'develop' of https://github.com/nlohmann/json into develop
REVERT: 57faaf42ca :rotating_light: fixed a compiler warning
REVERT: f78ac4fbd3 Merge pull request #1200 from thyu/develop
REVERT: 3004a73951 Fix -Wno-sometimes-uninitialized by initializing "result" in parse_sax
REVERT: e33b31e6aa :bug: fixed callback-related issue (https://github.com/nlohmann/json/issues/971#issuecomment-413678360)
REVERT: b5c54b41fd :memo: overworked documentation
REVERT: 07494e06d7 :rotating_light: fixed some compiler warnings
REVERT: d5b21b051c Merge pull request #1153 from theodelrieu/refactor/no_virtual_sax
REVERT: 0cc3db4f15 add static_asserts on SAX interface
REVERT: 38f8a51a8f use abstract sax class in parser tests
REVERT: 9bbb133094 remove no_limit constant and default values
REVERT: 442886d040 use templates in the sax interface instead of virtuals
REVERT: f6febbe359 split meta.hpp, add detected_t (used to define concepts)
REVERT: 3ac2d81a95 :hammer: fixed a MinGW error #1193
REVERT: be2065dce9 :rotating_light: fixing a MinGW warning #1192
REVERT: fed70f6bff :art: reindented code
REVERT: 0e748f2f8c Merge pull request #1187 from devsisters/json-internal-catch
REVERT: 861ee400cc Merge pull request #1176 from grembo/develop
REVERT: 3ce4325350 :memo: updated documentation of used compilers
REVERT: ba4a19d4af :construction_worker: added more CI workers
REVERT: 043eff5ba8 :construction_worker: added more CI workers
REVERT: 05b27e83b7 Exclude bytewise comparison in certain tests. These tests never worked - they weren't run before d5aaeb4.
REVERT: d5aaeb4cce Make section names unique in loops, as catch doesn't support duplicate sections, see also https://github.com/catchorg/Catch2/issues/816#issuecomment-278268122
REVERT: 3760a38b7e :checkered_flag: implicit conversion is not allowed with MSVC
REVERT: 5b14411669 :checkered_flag: trying to fix C2440 error
REVERT: 347e77bdc1 :ambulance: fix for #1169
REVERT: 04372a8c56 :checkered_flag: fix for #1168
REVERT: d0e60de433 Add new JSON_INTERNAL_CATCH macro function
REVERT: 7bfc406ded :memo: added note about CocoaPods #1148
REVERT: d456a2d777 Merge pull request #1151 from sonulohani/bigObjFix
REVERT: b8ad3388ec Fixed compiler error in VS 2015 for debug mode https://github.com/nlohmann/json/issues/1114
REVERT: 39dd775e38 :hammer: cleanup after #1134
REVERT: 86a96b059d Merge pull request #1134 from Daniel599/feature/items_iterator
REVERT: 396a914f9e :hammer: added macro to disable compiler check #1128
REVERT: bab5826504 Merge pull request #1144 from jrakow/cppreference-link-fix
REVERT: 515cfc2d89 Merge pull request #1142 from jrakow/develop
REVERT: 963d06a13c :memo: fix links to cppreference named requirements
REVERT: 9f00db48d9 :memo: link to cppreference via HTTPS
REVERT: ec2ebd5ec9 meson: add multiple headers target
REVERT: 0bb36bb140 meson: fix include directory
REVERT: 62457729e8 :memo: mentioned MinGW in README
REVERT: 09c0df4a21 :construction_worker: choosing correct image
REVERT: 1bbc4a0859 :construction_worker: using Ninja to speed up build
REVERT: d8fe13fc83 :hammer: fixed escaping for MinGW
REVERT: e59b930927 :construction_worker: trying a more recent compiler
REVERT: 937d68e2e5 :construction_worker: forgot old PATH
REVERT: 989ad9b759 :construction_worker: using help from https://stackoverflow.com/a/48509334/266378
REVERT: 067e288289 :construction_worker: set build type
REVERT: 7bbc06b487 :construction_worker: forgot quotes
REVERT: 441e5d87e6 :construction_worker: experimenting with AppVeyor and MinGW
REVERT: 7fa4ddf93e :lipstick: fixed indentation
REVERT: bf348ca8a4 Merge pull request #1028 from gracicot/develop
REVERT: ed6a0686df :hammer: small refactoring to improve branch coverage
REVERT: c8bfdfd961 :construction_worker: tryping different platforms for AppVeyor
REVERT: c02de445bf :rotating_light: fixed more compiler warnings
REVERT: 66dd1a846d :rotating_light: fixed more compiler warnings
REVERT: 850922269d :rotating_light: removed compiler warnings
REVERT: 0460b90977 :memo: fix for #1052 #1139
REVERT: 85f35a1d59 :memo: documentation fix
REVERT: e7c1638d11 :lipstick: cleanup
REVERT: 1c81e9f5ae Merge pull request #1130 from agrianius/develop
REVERT: d505ed7b31 Merge pull request #1138 from theodelrieu/feature/unordered_map_conversion
REVERT: 2c920a1032 run make amalgamate
REVERT: 2b37d7ed86 from_json: add overload for std::unordered_map
REVERT: 299469cfd5 from_json: add missing template arguments for std::map
REVERT: 1566ad4053 fixed compile error for #1045; to_json for iternation_proxy_internal was needed
REVERT: f574d7e084 simplify templates for operators, add more checks
REVERT: cd28d872e7 forward declarations to make new compilers happy
REVERT: 3d3055909c define global operator< for const char* and alt_string
REVERT: 4feb8211ca test (non)equality for alt_string implementation
REVERT: 14e6278c2f Merge branch 'develop' of github.com:gracicot/json into develop
REVERT: 7acd90b651 Fixed check for compatible string type
REVERT: 5676a2a076 Aligned template declaration
REVERT: e0e7fa39e7 Re-added external_constructor with string compatible types
REVERT: 4778c02ab5 Set MSVC version from 1514 and older
REVERT: 714c592680 Disabled implicit conversion to string_view on MSVC 15.13 and older
REVERT: e830bc502f Merge pull request #1117 from TinyTinni/develop
REVERT: ecadcdb593 added char cast
REVERT: 48656a49f5 typo
REVERT: 64acb42aa7 remove stringstream dependency
REVERT: 8efbf8d7bb :memo: documentation to avoid future issues like #1108
REVERT: e5a67fc3f8 Merge branch 'develop' of https://github.com/nlohmann/json into develop
REVERT: a49644ab74 :ambulance: adjusted Fuzzer to new parser
REVERT: 0efaf891e5 Merge pull request #1089 from theodelrieu/feature/map_conversion
REVERT: c5e63fd684 Provide a from_json overload for std::map
REVERT: db03d09312 Merge branch 'feature/key_ref' into develop (fixes #1098)
REVERT: cf9299d222 Merge branch 'feature/sax2' into develop #971
REVERT: 3cdc4d784b :memo: added documentation
REVERT: adf09726b0 Merge branch 'develop' into feature/sax2
REVERT: 481ace65c4 :hammer: only calculate array index string when needed #1098
REVERT: 1c6b332dcd :ok_hand: mitigating cppcheck bug #1101
REVERT: 90eb0a91e0 :zap: keys are now returned as const reference #1098
REVERT: 1f84cc2c88 :white_check_mark: adjusted test cases
REVERT: 717301d1bc Merge branch 'testsuite' into feature/sax2
REVERT: 4639bb2c8f :white_check_mark: added more tests from recent nst's JSONTestSuite
REVERT: e94862a649 :ambulance: fixed error in callback logic
REVERT: ae213721b1 :hammer: removed unget function for wstring parsers
REVERT: 5ff2abb90d Merge branch 'develop' into feature/sax2
REVERT: 567fe9b7a0 Merge pull request #1078 from martin-mfg/patch-1
REVERT: 377e956655 fix typo in readme
REVERT: 5da596385b Update issue templates
REVERT: 7bbe7bb98f :fire: removed old issue template
REVERT: 14f01e1981 :wrench: update issue templates
REVERT: 86b0732a10 :memo: added public key used for commits and releases
REVERT: ed69e50ad2 :page_facing_up: added SPDX-License-Identifier
REVERT: 5bc4ff9da3 Merge branch 'feature/wstring' into develop
REVERT: fa3e42f826 Merge branch 'develop' into feature/wstring
REVERT: b5d1755dfb :fire: removed commented-out test cases #1060
REVERT: 0ab8fab338 Merge pull request #1058 from dns13/patch-1
REVERT: 65b4d8251b Fix typo in single_include, too
REVERT: 53fb230098 Fix typo
REVERT: 46ec2fddf8 :memo: updated THANKS list
REVERT: b8bfd1140d Merge pull request #1048 from chuckatkins/misc-cmake-packaging-enhancements
REVERT: 33a2154f8d Enable target namespaces and build dir project config
REVERT: 29362c6ace Merge pull request #1047 from jammehcow/patch-1
REVERT: c02a3155d4 :construction_worker: added Xcode 9.3 builder
REVERT: 8d8f890771 :hankey: first try on #1045
REVERT: 7f20e9ddc7 Fixed incorrect version number in README
REVERT: 031b88d315 Make the CMake install dir user-configurable
REVERT: aaee18ce90 Added test for string conversion with string_view
REVERT: 7c503c64b7 Merge pull request #1043 from coryan/patch-1
REVERT: 4286b16b71 Fix trivial typo in comment.
REVERT: cf91b4f2bb Merge branch 'develop' into feature/wstring
REVERT: f924df1835 Merge branch 'develop' into feature/sax2
REVERT: acf10d9af7 Merge pull request #1041 from ax3l/topic-spack
REVERT: e1ea8369ad Merge branch 'develop' into feature/sax2
REVERT: 40f279c59d Merge branch 'feature/issue1021' into develop
REVERT: 18a0271a95 Merge branch 'develop' into feature/issue1021
REVERT: 1ae9896387 Package Manager: Spack
REVERT: 83b143382e Merge pull request #1040 from ax3l/topic-debugViewMSVCcmakeMin
REVERT: e439a1a9a7 CMake: 3.8+ is Sufficient
REVERT: 495436a5d5 Merge pull request #1026 from ktonon/develop
REVERT: a35d414c39 Update CMake to latest on Travis
REVERT: 08a7233d1b :ambulance: fixed commit 1e08654
REVERT: 1e08654f99 :hammer: cleanup
REVERT: aa89c5e048 :hammer: removing unget_character() function from input adapters #834
REVERT: 6678eb2b4a :white_check_mark: improved test coverage #1031
REVERT: 16c5bfeaad :ok_hand: fixed compiler warnings #1031
REVERT: 727dd4664b :hammer: trying to make tests run with MSVC #1031
REVERT: ab89ae4e50 :hammer: trying to make tests run with MSVC #1031
REVERT: eb06d0531a :construction: added input adapter for wide strings #1031
REVERT: ba6edd5634 :hammer: cleanup
REVERT: 850671b9f1 :hammer: using a vector<bool> for the parser hierarchy
REVERT: 4efa8cdb4c :green_heart: fixed Valgrind options #1030
REVERT: 830c93fd09 :memo: fixed example for operator> #1029
REVERT: c78dbc366c Added test for conversion to string_view
REVERT: 53d8d57921 Amalgamate single include
REVERT: 5f723bbec6 :hammer: realized callback parser wirh SAX interface #971
REVERT: 896a9db461 :hammer: improved code #1021
REVERT: 73cc5089e3 Using target_compile_features to specify C++ 11 standard
REVERT: a9baab76c2 :ambulance: fix for #1021
REVERT: 4f6b2b6429 :hammer: changed SAX interface
REVERT: 2537677e4c :white_check_mark: improved test coverage
REVERT: 9e1abb4842 :white_check_mark: improved coverage
REVERT: 1e38ffc014 :white_check_mark: more tests
REVERT: 25f56ff207 :memo: updated documentation
REVERT: 99ecca55c4 :white_check_mark: improved test coverage
REVERT: 9e07e9b4ec :sparkles: implemented non-throwing binary reader
REVERT: a271ee5f16 :recycle: proper use of SAX parser for binary formats
REVERT: 943d641054 :hammer: some refactoring
REVERT: 22929fe189 :construction: started a SAX/DOM/callback parser
REVERT: 375b05a17d :hammer: cleanup
REVERT: 606a25195f :white_check_mark: improved test coverage
REVERT: c87ffad45c :recycle: implemented a non-recursive parser
REVERT: 2a5506ed98 Amalgamated headers
REVERT: 8165707990 basic_json now supports getting many type of strings
REVERT: 27cf05af8d Merge branch 'develop' into feature/sax2
REVERT: d2dd27dc3b Merge branch 'release/3.1.2' into develop
REVERT: 183390c10b Merge branch 'release/3.1.2'
REVERT: 8a6c8cb0f7 :bookmark: set version to 3.1.2
REVERT: afef474c0d :bookmark: set version to 3.1.2
REVERT: a52e8355b8 :rewind: oops
REVERT: 21410d50af :checkered_flag: moved /Wall to CMake
REVERT: 829ed74d66 :checkered_flag: experimenting with /Wall
REVERT: 1262d474eb :checkered_flag: fixed an MSVC warning
REVERT: 282bafae4f :hammer: fixed compilation error
REVERT: abac6a0e84 Merge branch 'develop' into feature/sax2
REVERT: 919d1fef8f Merge pull request #1009 from nlohmann/user_string_parser
REVERT: 8557151d90 :recycle: adjusting lexer/parser in symmetry to #1006
REVERT: b56ac86471 :memo: thanks for #1006
REVERT: 0cab3b2c8e Merge pull request #1006 from agrianius/dump-template
REVERT: 3d4f6a2940 :hammer: cleaner exception interface
REVERT: ad47b0fbde :recycle: refactored binary readers to use a SAX parser
REVERT: 392c033805 test refactoring
REVERT: 51349537fc add unit test: checking dump to alternative string type
REVERT: 830f3e5290 forward alternative string class from output_adapter to output_string_adapter
REVERT: ed6b1464f9 dump to alternate implementation of string, as defined in basic_json template (changes to amalgamated code)
REVERT: faccc37d0d dump to alternate implementation of string, as defined in basic_json template
REVERT: 149d2fd09c :green_heart: improved test coverage
REVERT: 6399cd3039 Merge branch 'develop' into feature/sax2
REVERT: 6151dfaed7 :ok_hand: made changes proposed in #1001
REVERT: 35e43df625 Merge branch 'develop' into feature/sax2
REVERT: 9918523077 :memo: cleanup after #1001
REVERT: e737de8941 Merge pull request #1001 from nlohmann/leak
REVERT: aa8fc2a41c :ambulance: hopefully fixed the memory leak
REVERT: 7c1a788893 Merge branch 'develop' into feature/sax2
REVERT: cf60e18c89 :fire: removing failing test (work on this in branch "leak")
REVERT: 97559bb1b2 :hammer: trying to fix the leak
REVERT: 38345fd06c :ok_hand: fixed some more warnings
REVERT: 8b379948d0 :fire: replaced acceptor with SAX parser
REVERT: 303a0c5843 Merge branch 'develop' into feature/sax2
REVERT: d183d34b96 :green_heart: added another test case
REVERT: d2d65bb25b :recycle: refined SFINAE to fix some warnings
REVERT: 476b2e09be :green_heart: added regression tests for #972 and #977
REVERT: 62030615a0 Merge pull request #986 from theodelrieu/fix/basic_json_conversion
REVERT: 5beab80553 :hammer: using the SAX-DOM parser
REVERT: faf2546a15 :hammer: simplified SAX-DOM parser
REVERT: 5b9d03cfdb :hammer: added SAX-DOM-Parser
REVERT: 9d27429527 :hammer: added error messages to SAX interface
REVERT: 86991d5204 Merge branch 'develop' into feature/sax2
REVERT: fdecbf6e1e Merge pull request #992 from bogemic/pvs_studio_fix_misprinted_condition
REVERT: fd30ad8a14 did make amalgamate
REVERT: 2a2ed799b1 pvs_studio fix. misprinted condition
REVERT: 8d104e6fe3 :green_heart: fixed test case
REVERT: 5773e164bb :rotating_light: fixed a linter warning
REVERT: 8711ec6034 support construction from other basic_json types
REVERT: c22f2d41f3 missing CHECK_NOTHROW in unit-udt
REVERT: 3ff9455332 :hammer: added a SAX-DOM-Parser
REVERT: 21352c4d8e :recycle: refactored SAX parser
REVERT: 981e226ca2 Merge branch 'develop' into feature/sax2
REVERT: 1f3d2a3be7 :memo: overworked README
REVERT: 13ca723c38 Merge pull request #981 from wla80/develop
REVERT: 05d3bf1699 Make integration section concise
REVERT: 8d6b3d44d6 :ok_hand: fixed some compiler warnings
REVERT: 8c7f46f7d0 :hammer: removed a logic error and improved coverage
REVERT: 922f7a3d0e :white_check_mark: added more tests for SAX parsing
REVERT: ac230e8b4b :hammer: fixed test cases to be more robust
REVERT: 374ebacc51 :sparkles: added a SAX parser #971
REVERT: 8968adcd53 Merge branch 'release/3.1.1' into develop
REVERT: c8ea63a31b Merge branch 'release/3.1.1'
REVERT: 8424d10e45 :bookmark: set version to 3.1.1
REVERT: 938c861a09 :bookmark: set version to 3.1.1
REVERT: 94b7a8da66 :lipstick: fixed indentation
REVERT: 20b5f4d89c Merge pull request #969 from theodelrieu/fix/924
REVERT: 01d6118828 Fix constraints on from_json(CompatibleArrayType)
REVERT: b02e3bb0b6 Merge pull request #957 from theodelrieu/fix_coveralls
REVERT: 41db7cd818 Make the coveralls job use the multiple header version
REVERT: 447f5421eb :hammer: overworked release target
REVERT: 61f0bfb15c :hammer: enforce using Python 2 for the wandbox script
REVERT: 548f488941 :hammer: overworked Makefile
REVERT: 865ff00de0 :memo: updated documentation wrt. objects #963
REVERT: addbbbe136 Merge branch 'develop' of https://github.com/nlohmann/json into develop
REVERT: 0a64982e86 :memo: cleanup after #954
REVERT: e5d538c5ea Merge pull request #954 from pfultz2/patch-1
REVERT: 2dda87c3b7 Merge branch 'feature/coverage_multi' into develop
REVERT: 5731695d7b Clarify dev version and add space after the word flag.
REVERT: 74675dd69c :rewind: back to the original version
REVERT: 50863c5a09 Latest updates based on feedback
REVERT: ab05df3a48 :hammer: another try
REVERT: b455154cc9 :hammer: another try
REVERT: 1e8f4d6ab3 :hammer: more trying
REVERT: 316634e129 :hammer: added quotes around parameters
REVERT: 0111f3187e :hammer: working on #953
REVERT: 83db7876c5 :checkered_flag: removing test case that fails on MSVC #962
REVERT: 33a9b00ce6 :bug: fix for #962
REVERT: 8b457ace25 :bug: fixing CBOR's indefinity length strings #961
REVERT: 556e30f759 Merge pull request #955 from patrikhuber/patch-1
REVERT: ee76436592 Change to angle brackets
REVERT: 737cffe0cb :hammer: fixed directory for lcov coverage
REVERT: ae688016f6 Changed links from master to develop branch
REVERT: 2b7b39c72d :rocket: added release target #956
REVERT: 44b40d7c6a Fix links in README.md
REVERT: 3402260983 Add a note about installing the library with cget
REVERT: 3a887dc9fe :construction_worker: fixed coveralls
REVERT: 5c2a0a511e :construction_worker: fixed coveralls
REVERT: b779666916 :construction_worker: re-added homebrew tests
REVERT: 97309f0da9 Merge branch 'release/3.1.0' into develop
REVERT: 15acf260ca Merge branch 'release/3.1.0'
REVERT: a8fcfd9880 :construction_worker: fixed travis file
REVERT: f5c03999d0 :hammer: fixed benchmark compilation
REVERT: 0258484626 :bookmark: set version to 3.1.0
REVERT: ce7d0ebf5d Merge pull request #944 from theodelrieu/fix/cmake_install
REVERT: 14cd019861 fix cmake install directory (for real this time)
REVERT: 9958dde3da Merge pull request #950 from kaidokert/develop
REVERT: aed4a080bf Templatize std::string in binary_reader #941
REVERT: e8bf1f62f7 :sparkles: added define for library version #948 #943
REVERT: 552d153842 :memo: added more statistics on binary formats
REVERT: 60e2d28eb7 :bug: fix for #947
REVERT: 51c774f208 :memo: added documentation for binary formats
REVERT: 57e6fddd90 :rotating_light: fixed warnings
REVERT: f7131715b1 Merge branch 'develop' of https://github.com/nlohmann/json into develop
REVERT: ce273af9b6 :memo: added documentation for binary formats
REVERT: ae235139b9 Merge pull request #940 from kaidokert/develop
REVERT: 8049442c2a :hammer: rename yytext to token_buffer (fixes #933)
REVERT: d0c9e5fffc Allow overriding THROW/CATCH/TRY macros with no-exceptions (redo) #938
REVERT: b3bd3b726b :memo: added link to OSS-Fuzz project repository
REVERT: 52e9449563 :memo: added more functions to overview
REVERT: cb4a9c85cb :hammer: excluded code from coverage
REVERT: 1483d39c91 :hammer: moved class json_pointer into separate file #920
REVERT: e95578f884 :memo: documented JSON Merge Patch (RFC 7386)
REVERT: 102c474397 :hammer: clean up
REVERT: 6855bbb902 :hammer: split "parsing" directory to "input" and "output"
REVERT: 05f49fa401 :white_check_mark: added roundtrip tests for UBJSON
REVERT: f0b26c8f38 :white_check_mark: added fuzzer for UBJSON input
REVERT: b0a68f540f :white_check_mark: added roundtrip tests for UBJSON
REVERT: 1be3935e9d :memo: cleanup after #936
REVERT: 7aace7c976 Merge pull request #936 from zerodefect/improvement/fix_kmin_compiler_warning
REVERT: 0e2211df0e Merge pull request #925 from zerodefect/improvement/improve_readme_json_fwd
REVERT: 95cf1fefaa Removed compiler warning about unused variable 'kMinExp'.
REVERT: 355c1e946b :construction_worker: added task to check amalgamation #906
REVERT: dbfd7e532b Merge branch 'develop' of https://github.com/nlohmann/json into develop
REVERT: 3c68a796df :fire: deprecated iterator_wrapper #874
REVERT: f05c3edc21 Merge pull request #930 from Pipeliner/develop
REVERT: f5c4e9f3a1 Merge pull request #919 from theodelrieu/fix/sfinae_for_incomplete_types
REVERT: 7eabb6ba36 :memo: updated documentation for UBJSON functions
REVERT: fc32b8a9bc Fix a typo in README.md
REVERT: 3cca630836 :hammer: cleanup after #915
REVERT: 010e596001 Merge pull request #915 from abolz/dtoa
REVERT: 3d776b0582 :memo: updated README
REVERT: 9e5d901f55 Merge branch 'feature/ubjson' into develop
REVERT: 327b8bb09e Merge branch 'feature/strings' into develop
REVERT: d2b3fd156e Updated README.md to explain how installation of json_fwd.hpp can be achieved as part of install step.
REVERT: b406e3704b :heavy_plus_sign: using Google Benchmark #921
REVERT: a8f711a2f1 :heavy_plus_sign: using Google Benchmark #921
REVERT: 6402077ac2 Merge pull request #876 from nlohmann/feature/rfc7396
REVERT: dcee778c1e fix sfinae on basic_json UDT constructor
REVERT: 7456f1d87b :recycle: re-used existing UTF-8 decoder to simplfy string serialization
REVERT: afe4571309 :hammer: cleanup + some noexcept
REVERT: b182308eff :hammer: cleanup
REVERT: 9b9919d460 Use max_digits10 in dump_float for float->text->float round-trip
REVERT: 810f81bbd9 Regenerate src/json.hpp
REVERT: 787204f076 Add unit-tests for detail::to_chars
REVERT: 9f7c2c04c8 Use the Grisu2 algorithm for formatting 'float's and 'double's
REVERT: 332f352033 Add an implementation of the Grisu2 algorithm for binary to decimal floating-point conversion
REVERT: 0695ac4001 Add tests for #360
REVERT: 68a9736738 Tests: Re-enable some round-trip tests
REVERT: 6e2e466c27 Tests: Don't rely on the format used for floating-point formatting
REVERT: 107c21a488 Tests: Exponents are formatted with a leading '+' sign
REVERT: 3ae82d91a2 Tests: Floating-point formatting uses lower case 'e'
REVERT: 92f7295063 :hammer: cleanup
REVERT: 3ac674562f :hammer: clean up
REVERT: d9446b0e6e Merge pull request #911 from theodelrieu/fix/cmake_install
REVERT: 9d6b3731b9 :white_check_mark: improved test coverage
REVERT: 06cddd371b :hammer: removed failing amalgamation test
REVERT: f85f4967fe :white_check_mark: improved test coverage
REVERT: 6965ff00c8 Merge branch 'develop' into feature/ubjson
REVERT: 411c16cbb2 :memo: overworked documentation wrt.…
victorxcl added a commit to victorxcl/CLIPS-unicode that referenced this issue Jun 29, 2020
972d6a3842 1. 将CLIPS的代码(包含扩展)做成了CMakeLists.txt的模式:便于多项目之间自动管理依赖和链接:)
3c5a3237ad 1. 清理了xclips的冗余花括号;)
b475573a4b 1. xclips的扩展zmq发送数据的长度不正确的BUG得到了修复:) 2. xclips的zmq扩展添加了一个zmq_close函数:)
0d06803c41 1. 补充了一个macos遗漏的xcconfig数据
b7884259b2 1. 将在xcode里面配置的各种项目属性拿到了独立的xcconfig文件中:这样后面类似的项目使用起来更方便:)
01b78370fc 1. 将CLIPS扩展里面的CLIPS协议更换为SEXP协议,同时将read-clips修改为read-sexp:这样,就可以用到CLIPS之外的LISP语言上:)
1d04fcff41 1. 完善了CLIPS的JSON扩展的value_for_path和set_value_for_path函数:)
6ccbcfcfe5 1. CLIPS的JSON扩展库,第一次编译测试通过了;)
187a3624a1 1. 给socket的扩展添加了block_reading的读取功能:实现【等待】能力;)
243f672a5d 1. 添加了zmq扩展的version函数;)
a58373b275 1. 给zmq的扩展添加了RAW的protocol
5c8b442d8c 1. 删除router的回显显示:这是多余的操作,用户可以自己来操作
c0f2d17728 1. socket可以发送任意的子节序列了:将之前的protocol从socket里面剔除了;同时读取的时候,不会发生阻塞了;)
873e4d9283 1. 修正了uuidgen的编译错误:因为我clips.h头文件里面定义了太多的【短宏】和boost的uuid库里面的LHS和RHS冲突了!
8fcd588bf6 1. 给CLIPS的扩展添加了一系列的utility函数:)
5481c08a71 1. 添加了expand-for-eval和expand-and-eval两个函数:但是有些限制,暂时没用上:(
8607930317 1. 添加了read-until的CLIPS扩展函数:主要用于process的处理:)
e6ca7a0ef3 1. 用宏的方式来简化了CLIPS扩展的代码量:主要是重复代码
9c0361dd82 1. 发现了一处zmq解析协议的BUG:需要同时支持CLIPS和JSON格式:)
0041fc0f82 1. 添加了process的terminal的支持:使得CLIPS可以直接利用第三方的命令行工具作为自己的子函数(微服务):O) 2. 结果process的system-output函数也做到process模块里面了;) 3. 修复了一个clips::boolean类型的一个bug
9037810238 1. 重命名read-system为system-output:语义更加明确
b0757bba84 1. 调整了CLIPS的扩展,使其能够在iOS下也能正常工作了;)
1b2f1be749 1. 添加了read-system的函数:能够从命令行的输出中返回结果了;)
d5a4c88c4a 1. 添加了boost_1_73_0的代码:)
dedb452bfd 1. 关闭了一处CLIPS扩展的日志输出
c08ab5dafd 1. 给CLIPS扩展添加了mustache_render_with_partials函数:用于使用mustache模版引擎的partials功能:) 2. 重命名test-bench-execute为:test-benchmark:)
6af0c40726 1. 添加了CLIPS扩展支持的协议:CLIPS和JSON两种协议:)并改善了错误报告:)
bd391aa7c5 1. 修正了CLIPS的String扩展在输出给router时候的问题:之前只处理了输入,现在处理输出
71bfba3252 1. 将readcommand调整为read-command:这样就和CLIPS的read-number的习惯吻合了;)
cfb3ad7811 1. 给CLIPS的扩展添加了readcommand命令:用于读取一个完整的command:在使用ZMQ和socket的时候很必要:)
487dabcb55 1. CLIPS的socket扩展也能够一次读取一个完整的命令了;)
8182908268 1. 现在ZMQ的CLIPS绑定已经可以按照CompleteCommand的方式来缓存一个完整的命令在发送出去了;)
51177fed47 1. 给CLIPS的String的词法在只有【双引号】的基础上添加了【反引号】【单引号】功能支持:尽量减少了使用【 斜杠\】转义的需求!
a5c9065cbe 1. 给CLIPS扩展添加了mustache的模版引擎支持:)
84a678c09b 1. 成功的引入了ZMQ的功能到CLIPS扩展中:)
fd2d7f74dc 1. 发现CLIPS的API里面的argumentCode和expectBits有关系,但是并不一样!!!
013f018f34 1. 发现了测试中的一些bug:对CLIPS的扩展的test_bench功能进行了测试:)
791cd81896 1. 重命名select_action为create_primitive_value:更加贴近具体的意义
f37bdc52fb 1. CLIPS的扩展终于完全正确了:(read)已经可以读取到正确的值了:)之前没有使用RouterUnreadFunction
9b102f94bb 1. 清理了clips扩展中的不需要的内容
8c5f26bb33 1. boost::asio的socket添加到了CLIPS中:也就是说,从今以后,xclips可以直接使用网络了;)
d6fa51b303 1. 改写了clips.hpp和clips.cpp文件,首次支持了network的router功能:还未经过严格的测试!
9d31a33723 1. 添加了libzmq的ios版本的ignore描述
ed464d0dc0 1. 添加了mstch.git的submodule:git的submodule被提交了;)
c0b533a865 Merge commit '7f82b73a2f035d403a7130fc1f24af8bdea2603d' as 'lib3rd/mstch.git'
7f82b73a2f Squashed 'lib3rd/mstch.git/' content from commit 0fde1cf94
774da9e0ef 1. 添加README的内容描述了mstch.git的subtree和submodule:)
77f83483f2 1. rpc.git子模块的路径错误:删除之!
a6c208be67 1. 添加了rpclib.git的子模块:)
3859c03acd Merge commit '2c2a7ed46e66d3f950e8b6a7535a426d74e9ba05' as 'lib3rd/grpc.git'
2c2a7ed46e Squashed 'lib3rd/grpc.git/' content from commit c07ddb4504
8f9fb5bb54 1. 添加了grpc的子模块 2. 添加了备注到README
e36912c152 1. 确保CLIPS_unicode的clips_core_6_40在macOS和iOS下都可用:主要区别是system函数,iOS下不可用
3424cfdfa5 Merge commit 'ddec83cd12c8291848d6f0fffffd2d6632d46f4c' as 'lib3rd/nlohmann-json.git'
ddec83cd12 Squashed 'lib3rd/nlohmann-json.git/' content from commit 456478b3c
2e40a6d3ae 1. 忽略了libzmq.git和rttr.git的build文件:)
243f5ce3a3 1. 调整了yoga.git的编译选项:使得其能够在iOS和macOS下都能够使用:)
4144a547fa 1. nlohmann-json.git的subtree制作错误:需要修正!
56385dfb0c 1. 修正GraphViz的sincos链接的问题:系统的sincos是C++的Symbol,C暂时不能用!!!
5c752390a7 1. 调整GraphViz的plugin代码从【SHARED】改为【STATIC】形式:且在xcode的linker中添加【-all_load】链接选项;然后将union_find.c从libspine.a中剔除(和libcommon.a重复了),终于链接通过了:)
9fa0502000 1. 修改graphviz.git的subtree代码:使其能够在macOS和iOS下正常使用:)
d22bbd6573 1. 添加了boost_1_72_0的源代码:)
6a1e39def2 Merge commit 'c599d74aa6c40018e53a4248c4df0ef3da4be3ac' as 'lib3rd/clips_uml.git'
c599d74aa6 Squashed 'lib3rd/clips_uml.git/' content from commit 7bd70cb68
ab6550485e Merge commit 'b674b6386c63840269a33c3ae6c9ebdcad4499d0' as 'lib3rd/clips_core_6_40.git'
b674b6386c Squashed 'lib3rd/clips_core_6_40.git/' content from commit 516c97053
eb2a817ed4 1. 更正了添加subtree的脚本:前面有错误!
772fdd4309 Merge commit '65f786ffecb67ad12562461c5004ae1243d3d1b8' as 'lib3rd/graphviz.git'
65f786ffec Squashed 'lib3rd/graphviz.git/' content from commit f8b9e0351
93e55cb88a Merge commit '958153ed0dc0c1eb8d56efddfff1b3b2eba06f91' as 'lib3rd/nlohmann-json.git'
958153ed0d Squashed 'lib3rd/nlohmann-json.git/' content from commit 6ad0a586e
b00486b488 Merge commit '1bdf861f36fe2684a8a8c8ab33b2fef4c416234f' as 'lib3rd/rttr.git'
1bdf861f36 Squashed 'lib3rd/rttr.git/' content from commit b16fccf0f
5fc0beca1a Merge commit '3dff2711ebf2329c63a2321ec4f4e760e202cbfc' as 'lib3rd/cucumber-cpp.git'
3dff2711eb Squashed 'lib3rd/cucumber-cpp.git/' content from commit dd424c1a9
dd876f76fd Merge commit '67e0ed5d6c1dfdbe59205bf56afc354e54416261' as 'lib3rd/yoga.git'
67e0ed5d6c Squashed 'lib3rd/yoga.git/' content from commit a96a36ef5
e61dae7b09 Merge commit 'b2454f0c14c18e13cb71a8be0b25ec8d0c96591b' as 'lib3rd/fmt.git'
b2454f0c14 Squashed 'lib3rd/fmt.git/' content from commit 5944fcad3
07d93fd16b Merge commit '6f6c4814e5c78cea60e31b9921ce50e8a8f86402' as 'lib3rd/rpclib.git'
6f6c4814e5 Squashed 'lib3rd/rpclib.git/' content from commit 3b00c4ccf
53274f487f Merge commit '1dd083468264c4604aee3ae024704ba5e4e973cf' as 'lib3rd/libzmq.git'
1dd0834682 Squashed 'lib3rd/libzmq.git/' content from commit f00f46456
2f22b31685 Merge commit 'aacec21578be08301d16795093d53773ac327f0d' as 'lib3rd/cppzmq.git'
aacec21578 Squashed 'lib3rd/cppzmq.git/' content from commit a3e5b54c3
ee739256ef Merge commit '9f189958342e9b6a9d40afd6e455835953c86145' as 'lib3rd/cpplinq.git'
9f18995834 Squashed 'lib3rd/cpplinq.git/' content from commit 581f9a981
3b0c13428b Merge commit '802b64f830c24b12bab1877d888fc48ddf479f79' as 'lib3rd/cppcoro.git'
802b64f830 Squashed 'lib3rd/cppcoro.git/' content from commit 92892f31d
6034403f33 Merge commit '5ad8caf8f6a59fd769d6f71edd718ab594dccb07' as 'lib3rd/catch2.git'
5ad8caf8f6 Squashed 'lib3rd/catch2.git/' content from commit 37cbf4a4f
ff27304c91 Merge commit 'a03ac0b68644c6e26c26d4a8134656bfb50bcf89' as 'lib3rd/rxcpp.git'
a03ac0b686 Squashed 'lib3rd/rxcpp.git/' content from commit a71a89a27
6ad0a586e4 1. 添加了更新submodule的子子孙孙的README
07b5419f00 1. 添加完成了所有的submodule:)
1dc9e87948 1. 增加了subtree和submodule的说明文件
978b3336ff 1. 提交一个README来初始化git仓库
REVERT: 456478b3c5 Merge branch 'release/3.7.3'
REVERT: c5eafe74e8 :bookmark: set version to 3.7.3
REVERT: c6e1e26018 Merge pull request #1838 from nickaein/fix-quadratic-destruction
REVERT: efa13c663d Reserve stack only for top-level items
REVERT: 948f98cf4a Cleanups
REVERT: 0f3ec003bb Remove harmful vector::reserve during destruction (#1837)
REVERT: be61ad1470 :art: fix inconsistent operator style
REVERT: 411158d896 Merge branch 'release/3.7.2' into develop
REVERT: 5f09b502b6 Merge branch 'release/3.7.2'
REVERT: 56109eacd7 :bookmark: set version to 3.7.2
REVERT: 7b0c50b9a5 :hammer: add path
REVERT: 0a513a35cb Merge pull request #1436 from nickaein/iterate-on-destruction
REVERT: 7e2445a0f4 Move deep JSON test to a separate unit-test
REVERT: 68d0a7b246 Reduce depth in unit-test to avoid choking valgrind
REVERT: eec1974218 Merge remote-tracking branch 'nlohmann/develop' into iterate-on-destruction
REVERT: 67259d698f Merge pull request #1830 from nlohmann/whitesource/configure
REVERT: 760076abca Add .whitesource configuration file
REVERT: 1a9de88117 :rotating_light: fix a linter warning
REVERT: d98bf0278d Merge branch 'release/3.7.1' into develop
REVERT: 43e4db6141 Merge branch 'release/3.7.1'
REVERT: aacdc6bbe3 :bookmark: set version to 3.7.1
REVERT: 0f6a58eeaf :busts_in_silhouette: update contributors
REVERT: 1e9f16dff0 :rotating_light: fix linter errors
REVERT: c0ae88bf50 :rotating_light: fix linter errors
REVERT: 62dada05ca :bug: fix conversion to std::valarray
REVERT: 7bcaba0ca9 Merge pull request #1821 from AnthonyVH/develop
REVERT: 1ca6f2901b Merge pull request #1826 from cbegue/develop
REVERT: abccafa5c5 :arrow_up: upgrade Doctest to 2.3.5
REVERT: c4923e3d05 Merge remote-tracking branch 'upstream/develop' into develop
REVERT: ec9647ae63 Moved test for #1647 regression to regressions file.
REVERT: 8b686b30eb Add restriction for tuple specialization of to_json
REVERT: 3790bd9ae0 :construction_worker: add Xcode 10.2
REVERT: 42e9ad32c6 :hammer: remove full path
REVERT: e779714dd8 :construction_worker: add Xcode 10.2
REVERT: bf2afaeee6 :loud_sound: add version output
REVERT: 6a4cc29f01 :memo: update examples
REVERT: dfe53c36da :rotating_light: fix UBSAN warnings
REVERT: 0db1692f45 :busts_in_silhouette: update contributors
REVERT: 1307862b1d Merge pull request #1694 from eli-schwartz/release-include-meson
REVERT: 4d1e4c6d93 Merge pull request #1780 from t-b/add-msvc-16-2019
REVERT: a1828bbf57 Merge pull request #1806 from cbegue/develop
REVERT: 794a3d411a Fix issue #1805
REVERT: ddda67a096 Don't capture json input by value (fixed #1822).
REVERT: fb9a2643c8 Add test for #1647.
REVERT: 27d0dfc17a Fix #1647: non-member operator== breaks enum (de)serialization.
REVERT: f272ad533d :busts_in_silhouette: add CODEOWNERS file
REVERT: f7e7a62358 :pencil: add comment on JSON_THROW_USER, JSON_TRY_USER, and JSON_CATCH_USER
REVERT: 507d5676ad :rotating_light: fix warning
REVERT: 00cb98a3d1 Merge pull request #1803 from flopp/spelling
REVERT: b93d414a35 Fix some spelling errors - mostly in comments & documentation.
REVERT: f4332d4097 README: describe how to use json as a meson subproject
REVERT: 84faa36ec5 release: add singleinclude and meson.build to include.zip
REVERT: 0245ae5157 Merge pull request #1797 from t-b/fix-integer-truncation
REVERT: 4c06191836 Merge pull request #1799 from nemequ/develop
REVERT: fbcbc76d10 Update Hedley to v11.
REVERT: c6cbdf96a9 appveyor.yml: Add debug build on x64 and VS 2019
REVERT: 01e486bb55 appveyor.yml: Add MSVC 16 2019 support
REVERT: 35b47c2793 iteration_proxy: Fix integer truncation from std::size_t to int
REVERT: 5541a2bd25 test/cmake_import: Pass the generator platform required by MSVC 2019
REVERT: 7a521150aa appveyor: Pass the generator platform explicitly
REVERT: ed5541440a Merge pull request #1779 from t-b/avoid-using-glob-in-cmake
REVERT: eb6fe421ae test/CMakeLists.txt: Use an explicit list instead of GLOB
REVERT: d187488e0d Merge pull request #1765 from crazyjul/fix/items-with-alt-string
REVERT: dae0fe79af Merge pull request #1769 from chris0x44/json_pointer
REVERT: d826282f53 Merge pull request #1767 from 0xflotus/patch-1
REVERT: 4615f5a980 Provide default implementation for int_to_string, but allow for overloaded function
REVERT: 7476f5ee0c Make json_pointer::back const (resolves #1764)
REVERT: d7579b8cbf did you mean 'serialization'?
REVERT: 0f073e26eb Allow items() to be used with custom string
REVERT: 99d7518d21 :memo: add OSS Fuzz status badge
REVERT: e2c531a1f7 Merge pull request #1760 from Xav83/cppcheckFixes
REVERT: 87afee1c39 Runs make amalgamate on the project.
REVERT: 13a7c60257 Correct a warning from cppcheck:
REVERT: b9dfdbe6be Correct a warning from cppcheck:
REVERT: 771d5dadc6 Merge pull request #1741 from tete17/Fix-SFINAE
REVERT: e26a2904fc Fix and add test's for SFINAE problem
REVERT: 06ccd43a2a Merge pull request #1722 from t-b/fix-int64-min-issue
REVERT: a6bd798bfa Merge pull request #1728 from t-b/fix-clang-sanitizer-invocation
REVERT: 8067c3ca5b Add serialization unit tests for extreme integer values
REVERT: 70aa8a31a2 Add regression test for dumping the minimum value of int64_t
REVERT: 6ce2f35ba8 Fix outputting extreme integer values in edge cases
REVERT: 6d701b29df .travis.yml: Increase the timeout to 45 minutes
REVERT: d5c0d52f37 external_constructor<std::valarray>: Handle empty array properly
REVERT: 61fe5f1eee input_buffer_adapter: Fix handling of nullptr input
REVERT: 9ea3e19121 .travis/cmake: Rework clang sanitizer invocation
REVERT: f0bff49ffd test/CMakeLists.txt: Remove trailing whitespace
REVERT: eab68e7750 :construction_worker: add test step
REVERT: 90c1c24ccb :construction_worker: try GitHub Actions
REVERT: bf4156056b :pencil2: fix a typo
REVERT: b6ee34cc99 Merge branch 'develop' of https://github.com/nlohmann/json into develop
REVERT: 7dccfa5355 Merge pull request #1724 from t-b/enhance-travis
REVERT: a4eaaa56d1 .travis.yml: Add gcc 9 and compile with experimental C++20 support
REVERT: fe618ac246 :construction_worker: adjust maintainer scripts
REVERT: a015b78e81 :lock: add security policy
REVERT: 6291803f59 :busts_in_silhouette: update contributors
REVERT: 53c3eefa2c Merge branch 'release/3.7.0' into develop
REVERT: ea60d40f4a Merge branch 'release/3.7.0'
REVERT: d275d05514 :pencil: update documentation
REVERT: ddb7f70a12 :pencil: update documentation
REVERT: 48e1fe03b5 :bookmark: set version to 3.7.0
REVERT: 66d63abe6d Update Makefile
REVERT: d4fd731f1f :hammer: fix release target
REVERT: d80f8b09f5 :hammer: adjust version
REVERT: 7bf8a86090 :hammer: adjust paths
REVERT: 65e4b973bd :fire: remove leftover file
REVERT: 323cf95d8c :rotating_light: fix linter warning
REVERT: 3c4c69a24e :rotating_light: fix linter warning
REVERT: ffe0e3d70f Merge pull request #1673 from remyabel/gnuinstalldirs
REVERT: 3184e9bd8b Use GNUInstallDirs instead of hard-coded path.
REVERT: cf8251eb54 :ambulance: fix compiler errors
REVERT: 6c7cde181c Merge branch 'develop' of https://github.com/nlohmann/json into develop
REVERT: a501365ea2 Merge branch 'feature/hedley' into develop
REVERT: 8d059b96a1 Merge pull request #1670 from podsvirov/readme-package-managers-msys2
REVERT: 6a3cdb281e Package Manager: MSYS2 (pacman)
REVERT: b17440c12f :rotating_light: fix compiler warnings
REVERT: 104c5c1996 Merge branch 'feature/json_pointer_contains' into develop
REVERT: 7a23aa1c0d Merge branch 'feature/emplace_back' into develop
REVERT: 24fa285edb :memo: remove HEDLEY annotation from documentation
REVERT: 947656544d :rotating_light: fix warnings
REVERT: 346e9813c5 :construction: add more annotations
REVERT: 9289a23a76 Merge pull request #1643 from kevinlul/develop
REVERT: 90798caa62 :truck: rename Hedley macros
REVERT: 025f4cea42 :rotating_light: fix warning
REVERT: 897362191d :hammer: add NLOHMANN_JSON prefix and undef macros
REVERT: 1720bfedd1 :alembic: add Hedley annotations
REVERT: e616d095ab Remove boolean regression test for #1642
REVERT: 1be63431f3 :sparkles: make emplace_back return a reference #1609
REVERT: 258fa798f1 :sparkles: add contains function for JSON pointers
REVERT: 855156b5e8 Add regression tests for #1642
REVERT: 9a775bcb14 Merge pull request #1570 from nickaein/msvc-regression-tests
REVERT: 5b2e2305a0 CI: Skip test-unit_all on MSVC Debug builds
REVERT: 3db14cbfae :memo: Improve doc on const_inter constructor
REVERT: 0a137b78ac Appveyor: Set timeout of unit-tests in appveyor.yml instead of CMake
REVERT: f559142008 Appveyor: Set build mode explicitly
REVERT: eba8244ead Avoid collision of ::max with windows.h macro
REVERT: 798e83a038 Workaround msvc2015 bug with explicit copy-constructor for const_iterator
REVERT: d28b4b900e Add a separate build with Windows.h included
REVERT: 4ac0fe2628 Increase timeout of test-unicode_all in Debug build
REVERT: ec43d27f9f Add Debug builds for AppVeyor
REVERT: 39011a1759 :memo: mention json type in documentation start page #1616
REVERT: 3b82a350ed :memo: mention 302 exception in value() documentation #1601
REVERT: 13d4f8f5ad Merge pull request #1639 from taylorhoward92/develop
REVERT: f4fca2d59a Fix #1642
REVERT: 2f389cdde7 Added explicit converstion to std::string_view. Fixes failing test with GCC 8.3
REVERT: 4fc98e0b34 Merge pull request #1625 from nickaein/fix-docs
REVERT: 0c214949f5 :pencil2: Fix links to create an issue page
REVERT: b22c577e83 :pencil2: Fix brew instructions in README
REVERT: 0d55ddc5bf :pencil2: Fix a typo in README
REVERT: 17c0849a63 Merge pull request #1585 from Macr0Nerd/iss916
REVERT: 9f2179deb1 Merge pull request #1598 from nickaein/patch-2
REVERT: 40c3d5024a Fix broken links to documentation
REVERT: 26952500b8 Merge branch 'iss916' of https://github.com/Macr0Nerd/json into iss916
REVERT: aa4c45ee4d Added to_string (with ugly macro) and tests
REVERT: 293cd6b794 Added to_string and added basic tests
REVERT: ee4028b8e4 Merge branch 'feature/fastcov' into develop
REVERT: cf6b6692aa Merge branch 'develop' into feature/fastcov
REVERT: f0bc16d899 :hammer: overworked coverage targets
REVERT: b4b06d89b5 :arrow_up: updated fastcov
REVERT: e65cff2a8f :hammer: small cleanup
REVERT: 63fe1cbbcf :memo: updated README
REVERT: 0bdadb12c7 Merge branch 'feature/circleci' into develop
REVERT: 0a1ddd6882 :arrow_up: updated fastcov
REVERT: 4676f759e8 :arrow_up: updated fastcov
REVERT: da279234d5 Merge branch 'develop' into feature/fastcov
REVERT: f05614b240 :building_construction: adding anonymous namespace
REVERT: 0da99027b7 :rotating_light: silenced a warning
REVERT: 1f03395e2c Merge branch 'develop' of https://github.com/nlohmann/json into develop
REVERT: 2f9095ddab :hammer: relaxed requirements to coverage
REVERT: ee8732c359 Merge pull request #1555 from theodelrieu/fix/1511
REVERT: d1ef75316e Merge pull request #1439 from onqtam/doctest
REVERT: d66abda4ee tests: fix coverage
REVERT: e6e6805c6c add built-in array support in get_to
REVERT: 2806b201a8 make sure values are overwritten in from_json overloads
REVERT: da5b7833a0 fixing the remaining of the pedantic gcc/clang target warnings
REVERT: 64873fb5b8 Merge branch 'develop' into doctest
REVERT: 80daa19331 :construction_worker: Ninja seems not to work
REVERT: 0a57c51a69 :construction_worker: adding concurrency
REVERT: a5e00f2cf7 :construction_worker: fixed path
REVERT: 5ebe722045 :construction_worker: full workflow
REVERT: ecf4d5e91d :construction_worker: trying CircleCI
REVERT: 53001414c7 :hammer: using --exclude-gcov to exclude files
REVERT: b12287b362 :alembic: trying fastcov
REVERT: b21c04c938 :fire: removed unsupported flag
REVERT: c7878173f9 :hammer: minor changes to maintainer targets
REVERT: b52c3638f5 Merge pull request #1551 from heavywatal/fix-1535-nodiscard-clang
REVERT: d21d298397 :art: fixed indentation
REVERT: 23635704c3 :arrow_up: added script to update cpplint
REVERT: 191aa0fd6f :wrench: overworked maintaner targets
REVERT: 5ccdaf643f Remove C++17 extension warning from clang; #1535
REVERT: b4def6dcba tabs instead of spaces...
REVERT: a0000c3235 finished the last of the warnings
REVERT: 5d511a6e96 fixed a bunch of warnings from the Makefile from the root of the repo
REVERT: 82af0ecdc1 Merge branch 'develop' into doctest
REVERT: d79c16801a Merge branch 'feature/doozer' into develop
REVERT: 24d91cf36f :memo: added Doozer to README
REVERT: 0991824584 :construction_worker: version output
REVERT: 0caf986505 reverted the removal of this if/else branching - this is the easiest way to get -std=c++0x support
REVERT: 9d2f0391e0 :construction_worker: fixed timeout
REVERT: af9da22b87 :construction_worker: adding xenial-armhf
REVERT: 0a67b51fce :construction_worker: forgot path to ctest
REVERT: e27b282033 :construction_worker: skip certificate check
REVERT: cde0b24389 :construction_worker: fixed required packages
REVERT: f091fe31bc :construction_worker: increased timeout
REVERT: 28dfbedda7 :construction_worker: fixed timeout
REVERT: ff51a32be1 updated doctest to version 2.3.1 released today
REVERT: 2b346099df Merge branch 'develop' of https://github.com/nlohmann/json into doctest
REVERT: dcbc028b5b :construction_worker: fixed syntax
REVERT: 842d42b135 :construction_worker: unified paths
REVERT: 1e86976cfe :construction_worker: fixed paths
REVERT: 30211477b7 :construction_worker: fixed package name
REVERT: 5e1cae0a7d :construction_worker: install g++
REVERT: c871c9a01c :construction_worker: install correct g++
REVERT: 63d619e21f :construction_worker: need to install g++
REVERT: c94b764a6e :construction_worker: fixed installation
REVERT: 65cdccfa8a :construction_worker: fixed syntax error
REVERT: a72ac18514 :construction_worker: use recent cmake
REVERT: 4327ae0bef :construction_worker: need more recent cmake for CentOS
REVERT: fabf953305 :construction_worker: fixed a typo
REVERT: 6e3e2ee2e4 :construction_worker: fixed buildenv values
REVERT: bc5089e803 :construction_worker: add test output to avoid timeout
REVERT: 7dd3e6384b :construction_worker: added Fedora and CentOS
REVERT: 490c6e926e :construction_worker: using raspbian
REVERT: 2fcca259b0 :construction_worker: added cmake
REVERT: 72dd6f349e :construction_worker: trying doozer
REVERT: baaa2a4d0f :checkered_flag: trying to use constructors from std::allocator #1536
REVERT: 1126c9ca74 Merge branch 'release/3.6.1' into develop
REVERT: 295732a817 Merge branch 'release/3.6.1'
REVERT: efa1b9a7bb :bookmark: set version to 3.6.1
REVERT: b33093d610 :bug: fixed regression #1530
REVERT: 9d6ab9014f :checkered_flag: fixed a compilation error in MSVC #1531
REVERT: c790b9f8c0 :bug: fixed regression #1530
REVERT: 483a086562 :alembic: added funding link
REVERT: d2a08ddafd Merge branch 'develop' of https://github.com/nlohmann/json into develop
REVERT: 7c55510f76 :rotating_light: fixed some warnings #1527
REVERT: 3ac5fa31c5 :speech_balloon: update issue templates
REVERT: 51e1564c9e Merge branch 'release/3.6.0' into develop
REVERT: 944267f522 Merge branch 'release/3.6.0'
REVERT: 0abf0f80c9 :bookmark: set version to 3.6.0
REVERT: b37392b7ac :bookmark: set version to 3.6.0
REVERT: 002addabd8 :rotating_light: fixed a warning
REVERT: a6f9b4e36d :busts_in_silhouette: added contributors
REVERT: 18cc7ddd62 :memo: completed documentation index page
REVERT: e07e8e7912 :memo: updated documentation
REVERT: 710f26f95c :memo: added documentation
REVERT: b224c52376 :art: cleanup
REVERT: 37a72dac48 :green_heart: forgot two semicolons
REVERT: 155d196bfa Update CMakeLists.txt
REVERT: 365944b0bc Merge branch 'develop' into doctest
REVERT: 8d3f4f21bc :hammer: clean up
REVERT: 9fc093c9e0 :construction_worker: added targets for infer and oclint
REVERT: 22c733e6fe :memo: added documentation
REVERT: 56f6d1d68e :green_heart: fix CI and #1521
REVERT: df0f7f2b5d :construction_worker: overworked clang-tidy target
REVERT: 9f26dac9b3 :arrow_up: updated Doxyfile
REVERT: b8451c236f :rotating_light: fixed warnings
REVERT: d6c4cd3b6d :rotating_light: adding targets for static analyzers
REVERT: baf8b4be7c :heavy_plus_sign: adding cpplint
REVERT: 34f8b4f711 :rotating_light: fixed more warnings
REVERT: 02b3494711 :fire: removing unstable macOS builds on Traivs
REVERT: b02ee16721 :rotating_light: fixed warnings
REVERT: 8d6c033f80 Merge branch 'develop' of https://github.com/nlohmann/json into develop
REVERT: 27011e3718 :rotating_light: fixed warnings
REVERT: 9dc3552931 Merge pull request #1514 from naszta/macrofix
REVERT: 0067ea8f9e Change macros to numeric_limits #1483
REVERT: 0c65ba960e Merge branch 'develop' of https://github.com/nlohmann/json into develop
REVERT: 546e2cbf5e :rotating_light: fixed some warnings
REVERT: c6fc902184 Merge pull request #1489 from andreas-schwab/develop
REVERT: d39842e68f Merge pull request #1330 from ax3l/topic-installEmbed
REVERT: 670f42b561 :fire: removing Xcode 6.4 builder
REVERT: c983b67112 Merge pull request #1469 from garethsb-sony/json_pointer-append
REVERT: c11bead2ae :construction_worker: removing more retired Travis images
REVERT: 3cd1dac653 :rotating_light: fix MSVC warning #1502
REVERT: cabe2357b8 Merge pull request #1492 from stac47/fix_gcc9_allocator
REVERT: 16d9cdce45 :memo: updated documentation of CI
REVERT: e3729ba0a5 :green_heart: fix compiler selection
REVERT: e5c7fd488d :construction_worker: trying new Travis workers
REVERT: 5047c7a217 :bug: added missing include #1500
REVERT: 8eb7db7277 Merge pull request #1441 from iwanders/support-cmake-older-than-3-8-with-if
REVERT: 393410e61a Merge pull request #1495 from njlr/patch-1
REVERT: 30edcaab3a Merge pull request #1496 from lieff/develop
REVERT: 7b31e56fbf fix GCC 7.1.1 - 7.2.1 on CentOS closes https://github.com/nlohmann/json/issues/670
REVERT: bb22b1003f Do proper endian conversions
REVERT: 8aeee4f7e3 Update README.md
REVERT: d183bd0456 Tests for json_pointer::empty and json_pointer::parent_pointer
REVERT: 08de9eeaca Add json_pointer::parent_pointer (cf. std::filesystem::path::parent_path)
REVERT: 164e0e54d9 Rename private json_pointer::is_root as public json_pointer::empty for consistency with std::filesystem::path
REVERT: ddc9f201f4 Fix gcc9 build error test/src/unit-allocator.cpp (Issue #1472)
REVERT: 21516f2bae Merge pull request #1491 from nickaein/patch-1
REVERT: 088a245218 Fix typo in README.ME
REVERT: e326df211b Merge pull request #1474 from nickaein/develop
REVERT: c55cacee1e Merge pull request #1477 from nickaein/fix-doc
REVERT: e93f305494 Add unit-test for contains() member function
REVERT: 6a5db00951 Implement contains() to check existence of a key
REVERT: fb5ceb26ac Fix documentation
REVERT: 46ff13d39e Merge pull request #1468 from past-due/disable_Wmismatched_tags_on_tuple
REVERT: eee3bc0c79 Merge pull request #1464 from elvisoric/update_meson_install_step
REVERT: 5da757bbb3 Attempt to satisfy Coveralls by adding a test for (unchanged) operator std::string
REVERT: c850e9d82d Add operator/= and operator/ to construct a JSON pointer by appending two JSON pointers, as well as convenience op/= and op= to append a single unescaped token or array index; inspired by std::filesystem::path
REVERT: 45819dce54 Disable -Wmismatched-tags warning on tuple_size / tuple_element
REVERT: 77d1d37290 Disable installation when used as meson subproject. #1463
REVERT: 372c4d2125 Merge branch 'develop' into iterate-on-destruction
REVERT: 68ec3eb8d6 Merge pull request #1451 from Afforix/Afforix-fix-extra-semicolon
REVERT: de14b5ee2f Merge pull request #1455 from wythe/patch-2
REVERT: cca6d0dbae docs: README type
REVERT: a06e7f5d80 JSON-pointer: add operator+() returning a new json_pointer
REVERT: dc21cbb751 remove extra semicolon
REVERT: e89c946451 Merge branch 'feature/nodiscard' into develop
REVERT: 6de4df23e4 :bug: fixed integer overflow in dump function #1447
REVERT: e17e0d031f Merge pull request #1446 from scinart/develop
REVERT: e36593e960 :hammer: trying code from https://godbolt.org/z/-tLO1K
REVERT: 20db020c1f move newly-added tests in unit-regression.cpp
REVERT: d359fd3a8d :construction: trying nodiscard attribute #1433
REVERT: b9a39b38bf Merge pull request #1434 from pboettch/develop
REVERT: 83e84446d6 fix typo
REVERT: 899bd94b43 flush buffer in serializer::dump_escaped case UTF8_REJECT
REVERT: 4fd9b52fc2 Use C++11 features supported by CMake 3.1.
REVERT: dffae1082f Merge pull request #1435 from pboettch/warning-fix
REVERT: 851fe8a5ef Merge pull request #1430 from nicoddemus/conda-docs
REVERT: a2c074fd4d this should really fix the XCode 6/7 builds
REVERT: 3340162efd fixing osx builds - had forgotten to define this for the object file where the test runner is compiled
REVERT: 2f44ac1def moved from Catch to doctest for unit tests
REVERT: f0883dda8f During destruction, flatten children of objects to avoid recursion
REVERT: 47fe4b9cee Add unit test for parsing deeply-nested array
REVERT: d0c0d16110 :rotating_light: fixed unused variable warning
REVERT: 9225cf2f57 allow push_back() and pop_back() calls on json_pointer
REVERT: b025d66eb5 Add instructions about using nlohmann/json with the conda package manager
REVERT: e5753b14a8 :rotating_light: fixed another linter warning #1400
REVERT: 5c04cc1009 :hammer: fixed includes
REVERT: 8e9ad346d9 :rotating_light: fixed another linter warning
REVERT: ad01736d55 :bulb: improved documentation for parsing without exceptions #1405
REVERT: 06731b14d7 :arrow_up: upgraded Catch and Google Benchmark
REVERT: daeb48b01a Merge pull request #1411 from nickaein/develop
REVERT: 29a03f465e Merge pull request #1414 from nickaein/mydevel-appveyor-x64
REVERT: c9dd260a4c Add unit tests for dump_integer
REVERT: be9b4cbd60 Add benchmark for small integers
REVERT: 6503e83e74 Improve dump_integer performance by implementing a more efficient int2ascii
REVERT: f16432832c Increase stack size for VS2017 Win x64 on Appveyor
REVERT: b39f34e046 Merge pull request #1425 from hijxf/patch-1
REVERT: 7f73915d4f Updated year in README.md
REVERT: df460c96cf Merge pull request #1423 from skypjack/patch-1
REVERT: 6546cad7bf Fixed broken links in the README file
REVERT: 847dd2a954 Merge pull request #1420 from skypjack/patch-1
REVERT: 937b642e0e :memo: added description on how to use NuGet package #1132
REVERT: 975dc970d1 Merge pull request #1417 from wythe/patch-1
REVERT: b8be0f64ae Fixed broken links to operator[]() and at()
REVERT: 619bf9c20d Fixed broke links to RFC7159
REVERT: a559ff8fc6 typo in README
REVERT: 2c0c2ca698 Specify target platform in generator name
REVERT: 676c847c55 Merge pull request #1409 from yann-morin-1998/yem/cmake-version
REVERT: e8b6b7adc1 buildsystem: relax requirement on cmake version
REVERT: c682b9879b :rotating_light: fixed PVS V567 warning
REVERT: 6f89613acd :rotating_light: fixed some warnings
REVERT: db53bdac19 Merge branch 'release/3.5.0' into develop
REVERT: cebb4e052a Merge branch 'release/3.5.0'
REVERT: 78348afeb6 :bookmark: set version to 3.5.0
REVERT: 1107f8cd82 :memo: updated documentation for items() function
REVERT: 98f4e31c3e :memo: formatted picture
REVERT: 58c269b039 :memo: updated documentation
REVERT: 2182157dc1 :memo: update documentation
REVERT: 45f5611d9b :rotating_light: fixed two warnings
REVERT: 117c1d14fb :memo: added contributors to 3.5.0
REVERT: d584ab269a :art: fixed header
REVERT: 45a8a093d7 :rotating_light: fixed a warning
REVERT: 85849940ba Merge pull request #1391 from pratikpc/develop
REVERT: ebd3f45808 Added Support for Structured Bindings
REVERT: 4f270e38cc Merge pull request #1342 from davedissian/bugfix/sfinae-iterator-traits
REVERT: f1080d7c39 Code review.
REVERT: 5d390e91ff Merge pull request #1392 from mtalliance/feature/addFileInputAdapter
REVERT: c1c85b025c Forget one std::FILE
REVERT: 635a4fc344 use namespace std when possible. Change the name of private variable.
REVERT: cf31193de2 create single json.hpp file
REVERT: a794cfdba3 refactor unit test in case of throw, the fclose will not be called. using unique_ptr with custom destructor will ensure that
REVERT: 91ff96a737 remove the const attribute
REVERT: b7a2642fba remove comment
REVERT: fa7f1a524e new unified json.hpp generated with make amalgamate
REVERT: ef283e0cf8 add tests to cover the new input adapter
REVERT: 3335da622a remove non usefull code.
REVERT: ae48acbb23 remove non usefull code. Add small description
REVERT: 52f6fd1d91 Add the possibility of using FILE * from cstdio library to read a file. This enable the possibility of using low eand device with this library.
REVERT: 67b0daf27b Add the possibility of using FILE * from cstdio library to read a file. This enable the possibility of using low eand device with this library.
REVERT: 2c23f0a346 Changes requested from code review.
REVERT: e73dfef6e5 Merge pull request #1382 from kjpus/patch-1
REVERT: 767a3a327d Link to issue #958 broken
REVERT: d53873a251 Merge pull request #1363 from theodelrieu/doc/implicit_conversions
REVERT: 7a56f5a42b Merge pull request #1380 from manu-chroma/patch-1
REVERT: 5de184b8fb readme: fix typo
REVERT: ef90d62ddf :rotating_light: fixed warning #1364
REVERT: 7b961368d5 recommend using explicit from JSON conversions
REVERT: da81e7be22 :checkered_flag: adding parentheses around std::snprintf calls #1337
REVERT: f80efd3954 :lipstick: cleanup
REVERT: 35829928da Merge pull request #1343 from mefyl/develop
REVERT: f86090aafc Merge pull request #1345 from mpoquet/feature/meson-install-pkgconfig
REVERT: 30e1cbb0df Merge pull request #1346 from ax3l/fix-mergePatchShadowParam
REVERT: aa10382629 Set eofbit on exhausted input stream.
REVERT: 798754dfb6 Amalgamate Headers
REVERT: 97b81da840 merge_patch: rename parameter
REVERT: ffe08983dd :meson: install headers + pkg-config
REVERT: f665a92330 Implement SFINAE friendly iterator_traits and use that instead.
REVERT: d2e6e1bf58 Merge pull request #1329 from ax3l/fix-typosWhitespaces
REVERT: a7567bc596 Remove EOL whitespaces in natvis
REVERT: f049836d68 CMake: Optional Install if Embedded
REVERT: 689382a722 Fix EOL Whitespaces & CMake Spelling
REVERT: 2f73a4d1f3 :rotating_light: fixed a linter warning
REVERT: e3c28afb61 Merge branch 'release/3.4.0' into develop
REVERT: 6708f22cd4 Merge branch 'release/3.4.0'
REVERT: 0f3c74d821 :bookmark: set version to 3.4.0
REVERT: 7b2f8cce03 :bookmark: set version to 3.4.0
REVERT: 8cee0e38d9 :ambulance: fixed #1319
REVERT: 856fc31d0a :lipstick: fixed indentation
REVERT: 39419cd5c4 :rotating_light: fixed another linter warning
REVERT: 86b5ce953a :memo: added examples for BSON functions
REVERT: d2e4f0b0d9 :pencil2: fixed some typos
REVERT: f0c1459554 :bug: fixed a bug parsing BSON strings #1320
REVERT: 24946f67f1 :rotating_light: fixed some more linter warnings
REVERT: 7d0dc10169 :rotating_light: fixed a linter warning
REVERT: 45a761bd60 Merge branch 'develop' of https://github.com/nlohmann/json into develop
REVERT: 4e765596f7 :hammer: small improvements
REVERT: 1308ea055d Merge pull request #1315 from nlohmann/feature/convert_char
REVERT: 0e7be06bef Merge pull request #1323 from nlohmann/feature/enum_json_mapping
REVERT: 85aaf91b85 Merge branch 'develop' into feature/enum_json_mapping
REVERT: 5a6bdf5934 Merge branch 'develop' into feature/convert_char
REVERT: 037e93f5c0 Merge pull request #1320 from nlohmann/julian-becker-feature/bson
REVERT: 9f48bb6937 :zap: replaced vector by array #1323
REVERT: 6384fe28db :rotating_light: fixed another linter warning
REVERT: ad639ad5e6 :sparkles: added NLOHMANN_JSON_SERIALIZE_ENUM marco #1208
REVERT: 544150d5a5 :rotating_light: fixed another linter warning
REVERT: c2e175763c :ok_hand: added another conversion function #1315
REVERT: d97fa30795 :ok_hand: fixed comment #1320
REVERT: 7ce720b700 :rotating_light: fixed coverage
REVERT: 19647e083c :rotating_light: fixed compiler warnings
REVERT: 62126278a6 :hammer: added fix for arrays
REVERT: 1968e5c793 :art: clean up binary formats
REVERT: 4d1eaace8c :hammer: fixed fuzz code to avoid false positives in case of discarded values
REVERT: e2c5913a50 :construction: some changes to the BSON code
REVERT: bba159121f Merge branch 'feature/bson' of https://github.com/julian-becker/json into julian-becker-feature/bson
REVERT: f102df3cba :memo: updated documentation #1314
REVERT: 7b501de054 Merge pull request #1314 from nlohmann/feature/codec_errors
REVERT: 20038e2703 :memo: added a note to the discussion #1286
REVERT: 87ef3f25f2 :pencil2: fixed a typo #1314
REVERT: b49f76931f :ok_hand: replaced static_cast to CharType by conversion function #1286
REVERT: 2343d9caeb :green_heart: additional tests from the Unicode spec #1198
REVERT: 951a7a6455 :construction: fixed test cases #1198
REVERT: c51b1e6fab :construction: fixed an issue with ensure_ascii #1198
REVERT: c7af027cbb :construction: respect ensure_ascii parameter #1198
REVERT: e5dce64115 :green_heart: added tests #1198
REVERT: c5821d91e5 :construction: overworked error handlers #1198
REVERT: ad11b6c35e BSON: Improved exception-related tests and report location of U+0000 in the key-string as part of `out_of_range.409`-message
REVERT: 9294e25c98 Merge pull request #1301 from theodelrieu/fix/1299
REVERT: b553a8a93c Merge pull request #1305 from koponomarenko/add-meson-info
REVERT: 5ba812d518 BSON: fixed incorrect casting in unit-bson.cpp
REVERT: 8de10c518b BSON: Hopefully fixing ambiguity (on some compilers) to call to string::find()
REVERT: f0c55ce0e0 Add Meson related info to README
REVERT: 2a63869159 Merge branch 'develop' of https://github.com/nlohmann/json into feature/bson
REVERT: 4b2a00641c Merge pull request #1303 from nlohmann/feature/binary_errors
REVERT: dbb0b63187 :wheelchair: improved error messages for binary formats #1288
REVERT: a946dfc19c add a note to maintainers in type_traits.hpp
REVERT: 978c3c4116 BSON: throw `json.exception.out_of_range.409` in case a key to be serialized to BSON contains a U+0000
REVERT: 0671e92ced :construction: proposal for different error handlers #1198
REVERT: daa3ca8a2e BSON: Adjusted documentation of `binary_writer::to_bson()`
REVERT: 5bccacda30 BSON: throw json.exception.out_of_range.407 in case a value of type `std::uint64_t` is serialized to BSON. Also, added a missing EOF-check to binary_reader.
REVERT: 45c8af2c46 add new is_constructible_* traits used in from_json
REVERT: dd672939a0 Merge pull request #1294 from theodelrieu/fix/json_ref_ctor
REVERT: 11fecc25af add constraints for variadic json_ref constructors
REVERT: e426219256 Merge pull request #1282 from nlohmann/feature/lines_columns
REVERT: adfa961ed0 Merge pull request #1280 from nlohmann/feature/linter
REVERT: 6d34d64bfd :ambulance: fixed compilation error
REVERT: 74a31075e3 :wheelchair: improved parse error messages
REVERT: 6e49d9f5ff :ambulance: fixed compilation error
REVERT: f8158997b5 :memo: fixed documentation
REVERT: df0f612d1b BSON: allow and discard values and object entries of type `value_t::discarded`
REVERT: 3abb788139 :rotating_light: fixed some more clang-tidy warnings
REVERT: 858e75c4df :rotating_light: fixed some clang-tidy warnings
REVERT: 062aeaf7b6 BSON: Reworked the `binary_writer` such that it precomputes the size of the BSON-output. This way, the output_adapter can work on simple output iterators and no longer requires random access iterators.
REVERT: 6d09cdec34 :bug: fixed a bug in the unget function
REVERT: 011b15dd08 :wheelchair: added line positions to error messages
REVERT: 81f4b34e06 BSON: Improved documentation and error handling/reporting
REVERT: ac38e95780 Merge pull request #1277 from performous/fix-clang-detection
REVERT: fa722d5ac3 :rotating_light: fixed another linter warning
REVERT: ec95438a59 :rotating_light: fixed some linter warnings
REVERT: f1768a540a Merge branch 'release/3.3.0' into develop
REVERT: aafad2be1f Merge branch 'release/3.3.0'
REVERT: cdfe6ceda6 :bookmark: set version to 3.3.0
REVERT: b968faa882 :bookmark: set version to 3.3.0
REVERT: cd518fbbab :memo: small update to pass test suite
REVERT: e8427061a0 Thirdparty benchmark: Fix Clang detection.
REVERT: b911654857 :memo: updated contributor list
REVERT: bb55885215 :lipstick: cleaned code
REVERT: 5c7d27c338 Merge pull request #1272 from antonioborondo/fix_warning
REVERT: b6fdad9acd Remove anonymous namespace
REVERT: 7c385a4844 Fix error: 'wide_string_input_helper' was not declared in this scope
REVERT: 9ba3f79667 Fix error: explicit specialization in non-namespace scope
REVERT: 8d1585f065 Change implementation to use templates
REVERT: ad3c216bb5 Generate header
REVERT: 0231059290 Fix warning
REVERT: 9f18e17063 Merge pull request #1270 from chuckatkins/add-more-cmake-docs
REVERT: 53ec0a16f3 Merge pull request #1271 from chuckatkins/cleanup-deprecated-warnings
REVERT: 4c617611e2 docs: Add additional CMake documentation
REVERT: 829571ab5c Turn off additional deprecation warnings for GCC.
REVERT: c8231eff75 Merge pull request #1260 from chuckatkins/fix-cmake-target-alias
REVERT: 02e653bdf7 docs: add a note in the readme about using the CMake imported target
REVERT: 564506a885 cmake: add import config tests
REVERT: 1729db85c1 cmake: fix package config to deal with versioning and namespaces
REVERT: 910a895027 Merge pull request #1238 from theodelrieu/fix/1237
REVERT: 1fae82b7a7 Merge branch 'develop' into fix/1237
REVERT: 22e55349a6 :memo: added Wandbox link #1227
REVERT: 70e587c3da :memo: added Wandbox link #1227
REVERT: d26f39466e Merge pull request #1231 from theodelrieu/feature/get_with_parameter
REVERT: c61a9071ae :rotating_light: fixed a compilation issue with ICPC #755
REVERT: e8730e5e82 BSON: Reworked `binary_reader::get_bson_cstr()`
REVERT: b59a58406e Merge branch 'develop' of https://github.com/nlohmann/json into develop
REVERT: 4e54c9a13d :rotating_light: fixed a compilation issue with ICPC #755
REVERT: 0a09db9cc2 BSON: Extend `binary_reader::get_number` to be able to hanlde little endian input to get rid of `binary_reader::get_number_little_endian`
REVERT: 95432c34f9 Merge pull request #1262 from knilch0r/patch-1
REVERT: 8c1387cfb3 unit-testsuites.cpp: fix hangup if file not found
REVERT: 521fe49fec Add basic_json::get_to function.
REVERT: 680a4ab672 Merge pull request #1257 from henryiii/gcc48
REVERT: 7a37ba0c02 Adding 4.8 test to travis
REVERT: ef358ae695 BSON: Fixed hangup in case of incomplete bson input and improved test coverage
REVERT: 99b7c7c8ef Patch nlohmann/json for GCC 4.8
REVERT: bce4816275 BSON: Added test case for the different input/output_adapters
REVERT: 763705c2a7 Fix: Add missing `begin()` and `end()` member functions to `alt_string`
REVERT: e184b6ecf2 Merge pull request #1252 from koponomarenko/fix-meson-build
REVERT: 88b055c2df Merge pull request #1249 from LEgregius/clang-3.4.2-crash-workaround
REVERT: 8799759b85 Add version and license to meson.build
REVERT: 4e52277b70 Fix issue #1237
REVERT: e4bc98d036 Merge pull request #1245 from chuckatkins/fix-target-namespace-backward-compatibility
REVERT: 4d780b091b Reordered the code. It seems to stop clang 3.4.2 in RHEL 7 from crashing intermittently.
REVERT: 3b1a5cafad Use a version check to provide backwards comatible imported target names.
REVERT: 99939d6340 :memo: added lgtm.com badge
REVERT: 4e2f35d4c2 :construction_worker: adding Xcode 10 worker
REVERT: 7fa3b8865c Merge pull request #1221 from rivertam/better-error-305
REVERT: 8f07ab6392 Replace "key-style argument" with "string argument"
REVERT: df33a90774 BSON: Bugfix for non-empty arrays
REVERT: cf485c2907 BSON: Support for arrays
REVERT: 120d1d77d4 BSON: test case for a more complex document
REVERT: 5ce7d6bdd7 BSON: support objects with objects as members
REVERT: 83b427ad67 BSON: unsigned integers
REVERT: c0d8921a67 BSON: support objects with int64 members
REVERT: 7ee361f7ad BSON: support objects with int32 members
REVERT: c5ef023171 BSON: support objects with null members
REVERT: 6c447de076 BSON: Support objects with string members
REVERT: 0c0f2e44b5 BSON: support doubles
REVERT: 9a0dddc5d2 BSON: Object with single boolean
REVERT: 5f5836ce1c BSON: Support empty objects
REVERT: f06c8fd8e3 BSON: serialization of non-objects is not supported
REVERT: 186c747a19 Merge pull request #1230 from mandreyel/lambda-unevaluated-context-fix
REVERT: 6b5334c167 Move lambda out of unevaluated context
REVERT: ebb3c03293 :art: cleanup after #1228
REVERT: d3428b35c5 Merge pull request #1228 from theodelrieu/remove_static_asserts
REVERT: aea648bb7a remove now-useless traits. check for is_basic_json where needed
REVERT: 4b4bbceebf make from_json SFINAE-correct
REVERT: f7971f04a5 make to_json SFINAE-correct
REVERT: f7c8a2145a refactor from/to_json(CompatibleArrayType)
REVERT: 628f76729e do not check for compatible_object_type in compatible_array_type
REVERT: 29f72966c3 refactor is_compatible_type, remove conjunction & co
REVERT: 77967e6548 refactor is_compatible_integer_type
REVERT: 13760857ff refactor is_compatible_array_type
REVERT: 924e95c6e8 refactor is_compatible_string_type
REVERT: e84195ab7b refactor is_compatible_object_type
REVERT: b59c3367c9 use detected instead of has_* traits
REVERT: 1ea8cd128c fix void_t for older compilers
REVERT: eb30ff0615 :rotating_light: fixed a compiler warning #1224
REVERT: ad053ef09c Fix tests for improved error 305(hopefully)
REVERT: bbdfe7dea6 Improve error messages for error 305
REVERT: d713727f22 Merge pull request #1202 from dennisfischer/develop
REVERT: 04597c3a66 Merge pull request #1214 from devsisters/fix-1213
REVERT: aada309f61 Fix #1213
REVERT: 359f98d140 Merge branch 'release/3.2.0' into develop
REVERT: 8c20571136 Merge branch 'release/3.2.0'
REVERT: dfe607c6ff Export package to allow builds without installing
REVERT: 9f3857ef6f :bookmark: set version to 3.2.0
REVERT: 7608a64e1e :hammer: fixed amalgamation
REVERT: a7b02bdce0 :bookmark: preparing 3.2.0 release
REVERT: c6a482b16c :memo: added example for sax_parse
REVERT: 5ad52f4167 :arrow_up: Catch 1.12.0
REVERT: 3811daa8a3 :memo: release preparation
REVERT: 6899fa304c Merge branch 'develop' of https://github.com/nlohmann/json into develop
REVERT: 57faaf42ca :rotating_light: fixed a compiler warning
REVERT: f78ac4fbd3 Merge pull request #1200 from thyu/develop
REVERT: 3004a73951 Fix -Wno-sometimes-uninitialized by initializing "result" in parse_sax
REVERT: e33b31e6aa :bug: fixed callback-related issue (https://github.com/nlohmann/json/issues/971#issuecomment-413678360)
REVERT: b5c54b41fd :memo: overworked documentation
REVERT: 07494e06d7 :rotating_light: fixed some compiler warnings
REVERT: d5b21b051c Merge pull request #1153 from theodelrieu/refactor/no_virtual_sax
REVERT: 0cc3db4f15 add static_asserts on SAX interface
REVERT: 38f8a51a8f use abstract sax class in parser tests
REVERT: 9bbb133094 remove no_limit constant and default values
REVERT: 442886d040 use templates in the sax interface instead of virtuals
REVERT: f6febbe359 split meta.hpp, add detected_t (used to define concepts)
REVERT: 3ac2d81a95 :hammer: fixed a MinGW error #1193
REVERT: be2065dce9 :rotating_light: fixing a MinGW warning #1192
REVERT: fed70f6bff :art: reindented code
REVERT: 0e748f2f8c Merge pull request #1187 from devsisters/json-internal-catch
REVERT: 861ee400cc Merge pull request #1176 from grembo/develop
REVERT: 3ce4325350 :memo: updated documentation of used compilers
REVERT: ba4a19d4af :construction_worker: added more CI workers
REVERT: 043eff5ba8 :construction_worker: added more CI workers
REVERT: 05b27e83b7 Exclude bytewise comparison in certain tests. These tests never worked - they weren't run before d5aaeb4.
REVERT: d5aaeb4cce Make section names unique in loops, as catch doesn't support duplicate sections, see also https://github.com/catchorg/Catch2/issues/816#issuecomment-278268122
REVERT: 3760a38b7e :checkered_flag: implicit conversion is not allowed with MSVC
REVERT: 5b14411669 :checkered_flag: trying to fix C2440 error
REVERT: 347e77bdc1 :ambulance: fix for #1169
REVERT: 04372a8c56 :checkered_flag: fix for #1168
REVERT: d0e60de433 Add new JSON_INTERNAL_CATCH macro function
REVERT: 7bfc406ded :memo: added note about CocoaPods #1148
REVERT: d456a2d777 Merge pull request #1151 from sonulohani/bigObjFix
REVERT: b8ad3388ec Fixed compiler error in VS 2015 for debug mode https://github.com/nlohmann/json/issues/1114
REVERT: 39dd775e38 :hammer: cleanup after #1134
REVERT: 86a96b059d Merge pull request #1134 from Daniel599/feature/items_iterator
REVERT: 396a914f9e :hammer: added macro to disable compiler check #1128
REVERT: bab5826504 Merge pull request #1144 from jrakow/cppreference-link-fix
REVERT: 515cfc2d89 Merge pull request #1142 from jrakow/develop
REVERT: 963d06a13c :memo: fix links to cppreference named requirements
REVERT: 9f00db48d9 :memo: link to cppreference via HTTPS
REVERT: ec2ebd5ec9 meson: add multiple headers target
REVERT: 0bb36bb140 meson: fix include directory
REVERT: 62457729e8 :memo: mentioned MinGW in README
REVERT: 09c0df4a21 :construction_worker: choosing correct image
REVERT: 1bbc4a0859 :construction_worker: using Ninja to speed up build
REVERT: d8fe13fc83 :hammer: fixed escaping for MinGW
REVERT: e59b930927 :construction_worker: trying a more recent compiler
REVERT: 937d68e2e5 :construction_worker: forgot old PATH
REVERT: 989ad9b759 :construction_worker: using help from https://stackoverflow.com/a/48509334/266378
REVERT: 067e288289 :construction_worker: set build type
REVERT: 7bbc06b487 :construction_worker: forgot quotes
REVERT: 441e5d87e6 :construction_worker: experimenting with AppVeyor and MinGW
REVERT: 7fa4ddf93e :lipstick: fixed indentation
REVERT: bf348ca8a4 Merge pull request #1028 from gracicot/develop
REVERT: ed6a0686df :hammer: small refactoring to improve branch coverage
REVERT: c8bfdfd961 :construction_worker: tryping different platforms for AppVeyor
REVERT: c02de445bf :rotating_light: fixed more compiler warnings
REVERT: 66dd1a846d :rotating_light: fixed more compiler warnings
REVERT: 850922269d :rotating_light: removed compiler warnings
REVERT: 0460b90977 :memo: fix for #1052 #1139
REVERT: 85f35a1d59 :memo: documentation fix
REVERT: e7c1638d11 :lipstick: cleanup
REVERT: 1c81e9f5ae Merge pull request #1130 from agrianius/develop
REVERT: d505ed7b31 Merge pull request #1138 from theodelrieu/feature/unordered_map_conversion
REVERT: 2c920a1032 run make amalgamate
REVERT: 2b37d7ed86 from_json: add overload for std::unordered_map
REVERT: 299469cfd5 from_json: add missing template arguments for std::map
REVERT: 1566ad4053 fixed compile error for #1045; to_json for iternation_proxy_internal was needed
REVERT: f574d7e084 simplify templates for operators, add more checks
REVERT: cd28d872e7 forward declarations to make new compilers happy
REVERT: 3d3055909c define global operator< for const char* and alt_string
REVERT: 4feb8211ca test (non)equality for alt_string implementation
REVERT: 14e6278c2f Merge branch 'develop' of github.com:gracicot/json into develop
REVERT: 7acd90b651 Fixed check for compatible string type
REVERT: 5676a2a076 Aligned template declaration
REVERT: e0e7fa39e7 Re-added external_constructor with string compatible types
REVERT: 4778c02ab5 Set MSVC version from 1514 and older
REVERT: 714c592680 Disabled implicit conversion to string_view on MSVC 15.13 and older
REVERT: e830bc502f Merge pull request #1117 from TinyTinni/develop
REVERT: ecadcdb593 added char cast
REVERT: 48656a49f5 typo
REVERT: 64acb42aa7 remove stringstream dependency
REVERT: 8efbf8d7bb :memo: documentation to avoid future issues like #1108
REVERT: e5a67fc3f8 Merge branch 'develop' of https://github.com/nlohmann/json into develop
REVERT: a49644ab74 :ambulance: adjusted Fuzzer to new parser
REVERT: 0efaf891e5 Merge pull request #1089 from theodelrieu/feature/map_conversion
REVERT: c5e63fd684 Provide a from_json overload for std::map
REVERT: db03d09312 Merge branch 'feature/key_ref' into develop (fixes #1098)
REVERT: cf9299d222 Merge branch 'feature/sax2' into develop #971
REVERT: 3cdc4d784b :memo: added documentation
REVERT: adf09726b0 Merge branch 'develop' into feature/sax2
REVERT: 481ace65c4 :hammer: only calculate array index string when needed #1098
REVERT: 1c6b332dcd :ok_hand: mitigating cppcheck bug #1101
REVERT: 90eb0a91e0 :zap: keys are now returned as const reference #1098
REVERT: 1f84cc2c88 :white_check_mark: adjusted test cases
REVERT: 717301d1bc Merge branch 'testsuite' into feature/sax2
REVERT: 4639bb2c8f :white_check_mark: added more tests from recent nst's JSONTestSuite
REVERT: e94862a649 :ambulance: fixed error in callback logic
REVERT: ae213721b1 :hammer: removed unget function for wstring parsers
REVERT: 5ff2abb90d Merge branch 'develop' into feature/sax2
REVERT: 567fe9b7a0 Merge pull request #1078 from martin-mfg/patch-1
REVERT: 377e956655 fix typo in readme
REVERT: 5da596385b Update issue templates
REVERT: 7bbe7bb98f :fire: removed old issue template
REVERT: 14f01e1981 :wrench: update issue templates
REVERT: 86b0732a10 :memo: added public key used for commits and releases
REVERT: ed69e50ad2 :page_facing_up: added SPDX-License-Identifier
REVERT: 5bc4ff9da3 Merge branch 'feature/wstring' into develop
REVERT: fa3e42f826 Merge branch 'develop' into feature/wstring
REVERT: b5d1755dfb :fire: removed commented-out test cases #1060
REVERT: 0ab8fab338 Merge pull request #1058 from dns13/patch-1
REVERT: 65b4d8251b Fix typo in single_include, too
REVERT: 53fb230098 Fix typo
REVERT: 46ec2fddf8 :memo: updated THANKS list
REVERT: b8bfd1140d Merge pull request #1048 from chuckatkins/misc-cmake-packaging-enhancements
REVERT: 33a2154f8d Enable target namespaces and build dir project config
REVERT: 29362c6ace Merge pull request #1047 from jammehcow/patch-1
REVERT: c02a3155d4 :construction_worker: added Xcode 9.3 builder
REVERT: 8d8f890771 :hankey: first try on #1045
REVERT: 7f20e9ddc7 Fixed incorrect version number in README
REVERT: 031b88d315 Make the CMake install dir user-configurable
REVERT: aaee18ce90 Added test for string conversion with string_view
REVERT: 7c503c64b7 Merge pull request #1043 from coryan/patch-1
REVERT: 4286b16b71 Fix trivial typo in comment.
REVERT: cf91b4f2bb Merge branch 'develop' into feature/wstring
REVERT: f924df1835 Merge branch 'develop' into feature/sax2
REVERT: acf10d9af7 Merge pull request #1041 from ax3l/topic-spack
REVERT: e1ea8369ad Merge branch 'develop' into feature/sax2
REVERT: 40f279c59d Merge branch 'feature/issue1021' into develop
REVERT: 18a0271a95 Merge branch 'develop' into feature/issue1021
REVERT: 1ae9896387 Package Manager: Spack
REVERT: 83b143382e Merge pull request #1040 from ax3l/topic-debugViewMSVCcmakeMin
REVERT: e439a1a9a7 CMake: 3.8+ is Sufficient
REVERT: 495436a5d5 Merge pull request #1026 from ktonon/develop
REVERT: a35d414c39 Update CMake to latest on Travis
REVERT: 08a7233d1b :ambulance: fixed commit 1e08654
REVERT: 1e08654f99 :hammer: cleanup
REVERT: aa89c5e048 :hammer: removing unget_character() function from input adapters #834
REVERT: 6678eb2b4a :white_check_mark: improved test coverage #1031
REVERT: 16c5bfeaad :ok_hand: fixed compiler warnings #1031
REVERT: 727dd4664b :hammer: trying to make tests run with MSVC #1031
REVERT: ab89ae4e50 :hammer: trying to make tests run with MSVC #1031
REVERT: eb06d0531a :construction: added input adapter for wide strings #1031
REVERT: ba6edd5634 :hammer: cleanup
REVERT: 850671b9f1 :hammer: using a vector<bool> for the parser hierarchy
REVERT: 4efa8cdb4c :green_heart: fixed Valgrind options #1030
REVERT: 830c93fd09 :memo: fixed example for operator> #1029
REVERT: c78dbc366c Added test for conversion to string_view
REVERT: 53d8d57921 Amalgamate single include
REVERT: 5f723bbec6 :hammer: realized callback parser wirh SAX interface #971
REVERT: 896a9db461 :hammer: improved code #1021
REVERT: 73cc5089e3 Using target_compile_features to specify C++ 11 standard
REVERT: a9baab76c2 :ambulance: fix for #1021
REVERT: 4f6b2b6429 :hammer: changed SAX interface
REVERT: 2537677e4c :white_check_mark: improved test coverage
REVERT: 9e1abb4842 :white_check_mark: improved coverage
REVERT: 1e38ffc014 :white_check_mark: more tests
REVERT: 25f56ff207 :memo: updated documentation
REVERT: 99ecca55c4 :white_check_mark: improved test coverage
REVERT: 9e07e9b4ec :sparkles: implemented non-throwing binary reader
REVERT: a271ee5f16 :recycle: proper use of SAX parser for binary formats
REVERT: 943d641054 :hammer: some refactoring
REVERT: 22929fe189 :construction: started a SAX/DOM/callback parser
REVERT: 375b05a17d :hammer: cleanup
REVERT: 606a25195f :white_check_mark: improved test coverage
REVERT: c87ffad45c :recycle: implemented a non-recursive parser
REVERT: 2a5506ed98 Amalgamated headers
REVERT: 8165707990 basic_json now supports getting many type of strings
REVERT: 27cf05af8d Merge branch 'develop' into feature/sax2
REVERT: d2dd27dc3b Merge branch 'release/3.1.2' into develop
REVERT: 183390c10b Merge branch 'release/3.1.2'
REVERT: 8a6c8cb0f7 :bookmark: set version to 3.1.2
REVERT: afef474c0d :bookmark: set version to 3.1.2
REVERT: a52e8355b8 :rewind: oops
REVERT: 21410d50af :checkered_flag: moved /Wall to CMake
REVERT: 829ed74d66 :checkered_flag: experimenting with /Wall
REVERT: 1262d474eb :checkered_flag: fixed an MSVC warning
REVERT: 282bafae4f :hammer: fixed compilation error
REVERT: abac6a0e84 Merge branch 'develop' into feature/sax2
REVERT: 919d1fef8f Merge pull request #1009 from nlohmann/user_string_parser
REVERT: 8557151d90 :recycle: adjusting lexer/parser in symmetry to #1006
REVERT: b56ac86471 :memo: thanks for #1006
REVERT: 0cab3b2c8e Merge pull request #1006 from agrianius/dump-template
REVERT: 3d4f6a2940 :hammer: cleaner exception interface
REVERT: ad47b0fbde :recycle: refactored binary readers to use a SAX parser
REVERT: 392c033805 test refactoring
REVERT: 51349537fc add unit test: checking dump to alternative string type
REVERT: 830f3e5290 forward alternative string class from output_adapter to output_string_adapter
REVERT: ed6b1464f9 dump to alternate implementation of string, as defined in basic_json template (changes to amalgamated code)
REVERT: faccc37d0d dump to alternate implementation of string, as defined in basic_json template
REVERT: 149d2fd09c :green_heart: improved test coverage
REVERT: 6399cd3039 Merge branch 'develop' into feature/sax2
REVERT: 6151dfaed7 :ok_hand: made changes proposed in #1001
REVERT: 35e43df625 Merge branch 'develop' into feature/sax2
REVERT: 9918523077 :memo: cleanup after #1001
REVERT: e737de8941 Merge pull request #1001 from nlohmann/leak
REVERT: aa8fc2a41c :ambulance: hopefully fixed the memory leak
REVERT: 7c1a788893 Merge branch 'develop' into feature/sax2
REVERT: cf60e18c89 :fire: removing failing test (work on this in branch "leak")
REVERT: 97559bb1b2 :hammer: trying to fix the leak
REVERT: 38345fd06c :ok_hand: fixed some more warnings
REVERT: 8b379948d0 :fire: replaced acceptor with SAX parser
REVERT: 303a0c5843 Merge branch 'develop' into feature/sax2
REVERT: d183d34b96 :green_heart: added another test case
REVERT: d2d65bb25b :recycle: refined SFINAE to fix some warnings
REVERT: 476b2e09be :green_heart: added regression tests for #972 and #977
REVERT: 62030615a0 Merge pull request #986 from theodelrieu/fix/basic_json_conversion
REVERT: 5beab80553 :hammer: using the SAX-DOM parser
REVERT: faf2546a15 :hammer: simplified SAX-DOM parser
REVERT: 5b9d03cfdb :hammer: added SAX-DOM-Parser
REVERT: 9d27429527 :hammer: added error messages to SAX interface
REVERT: 86991d5204 Merge branch 'develop' into feature/sax2
REVERT: fdecbf6e1e Merge pull request #992 from bogemic/pvs_studio_fix_misprinted_condition
REVERT: fd30ad8a14 did make amalgamate
REVERT: 2a2ed799b1 pvs_studio fix. misprinted condition
REVERT: 8d104e6fe3 :green_heart: fixed test case
REVERT: 5773e164bb :rotating_light: fixed a linter warning
REVERT: 8711ec6034 support construction from other basic_json types
REVERT: c22f2d41f3 missing CHECK_NOTHROW in unit-udt
REVERT: 3ff9455332 :hammer: added a SAX-DOM-Parser
REVERT: 21352c4d8e :recycle: refactored SAX parser
REVERT: 981e226ca2 Merge branch 'develop' into feature/sax2
REVERT: 1f3d2a3be7 :memo: overworked README
REVERT: 13ca723c38 Merge pull request #981 from wla80/develop
REVERT: 05d3bf1699 Make integration section concise
REVERT: 8d6b3d44d6 :ok_hand: fixed some compiler warnings
REVERT: 8c7f46f7d0 :hammer: removed a logic error and improved coverage
REVERT: 922f7a3d0e :white_check_mark: added more tests for SAX parsing
REVERT: ac230e8b4b :hammer: fixed test cases to be more robust
REVERT: 374ebacc51 :sparkles: added a SAX parser #971
REVERT: 8968adcd53 Merge branch 'release/3.1.1' into develop
REVERT: c8ea63a31b Merge branch 'release/3.1.1'
REVERT: 8424d10e45 :bookmark: set version to 3.1.1
REVERT: 938c861a09 :bookmark: set version to 3.1.1
REVERT: 94b7a8da66 :lipstick: fixed indentation
REVERT: 20b5f4d89c Merge pull request #969 from theodelrieu/fix/924
REVERT: 01d6118828 Fix constraints on from_json(CompatibleArrayType)
REVERT: b02e3bb0b6 Merge pull request #957 from theodelrieu/fix_coveralls
REVERT: 41db7cd818 Make the coveralls job use the multiple header version
REVERT: 447f5421eb :hammer: overworked release target
REVERT: 61f0bfb15c :hammer: enforce using Python 2 for the wandbox script
REVERT: 548f488941 :hammer: overworked Makefile
REVERT: 865ff00de0 :memo: updated documentation wrt. objects #963
REVERT: addbbbe136 Merge branch 'develop' of https://github.com/nlohmann/json into develop
REVERT: 0a64982e86 :memo: cleanup after #954
REVERT: e5d538c5ea Merge pull request #954 from pfultz2/patch-1
REVERT: 2dda87c3b7 Merge branch 'feature/coverage_multi' into develop
REVERT: 5731695d7b Clarify dev version and add space after the word flag.
REVERT: 74675dd69c :rewind: back to the original version
REVERT: 50863c5a09 Latest updates based on feedback
REVERT: ab05df3a48 :hammer: another try
REVERT: b455154cc9 :hammer: another try
REVERT: 1e8f4d6ab3 :hammer: more trying
REVERT: 316634e129 :hammer: added quotes around parameters
REVERT: 0111f3187e :hammer: working on #953
REVERT: 83db7876c5 :checkered_flag: removing test case that fails on MSVC #962
REVERT: 33a9b00ce6 :bug: fix for #962
REVERT: 8b457ace25 :bug: fixing CBOR's indefinity length strings #961
REVERT: 556e30f759 Merge pull request #955 from patrikhuber/patch-1
REVERT: ee76436592 Change to angle brackets
REVERT: 737cffe0cb :hammer: fixed directory for lcov coverage
REVERT: ae688016f6 Changed links from master to develop branch
REVERT: 2b7b39c72d :rocket: added release target #956
REVERT: 44b40d7c6a Fix links in README.md
REVERT: 3402260983 Add a note about installing the library with cget
REVERT: 3a887dc9fe :construction_worker: fixed coveralls
REVERT: 5c2a0a511e :construction_worker: fixed coveralls
REVERT: b779666916 :construction_worker: re-added homebrew tests
REVERT: 97309f0da9 Merge branch 'release/3.1.0' into develop
REVERT: 15acf260ca Merge branch 'release/3.1.0'
REVERT: a8fcfd9880 :construction_worker: fixed travis file
REVERT: f5c03999d0 :hammer: fixed benchmark compilation
REVERT: 0258484626 :bookmark: set version to 3.1.0
REVERT: ce7d0ebf5d Merge pull request #944 from theodelrieu/fix/cmake_install
REVERT: 14cd019861 fix cmake install directory (for real this time)
REVERT: 9958dde3da Merge pull request #950 from kaidokert/develop
REVERT: aed4a080bf Templatize std::string in binary_reader #941
REVERT: e8bf1f62f7 :sparkles: added define for library version #948 #943
REVERT: 552d153842 :memo: added more statistics on binary formats
REVERT: 60e2d28eb7 :bug: fix for #947
REVERT: 51c774f208 :memo: added documentation for binary formats
REVERT: 57e6fddd90 :rotating_light: fixed warnings
REVERT: f7131715b1 Merge branch 'develop' of https://github.com/nlohmann/json into develop
REVERT: ce273af9b6 :memo: added documentation for binary formats
REVERT: ae235139b9 Merge pull request #940 from kaidokert/develop
REVERT: 8049442c2a :hammer: rename yytext to token_buffer (fixes #933)
REVERT: d0c9e5fffc Allow overriding THROW/CATCH/TRY macros with no-exceptions (redo) #938
REVERT: b3bd3b726b :memo: added link to OSS-Fuzz project repository
REVERT: 52e9449563 :memo: added more functions to overview
REVERT: cb4a9c85cb :hammer: excluded code from coverage
REVERT: 1483d39c91 :hammer: moved class json_pointer into separate file #920
REVERT: e95578f884 :memo: documented JSON Merge Patch (RFC 7386)
REVERT: 102c474397 :hammer: clean up
REVERT: 6855bbb902 :hammer: split "parsing" directory to "input" and "output"
REVERT: 05f49fa401 :white_check_mark: added roundtrip tests for UBJSON
REVERT: f0b26c8f38 :white_check_mark: added fuzzer for UBJSON input
REVERT: b0a68f540f :white_check_mark: added roundtrip tests for UBJSON
REVERT: 1be3935e9d :memo: cleanup after #936
REVERT: 7aace7c976 Merge pull request #936 from zerodefect/improvement/fix_kmin_compiler_warning
REVERT: 0e2211df0e Merge pull request #925 from zerodefect/improvement/improve_readme_json_fwd
REVERT: 95cf1fefaa Removed compiler warning about unused variable 'kMinExp'.
REVERT: 355c1e946b :construction_worker: added task to check amalgamation #906
REVERT: dbfd7e532b Merge branch 'develop' of https://github.com/nlohmann/json into develop
REVERT: 3c68a796df :fire: deprecated iterator_wrapper #874
REVERT: f05c3edc21 Merge pull request #930 from Pipeliner/develop
REVERT: f5c4e9f3a1 Merge pull request #919 from theodelrieu/fix/sfinae_for_incomplete_types
REVERT: 7eabb6ba36 :memo: updated documentation for UBJSON functions
REVERT: fc32b8a9bc Fix a typo in README.md
REVERT: 3cca630836 :hammer: cleanup after #915
REVERT: 010e596001 Merge pull request #915 from abolz/dtoa
REVERT: 3d776b0582 :memo: updated README
REVERT: 9e5d901f55 Merge branch 'feature/ubjson' into develop
REVERT: 327b8bb09e Merge branch 'feature/strings' into develop
REVERT: d2b3fd156e Updated README.md to explain how installation of json_fwd.hpp can be achieved as part of install step.
REVERT: b406e3704b :heavy_plus_sign: using Google Benchmark #921
REVERT: a8f711a2f1 :heavy_plus_sign: using Google Benchmark #921
REVERT: 6402077ac2 Merge pull request #876 from nlohmann/feature/rfc7396
REVERT: dcee778c1e fix sfinae on basic_json UDT constructor
REVERT: 7456f1d87b :recycle: re-used existing UTF-8 decoder to simplfy string serialization
REVERT: afe4571309 :hammer: cleanup + some noexcept
REVERT: b182308eff :hammer: cleanup
REVERT: 9b9919d460 Use max_digits10 in dump_float for float->text->float round-trip
REVERT: 810f81bbd9 Regenerate src/json.hpp
REVERT: 787204f076 Add unit-tests for detail::to_chars
REVERT: 9f7c2c04c8 Use the Grisu2 algorithm for formatting 'float's and 'double's
REVERT: 332f352033 Add an implementation of the Grisu2 algorithm for binary to decimal floating-point conversion
REVERT: 0695ac4001 Add tests for #360
REVERT: 68a9736738 Tests: Re-enable some round-trip tests
REVERT: 6e2e466c27 Tests: Don't rely on the format used for floating-point formatting
REVERT: 107c21a488 Tests: Exponents are formatted with a leading '+' sign
REVERT: 3ae82d91a2 Tests: Floating-point formatting uses lower case 'e'
REVERT: 92f7295063 :hammer: cleanup
REVERT: 3ac674562f :hammer: clean up
REVERT: d9446b0e6e Merge pull request #911 from theodelrieu/fix/cmake_install
REVERT: 9d6b3731b9 :white_check_mark: improved test coverage
REVERT: 06cddd371b :hammer: removed failing amalgamation test
REVERT: f85f4967fe :white_check_mark: improved test coverage
REVERT: 6965ff00c8 Merge branch 'develop' into feature/ubjson
REVERT: 411c16cbb2 :memo: overworked documentation wrt.…
victorxcl added a commit to victorxcl/CLIPS-unicode that referenced this issue Jun 29, 2020
456478b3c5 Merge branch 'release/3.7.3'
c5eafe74e8 :bookmark: set version to 3.7.3
c6e1e26018 Merge pull request #1838 from nickaein/fix-quadratic-destruction
efa13c663d Reserve stack only for top-level items
948f98cf4a Cleanups
0f3ec003bb Remove harmful vector::reserve during destruction (#1837)
be61ad1470 :art: fix inconsistent operator style
411158d896 Merge branch 'release/3.7.2' into develop
5f09b502b6 Merge branch 'release/3.7.2'
56109eacd7 :bookmark: set version to 3.7.2
7b0c50b9a5 :hammer: add path
0a513a35cb Merge pull request #1436 from nickaein/iterate-on-destruction
7e2445a0f4 Move deep JSON test to a separate unit-test
68d0a7b246 Reduce depth in unit-test to avoid choking valgrind
eec1974218 Merge remote-tracking branch 'nlohmann/develop' into iterate-on-destruction
67259d698f Merge pull request #1830 from nlohmann/whitesource/configure
760076abca Add .whitesource configuration file
1a9de88117 :rotating_light: fix a linter warning
d98bf0278d Merge branch 'release/3.7.1' into develop
43e4db6141 Merge branch 'release/3.7.1'
aacdc6bbe3 :bookmark: set version to 3.7.1
0f6a58eeaf :busts_in_silhouette: update contributors
1e9f16dff0 :rotating_light: fix linter errors
c0ae88bf50 :rotating_light: fix linter errors
62dada05ca :bug: fix conversion to std::valarray
7bcaba0ca9 Merge pull request #1821 from AnthonyVH/develop
1ca6f2901b Merge pull request #1826 from cbegue/develop
abccafa5c5 :arrow_up: upgrade Doctest to 2.3.5
c4923e3d05 Merge remote-tracking branch 'upstream/develop' into develop
ec9647ae63 Moved test for #1647 regression to regressions file.
8b686b30eb Add restriction for tuple specialization of to_json
3790bd9ae0 :construction_worker: add Xcode 10.2
42e9ad32c6 :hammer: remove full path
e779714dd8 :construction_worker: add Xcode 10.2
bf2afaeee6 :loud_sound: add version output
6a4cc29f01 :memo: update examples
dfe53c36da :rotating_light: fix UBSAN warnings
0db1692f45 :busts_in_silhouette: update contributors
1307862b1d Merge pull request #1694 from eli-schwartz/release-include-meson
4d1e4c6d93 Merge pull request #1780 from t-b/add-msvc-16-2019
a1828bbf57 Merge pull request #1806 from cbegue/develop
794a3d411a Fix issue #1805
ddda67a096 Don't capture json input by value (fixed #1822).
fb9a2643c8 Add test for #1647.
27d0dfc17a Fix #1647: non-member operator== breaks enum (de)serialization.
f272ad533d :busts_in_silhouette: add CODEOWNERS file
f7e7a62358 :pencil: add comment on JSON_THROW_USER, JSON_TRY_USER, and JSON_CATCH_USER
507d5676ad :rotating_light: fix warning
00cb98a3d1 Merge pull request #1803 from flopp/spelling
b93d414a35 Fix some spelling errors - mostly in comments & documentation.
f4332d4097 README: describe how to use json as a meson subproject
84faa36ec5 release: add singleinclude and meson.build to include.zip
0245ae5157 Merge pull request #1797 from t-b/fix-integer-truncation
4c06191836 Merge pull request #1799 from nemequ/develop
fbcbc76d10 Update Hedley to v11.
c6cbdf96a9 appveyor.yml: Add debug build on x64 and VS 2019
01e486bb55 appveyor.yml: Add MSVC 16 2019 support
35b47c2793 iteration_proxy: Fix integer truncation from std::size_t to int
5541a2bd25 test/cmake_import: Pass the generator platform required by MSVC 2019
7a521150aa appveyor: Pass the generator platform explicitly
ed5541440a Merge pull request #1779 from t-b/avoid-using-glob-in-cmake
eb6fe421ae test/CMakeLists.txt: Use an explicit list instead of GLOB
d187488e0d Merge pull request #1765 from crazyjul/fix/items-with-alt-string
dae0fe79af Merge pull request #1769 from chris0x44/json_pointer
d826282f53 Merge pull request #1767 from 0xflotus/patch-1
4615f5a980 Provide default implementation for int_to_string, but allow for overloaded function
7476f5ee0c Make json_pointer::back const (resolves #1764)
d7579b8cbf did you mean 'serialization'?
0f073e26eb Allow items() to be used with custom string
99d7518d21 :memo: add OSS Fuzz status badge
e2c531a1f7 Merge pull request #1760 from Xav83/cppcheckFixes
87afee1c39 Runs make amalgamate on the project.
13a7c60257 Correct a warning from cppcheck:
b9dfdbe6be Correct a warning from cppcheck:
771d5dadc6 Merge pull request #1741 from tete17/Fix-SFINAE
e26a2904fc Fix and add test's for SFINAE problem
06ccd43a2a Merge pull request #1722 from t-b/fix-int64-min-issue
a6bd798bfa Merge pull request #1728 from t-b/fix-clang-sanitizer-invocation
8067c3ca5b Add serialization unit tests for extreme integer values
70aa8a31a2 Add regression test for dumping the minimum value of int64_t
6ce2f35ba8 Fix outputting extreme integer values in edge cases
6d701b29df .travis.yml: Increase the timeout to 45 minutes
d5c0d52f37 external_constructor<std::valarray>: Handle empty array properly
61fe5f1eee input_buffer_adapter: Fix handling of nullptr input
9ea3e19121 .travis/cmake: Rework clang sanitizer invocation
f0bff49ffd test/CMakeLists.txt: Remove trailing whitespace
eab68e7750 :construction_worker: add test step
90c1c24ccb :construction_worker: try GitHub Actions
bf4156056b :pencil2: fix a typo
b6ee34cc99 Merge branch 'develop' of https://github.com/nlohmann/json into develop
7dccfa5355 Merge pull request #1724 from t-b/enhance-travis
a4eaaa56d1 .travis.yml: Add gcc 9 and compile with experimental C++20 support
fe618ac246 :construction_worker: adjust maintainer scripts
a015b78e81 :lock: add security policy
6291803f59 :busts_in_silhouette: update contributors
53c3eefa2c Merge branch 'release/3.7.0' into develop
ea60d40f4a Merge branch 'release/3.7.0'
d275d05514 :pencil: update documentation
ddb7f70a12 :pencil: update documentation
48e1fe03b5 :bookmark: set version to 3.7.0
66d63abe6d Update Makefile
d4fd731f1f :hammer: fix release target
d80f8b09f5 :hammer: adjust version
7bf8a86090 :hammer: adjust paths
65e4b973bd :fire: remove leftover file
323cf95d8c :rotating_light: fix linter warning
3c4c69a24e :rotating_light: fix linter warning
ffe0e3d70f Merge pull request #1673 from remyabel/gnuinstalldirs
3184e9bd8b Use GNUInstallDirs instead of hard-coded path.
cf8251eb54 :ambulance: fix compiler errors
6c7cde181c Merge branch 'develop' of https://github.com/nlohmann/json into develop
a501365ea2 Merge branch 'feature/hedley' into develop
8d059b96a1 Merge pull request #1670 from podsvirov/readme-package-managers-msys2
6a3cdb281e Package Manager: MSYS2 (pacman)
b17440c12f :rotating_light: fix compiler warnings
104c5c1996 Merge branch 'feature/json_pointer_contains' into develop
7a23aa1c0d Merge branch 'feature/emplace_back' into develop
24fa285edb :memo: remove HEDLEY annotation from documentation
947656544d :rotating_light: fix warnings
346e9813c5 :construction: add more annotations
9289a23a76 Merge pull request #1643 from kevinlul/develop
90798caa62 :truck: rename Hedley macros
025f4cea42 :rotating_light: fix warning
897362191d :hammer: add NLOHMANN_JSON prefix and undef macros
1720bfedd1 :alembic: add Hedley annotations
e616d095ab Remove boolean regression test for #1642
1be63431f3 :sparkles: make emplace_back return a reference #1609
258fa798f1 :sparkles: add contains function for JSON pointers
855156b5e8 Add regression tests for #1642
9a775bcb14 Merge pull request #1570 from nickaein/msvc-regression-tests
5b2e2305a0 CI: Skip test-unit_all on MSVC Debug builds
3db14cbfae :memo: Improve doc on const_inter constructor
0a137b78ac Appveyor: Set timeout of unit-tests in appveyor.yml instead of CMake
f559142008 Appveyor: Set build mode explicitly
eba8244ead Avoid collision of ::max with windows.h macro
798e83a038 Workaround msvc2015 bug with explicit copy-constructor for const_iterator
d28b4b900e Add a separate build with Windows.h included
4ac0fe2628 Increase timeout of test-unicode_all in Debug build
ec43d27f9f Add Debug builds for AppVeyor
39011a1759 :memo: mention json type in documentation start page #1616
3b82a350ed :memo: mention 302 exception in value() documentation #1601
13d4f8f5ad Merge pull request #1639 from taylorhoward92/develop
f4fca2d59a Fix #1642
2f389cdde7 Added explicit converstion to std::string_view. Fixes failing test with GCC 8.3
4fc98e0b34 Merge pull request #1625 from nickaein/fix-docs
0c214949f5 :pencil2: Fix links to create an issue page
b22c577e83 :pencil2: Fix brew instructions in README
0d55ddc5bf :pencil2: Fix a typo in README
17c0849a63 Merge pull request #1585 from Macr0Nerd/iss916
9f2179deb1 Merge pull request #1598 from nickaein/patch-2
40c3d5024a Fix broken links to documentation
26952500b8 Merge branch 'iss916' of https://github.com/Macr0Nerd/json into iss916
aa4c45ee4d Added to_string (with ugly macro) and tests
293cd6b794 Added to_string and added basic tests
ee4028b8e4 Merge branch 'feature/fastcov' into develop
cf6b6692aa Merge branch 'develop' into feature/fastcov
f0bc16d899 :hammer: overworked coverage targets
b4b06d89b5 :arrow_up: updated fastcov
e65cff2a8f :hammer: small cleanup
63fe1cbbcf :memo: updated README
0bdadb12c7 Merge branch 'feature/circleci' into develop
0a1ddd6882 :arrow_up: updated fastcov
4676f759e8 :arrow_up: updated fastcov
da279234d5 Merge branch 'develop' into feature/fastcov
f05614b240 :building_construction: adding anonymous namespace
0da99027b7 :rotating_light: silenced a warning
1f03395e2c Merge branch 'develop' of https://github.com/nlohmann/json into develop
2f9095ddab :hammer: relaxed requirements to coverage
ee8732c359 Merge pull request #1555 from theodelrieu/fix/1511
d1ef75316e Merge pull request #1439 from onqtam/doctest
d66abda4ee tests: fix coverage
e6e6805c6c add built-in array support in get_to
2806b201a8 make sure values are overwritten in from_json overloads
da5b7833a0 fixing the remaining of the pedantic gcc/clang target warnings
64873fb5b8 Merge branch 'develop' into doctest
80daa19331 :construction_worker: Ninja seems not to work
0a57c51a69 :construction_worker: adding concurrency
a5e00f2cf7 :construction_worker: fixed path
5ebe722045 :construction_worker: full workflow
ecf4d5e91d :construction_worker: trying CircleCI
53001414c7 :hammer: using --exclude-gcov to exclude files
b12287b362 :alembic: trying fastcov
b21c04c938 :fire: removed unsupported flag
c7878173f9 :hammer: minor changes to maintainer targets
b52c3638f5 Merge pull request #1551 from heavywatal/fix-1535-nodiscard-clang
d21d298397 :art: fixed indentation
23635704c3 :arrow_up: added script to update cpplint
191aa0fd6f :wrench: overworked maintaner targets
5ccdaf643f Remove C++17 extension warning from clang; #1535
b4def6dcba tabs instead of spaces...
a0000c3235 finished the last of the warnings
5d511a6e96 fixed a bunch of warnings from the Makefile from the root of the repo
82af0ecdc1 Merge branch 'develop' into doctest
d79c16801a Merge branch 'feature/doozer' into develop
24d91cf36f :memo: added Doozer to README
0991824584 :construction_worker: version output
0caf986505 reverted the removal of this if/else branching - this is the easiest way to get -std=c++0x support
9d2f0391e0 :construction_worker: fixed timeout
af9da22b87 :construction_worker: adding xenial-armhf
0a67b51fce :construction_worker: forgot path to ctest
e27b282033 :construction_worker: skip certificate check
cde0b24389 :construction_worker: fixed required packages
f091fe31bc :construction_worker: increased timeout
28dfbedda7 :construction_worker: fixed timeout
ff51a32be1 updated doctest to version 2.3.1 released today
2b346099df Merge branch 'develop' of https://github.com/nlohmann/json into doctest
dcbc028b5b :construction_worker: fixed syntax
842d42b135 :construction_worker: unified paths
1e86976cfe :construction_worker: fixed paths
30211477b7 :construction_worker: fixed package name
5e1cae0a7d :construction_worker: install g++
c871c9a01c :construction_worker: install correct g++
63d619e21f :construction_worker: need to install g++
c94b764a6e :construction_worker: fixed installation
65cdccfa8a :construction_worker: fixed syntax error
a72ac18514 :construction_worker: use recent cmake
4327ae0bef :construction_worker: need more recent cmake for CentOS
fabf953305 :construction_worker: fixed a typo
6e3e2ee2e4 :construction_worker: fixed buildenv values
bc5089e803 :construction_worker: add test output to avoid timeout
7dd3e6384b :construction_worker: added Fedora and CentOS
490c6e926e :construction_worker: using raspbian
2fcca259b0 :construction_worker: added cmake
72dd6f349e :construction_worker: trying doozer
baaa2a4d0f :checkered_flag: trying to use constructors from std::allocator #1536
1126c9ca74 Merge branch 'release/3.6.1' into develop
295732a817 Merge branch 'release/3.6.1'
efa1b9a7bb :bookmark: set version to 3.6.1
b33093d610 :bug: fixed regression #1530
9d6ab9014f :checkered_flag: fixed a compilation error in MSVC #1531
c790b9f8c0 :bug: fixed regression #1530
483a086562 :alembic: added funding link
d2a08ddafd Merge branch 'develop' of https://github.com/nlohmann/json into develop
7c55510f76 :rotating_light: fixed some warnings #1527
3ac5fa31c5 :speech_balloon: update issue templates
51e1564c9e Merge branch 'release/3.6.0' into develop
944267f522 Merge branch 'release/3.6.0'
0abf0f80c9 :bookmark: set version to 3.6.0
b37392b7ac :bookmark: set version to 3.6.0
002addabd8 :rotating_light: fixed a warning
a6f9b4e36d :busts_in_silhouette: added contributors
18cc7ddd62 :memo: completed documentation index page
e07e8e7912 :memo: updated documentation
710f26f95c :memo: added documentation
b224c52376 :art: cleanup
37a72dac48 :green_heart: forgot two semicolons
155d196bfa Update CMakeLists.txt
365944b0bc Merge branch 'develop' into doctest
8d3f4f21bc :hammer: clean up
9fc093c9e0 :construction_worker: added targets for infer and oclint
22c733e6fe :memo: added documentation
56f6d1d68e :green_heart: fix CI and #1521
df0f7f2b5d :construction_worker: overworked clang-tidy target
9f26dac9b3 :arrow_up: updated Doxyfile
b8451c236f :rotating_light: fixed warnings
d6c4cd3b6d :rotating_light: adding targets for static analyzers
baf8b4be7c :heavy_plus_sign: adding cpplint
34f8b4f711 :rotating_light: fixed more warnings
02b3494711 :fire: removing unstable macOS builds on Traivs
b02ee16721 :rotating_light: fixed warnings
8d6c033f80 Merge branch 'develop' of https://github.com/nlohmann/json into develop
27011e3718 :rotating_light: fixed warnings
9dc3552931 Merge pull request #1514 from naszta/macrofix
0067ea8f9e Change macros to numeric_limits #1483
0c65ba960e Merge branch 'develop' of https://github.com/nlohmann/json into develop
546e2cbf5e :rotating_light: fixed some warnings
c6fc902184 Merge pull request #1489 from andreas-schwab/develop
d39842e68f Merge pull request #1330 from ax3l/topic-installEmbed
670f42b561 :fire: removing Xcode 6.4 builder
c983b67112 Merge pull request #1469 from garethsb-sony/json_pointer-append
c11bead2ae :construction_worker: removing more retired Travis images
3cd1dac653 :rotating_light: fix MSVC warning #1502
cabe2357b8 Merge pull request #1492 from stac47/fix_gcc9_allocator
16d9cdce45 :memo: updated documentation of CI
e3729ba0a5 :green_heart: fix compiler selection
e5c7fd488d :construction_worker: trying new Travis workers
5047c7a217 :bug: added missing include #1500
8eb7db7277 Merge pull request #1441 from iwanders/support-cmake-older-than-3-8-with-if
393410e61a Merge pull request #1495 from njlr/patch-1
30edcaab3a Merge pull request #1496 from lieff/develop
7b31e56fbf fix GCC 7.1.1 - 7.2.1 on CentOS closes https://github.com/nlohmann/json/issues/670
bb22b1003f Do proper endian conversions
8aeee4f7e3 Update README.md
d183bd0456 Tests for json_pointer::empty and json_pointer::parent_pointer
08de9eeaca Add json_pointer::parent_pointer (cf. std::filesystem::path::parent_path)
164e0e54d9 Rename private json_pointer::is_root as public json_pointer::empty for consistency with std::filesystem::path
ddc9f201f4 Fix gcc9 build error test/src/unit-allocator.cpp (Issue #1472)
21516f2bae Merge pull request #1491 from nickaein/patch-1
088a245218 Fix typo in README.ME
e326df211b Merge pull request #1474 from nickaein/develop
c55cacee1e Merge pull request #1477 from nickaein/fix-doc
e93f305494 Add unit-test for contains() member function
6a5db00951 Implement contains() to check existence of a key
fb5ceb26ac Fix documentation
46ff13d39e Merge pull request #1468 from past-due/disable_Wmismatched_tags_on_tuple
eee3bc0c79 Merge pull request #1464 from elvisoric/update_meson_install_step
5da757bbb3 Attempt to satisfy Coveralls by adding a test for (unchanged) operator std::string
c850e9d82d Add operator/= and operator/ to construct a JSON pointer by appending two JSON pointers, as well as convenience op/= and op= to append a single unescaped token or array index; inspired by std::filesystem::path
45819dce54 Disable -Wmismatched-tags warning on tuple_size / tuple_element
77d1d37290 Disable installation when used as meson subproject. #1463
372c4d2125 Merge branch 'develop' into iterate-on-destruction
68ec3eb8d6 Merge pull request #1451 from Afforix/Afforix-fix-extra-semicolon
de14b5ee2f Merge pull request #1455 from wythe/patch-2
cca6d0dbae docs: README type
a06e7f5d80 JSON-pointer: add operator+() returning a new json_pointer
dc21cbb751 remove extra semicolon
e89c946451 Merge branch 'feature/nodiscard' into develop
6de4df23e4 :bug: fixed integer overflow in dump function #1447
e17e0d031f Merge pull request #1446 from scinart/develop
e36593e960 :hammer: trying code from https://godbolt.org/z/-tLO1K
20db020c1f move newly-added tests in unit-regression.cpp
d359fd3a8d :construction: trying nodiscard attribute #1433
b9a39b38bf Merge pull request #1434 from pboettch/develop
83e84446d6 fix typo
899bd94b43 flush buffer in serializer::dump_escaped case UTF8_REJECT
4fd9b52fc2 Use C++11 features supported by CMake 3.1.
dffae1082f Merge pull request #1435 from pboettch/warning-fix
851fe8a5ef Merge pull request #1430 from nicoddemus/conda-docs
a2c074fd4d this should really fix the XCode 6/7 builds
3340162efd fixing osx builds - had forgotten to define this for the object file where the test runner is compiled
2f44ac1def moved from Catch to doctest for unit tests
f0883dda8f During destruction, flatten children of objects to avoid recursion
47fe4b9cee Add unit test for parsing deeply-nested array
d0c0d16110 :rotating_light: fixed unused variable warning
9225cf2f57 allow push_back() and pop_back() calls on json_pointer
b025d66eb5 Add instructions about using nlohmann/json with the conda package manager
e5753b14a8 :rotating_light: fixed another linter warning #1400
5c04cc1009 :hammer: fixed includes
8e9ad346d9 :rotating_light: fixed another linter warning
ad01736d55 :bulb: improved documentation for parsing without exceptions #1405
06731b14d7 :arrow_up: upgraded Catch and Google Benchmark
daeb48b01a Merge pull request #1411 from nickaein/develop
29a03f465e Merge pull request #1414 from nickaein/mydevel-appveyor-x64
c9dd260a4c Add unit tests for dump_integer
be9b4cbd60 Add benchmark for small integers
6503e83e74 Improve dump_integer performance by implementing a more efficient int2ascii
f16432832c Increase stack size for VS2017 Win x64 on Appveyor
b39f34e046 Merge pull request #1425 from hijxf/patch-1
7f73915d4f Updated year in README.md
df460c96cf Merge pull request #1423 from skypjack/patch-1
6546cad7bf Fixed broken links in the README file
847dd2a954 Merge pull request #1420 from skypjack/patch-1
937b642e0e :memo: added description on how to use NuGet package #1132
975dc970d1 Merge pull request #1417 from wythe/patch-1
b8be0f64ae Fixed broken links to operator[]() and at()
619bf9c20d Fixed broke links to RFC7159
a559ff8fc6 typo in README
2c0c2ca698 Specify target platform in generator name
676c847c55 Merge pull request #1409 from yann-morin-1998/yem/cmake-version
e8b6b7adc1 buildsystem: relax requirement on cmake version
c682b9879b :rotating_light: fixed PVS V567 warning
6f89613acd :rotating_light: fixed some warnings
db53bdac19 Merge branch 'release/3.5.0' into develop
cebb4e052a Merge branch 'release/3.5.0'
78348afeb6 :bookmark: set version to 3.5.0
1107f8cd82 :memo: updated documentation for items() function
98f4e31c3e :memo: formatted picture
58c269b039 :memo: updated documentation
2182157dc1 :memo: update documentation
45f5611d9b :rotating_light: fixed two warnings
117c1d14fb :memo: added contributors to 3.5.0
d584ab269a :art: fixed header
45a8a093d7 :rotating_light: fixed a warning
85849940ba Merge pull request #1391 from pratikpc/develop
ebd3f45808 Added Support for Structured Bindings
4f270e38cc Merge pull request #1342 from davedissian/bugfix/sfinae-iterator-traits
f1080d7c39 Code review.
5d390e91ff Merge pull request #1392 from mtalliance/feature/addFileInputAdapter
c1c85b025c Forget one std::FILE
635a4fc344 use namespace std when possible. Change the name of private variable.
cf31193de2 create single json.hpp file
a794cfdba3 refactor unit test in case of throw, the fclose will not be called. using unique_ptr with custom destructor will ensure that
91ff96a737 remove the const attribute
b7a2642fba remove comment
fa7f1a524e new unified json.hpp generated with make amalgamate
ef283e0cf8 add tests to cover the new input adapter
3335da622a remove non usefull code.
ae48acbb23 remove non usefull code. Add small description
52f6fd1d91 Add the possibility of using FILE * from cstdio library to read a file. This enable the possibility of using low eand device with this library.
67b0daf27b Add the possibility of using FILE * from cstdio library to read a file. This enable the possibility of using low eand device with this library.
2c23f0a346 Changes requested from code review.
e73dfef6e5 Merge pull request #1382 from kjpus/patch-1
767a3a327d Link to issue #958 broken
d53873a251 Merge pull request #1363 from theodelrieu/doc/implicit_conversions
7a56f5a42b Merge pull request #1380 from manu-chroma/patch-1
5de184b8fb readme: fix typo
ef90d62ddf :rotating_light: fixed warning #1364
7b961368d5 recommend using explicit from JSON conversions
da81e7be22 :checkered_flag: adding parentheses around std::snprintf calls #1337
f80efd3954 :lipstick: cleanup
35829928da Merge pull request #1343 from mefyl/develop
f86090aafc Merge pull request #1345 from mpoquet/feature/meson-install-pkgconfig
30e1cbb0df Merge pull request #1346 from ax3l/fix-mergePatchShadowParam
aa10382629 Set eofbit on exhausted input stream.
798754dfb6 Amalgamate Headers
97b81da840 merge_patch: rename parameter
ffe08983dd :meson: install headers + pkg-config
f665a92330 Implement SFINAE friendly iterator_traits and use that instead.
d2e6e1bf58 Merge pull request #1329 from ax3l/fix-typosWhitespaces
a7567bc596 Remove EOL whitespaces in natvis
f049836d68 CMake: Optional Install if Embedded
689382a722 Fix EOL Whitespaces & CMake Spelling
2f73a4d1f3 :rotating_light: fixed a linter warning
e3c28afb61 Merge branch 'release/3.4.0' into develop
6708f22cd4 Merge branch 'release/3.4.0'
0f3c74d821 :bookmark: set version to 3.4.0
7b2f8cce03 :bookmark: set version to 3.4.0
8cee0e38d9 :ambulance: fixed #1319
856fc31d0a :lipstick: fixed indentation
39419cd5c4 :rotating_light: fixed another linter warning
86b5ce953a :memo: added examples for BSON functions
d2e4f0b0d9 :pencil2: fixed some typos
f0c1459554 :bug: fixed a bug parsing BSON strings #1320
24946f67f1 :rotating_light: fixed some more linter warnings
7d0dc10169 :rotating_light: fixed a linter warning
45a761bd60 Merge branch 'develop' of https://github.com/nlohmann/json into develop
4e765596f7 :hammer: small improvements
1308ea055d Merge pull request #1315 from nlohmann/feature/convert_char
0e7be06bef Merge pull request #1323 from nlohmann/feature/enum_json_mapping
85aaf91b85 Merge branch 'develop' into feature/enum_json_mapping
5a6bdf5934 Merge branch 'develop' into feature/convert_char
037e93f5c0 Merge pull request #1320 from nlohmann/julian-becker-feature/bson
9f48bb6937 :zap: replaced vector by array #1323
6384fe28db :rotating_light: fixed another linter warning
ad639ad5e6 :sparkles: added NLOHMANN_JSON_SERIALIZE_ENUM marco #1208
544150d5a5 :rotating_light: fixed another linter warning
c2e175763c :ok_hand: added another conversion function #1315
d97fa30795 :ok_hand: fixed comment #1320
7ce720b700 :rotating_light: fixed coverage
19647e083c :rotating_light: fixed compiler warnings
62126278a6 :hammer: added fix for arrays
1968e5c793 :art: clean up binary formats
4d1eaace8c :hammer: fixed fuzz code to avoid false positives in case of discarded values
e2c5913a50 :construction: some changes to the BSON code
bba159121f Merge branch 'feature/bson' of https://github.com/julian-becker/json into julian-becker-feature/bson
f102df3cba :memo: updated documentation #1314
7b501de054 Merge pull request #1314 from nlohmann/feature/codec_errors
20038e2703 :memo: added a note to the discussion #1286
87ef3f25f2 :pencil2: fixed a typo #1314
b49f76931f :ok_hand: replaced static_cast to CharType by conversion function #1286
2343d9caeb :green_heart: additional tests from the Unicode spec #1198
951a7a6455 :construction: fixed test cases #1198
c51b1e6fab :construction: fixed an issue with ensure_ascii #1198
c7af027cbb :construction: respect ensure_ascii parameter #1198
e5dce64115 :green_heart: added tests #1198
c5821d91e5 :construction: overworked error handlers #1198
ad11b6c35e BSON: Improved exception-related tests and report location of U+0000 in the key-string as part of `out_of_range.409`-message
9294e25c98 Merge pull request #1301 from theodelrieu/fix/1299
b553a8a93c Merge pull request #1305 from koponomarenko/add-meson-info
5ba812d518 BSON: fixed incorrect casting in unit-bson.cpp
8de10c518b BSON: Hopefully fixing ambiguity (on some compilers) to call to string::find()
f0c55ce0e0 Add Meson related info to README
2a63869159 Merge branch 'develop' of https://github.com/nlohmann/json into feature/bson
4b2a00641c Merge pull request #1303 from nlohmann/feature/binary_errors
dbb0b63187 :wheelchair: improved error messages for binary formats #1288
a946dfc19c add a note to maintainers in type_traits.hpp
978c3c4116 BSON: throw `json.exception.out_of_range.409` in case a key to be serialized to BSON contains a U+0000
0671e92ced :construction: proposal for different error handlers #1198
daa3ca8a2e BSON: Adjusted documentation of `binary_writer::to_bson()`
5bccacda30 BSON: throw json.exception.out_of_range.407 in case a value of type `std::uint64_t` is serialized to BSON. Also, added a missing EOF-check to binary_reader.
45c8af2c46 add new is_constructible_* traits used in from_json
dd672939a0 Merge pull request #1294 from theodelrieu/fix/json_ref_ctor
11fecc25af add constraints for variadic json_ref constructors
e426219256 Merge pull request #1282 from nlohmann/feature/lines_columns
adfa961ed0 Merge pull request #1280 from nlohmann/feature/linter
6d34d64bfd :ambulance: fixed compilation error
74a31075e3 :wheelchair: improved parse error messages
6e49d9f5ff :ambulance: fixed compilation error
f8158997b5 :memo: fixed documentation
df0f612d1b BSON: allow and discard values and object entries of type `value_t::discarded`
3abb788139 :rotating_light: fixed some more clang-tidy warnings
858e75c4df :rotating_light: fixed some clang-tidy warnings
062aeaf7b6 BSON: Reworked the `binary_writer` such that it precomputes the size of the BSON-output. This way, the output_adapter can work on simple output iterators and no longer requires random access iterators.
6d09cdec34 :bug: fixed a bug in the unget function
011b15dd08 :wheelchair: added line positions to error messages
81f4b34e06 BSON: Improved documentation and error handling/reporting
ac38e95780 Merge pull request #1277 from performous/fix-clang-detection
fa722d5ac3 :rotating_light: fixed another linter warning
ec95438a59 :rotating_light: fixed some linter warnings
f1768a540a Merge branch 'release/3.3.0' into develop
aafad2be1f Merge branch 'release/3.3.0'
cdfe6ceda6 :bookmark: set version to 3.3.0
b968faa882 :bookmark: set version to 3.3.0
cd518fbbab :memo: small update to pass test suite
e8427061a0 Thirdparty benchmark: Fix Clang detection.
b911654857 :memo: updated contributor list
bb55885215 :lipstick: cleaned code
5c7d27c338 Merge pull request #1272 from antonioborondo/fix_warning
b6fdad9acd Remove anonymous namespace
7c385a4844 Fix error: 'wide_string_input_helper' was not declared in this scope
9ba3f79667 Fix error: explicit specialization in non-namespace scope
8d1585f065 Change implementation to use templates
ad3c216bb5 Generate header
0231059290 Fix warning
9f18e17063 Merge pull request #1270 from chuckatkins/add-more-cmake-docs
53ec0a16f3 Merge pull request #1271 from chuckatkins/cleanup-deprecated-warnings
4c617611e2 docs: Add additional CMake documentation
829571ab5c Turn off additional deprecation warnings for GCC.
c8231eff75 Merge pull request #1260 from chuckatkins/fix-cmake-target-alias
02e653bdf7 docs: add a note in the readme about using the CMake imported target
564506a885 cmake: add import config tests
1729db85c1 cmake: fix package config to deal with versioning and namespaces
910a895027 Merge pull request #1238 from theodelrieu/fix/1237
1fae82b7a7 Merge branch 'develop' into fix/1237
22e55349a6 :memo: added Wandbox link #1227
70e587c3da :memo: added Wandbox link #1227
d26f39466e Merge pull request #1231 from theodelrieu/feature/get_with_parameter
c61a9071ae :rotating_light: fixed a compilation issue with ICPC #755
e8730e5e82 BSON: Reworked `binary_reader::get_bson_cstr()`
b59a58406e Merge branch 'develop' of https://github.com/nlohmann/json into develop
4e54c9a13d :rotating_light: fixed a compilation issue with ICPC #755
0a09db9cc2 BSON: Extend `binary_reader::get_number` to be able to hanlde little endian input to get rid of `binary_reader::get_number_little_endian`
95432c34f9 Merge pull request #1262 from knilch0r/patch-1
8c1387cfb3 unit-testsuites.cpp: fix hangup if file not found
521fe49fec Add basic_json::get_to function.
680a4ab672 Merge pull request #1257 from henryiii/gcc48
7a37ba0c02 Adding 4.8 test to travis
ef358ae695 BSON: Fixed hangup in case of incomplete bson input and improved test coverage
99b7c7c8ef Patch nlohmann/json for GCC 4.8
bce4816275 BSON: Added test case for the different input/output_adapters
763705c2a7 Fix: Add missing `begin()` and `end()` member functions to `alt_string`
e184b6ecf2 Merge pull request #1252 from koponomarenko/fix-meson-build
88b055c2df Merge pull request #1249 from LEgregius/clang-3.4.2-crash-workaround
8799759b85 Add version and license to meson.build
4e52277b70 Fix issue #1237
e4bc98d036 Merge pull request #1245 from chuckatkins/fix-target-namespace-backward-compatibility
4d780b091b Reordered the code. It seems to stop clang 3.4.2 in RHEL 7 from crashing intermittently.
3b1a5cafad Use a version check to provide backwards comatible imported target names.
99939d6340 :memo: added lgtm.com badge
4e2f35d4c2 :construction_worker: adding Xcode 10 worker
7fa3b8865c Merge pull request #1221 from rivertam/better-error-305
8f07ab6392 Replace "key-style argument" with "string argument"
df33a90774 BSON: Bugfix for non-empty arrays
cf485c2907 BSON: Support for arrays
120d1d77d4 BSON: test case for a more complex document
5ce7d6bdd7 BSON: support objects with objects as members
83b427ad67 BSON: unsigned integers
c0d8921a67 BSON: support objects with int64 members
7ee361f7ad BSON: support objects with int32 members
c5ef023171 BSON: support objects with null members
6c447de076 BSON: Support objects with string members
0c0f2e44b5 BSON: support doubles
9a0dddc5d2 BSON: Object with single boolean
5f5836ce1c BSON: Support empty objects
f06c8fd8e3 BSON: serialization of non-objects is not supported
186c747a19 Merge pull request #1230 from mandreyel/lambda-unevaluated-context-fix
6b5334c167 Move lambda out of unevaluated context
ebb3c03293 :art: cleanup after #1228
d3428b35c5 Merge pull request #1228 from theodelrieu/remove_static_asserts
aea648bb7a remove now-useless traits. check for is_basic_json where needed
4b4bbceebf make from_json SFINAE-correct
f7971f04a5 make to_json SFINAE-correct
f7c8a2145a refactor from/to_json(CompatibleArrayType)
628f76729e do not check for compatible_object_type in compatible_array_type
29f72966c3 refactor is_compatible_type, remove conjunction & co
77967e6548 refactor is_compatible_integer_type
13760857ff refactor is_compatible_array_type
924e95c6e8 refactor is_compatible_string_type
e84195ab7b refactor is_compatible_object_type
b59c3367c9 use detected instead of has_* traits
1ea8cd128c fix void_t for older compilers
eb30ff0615 :rotating_light: fixed a compiler warning #1224
ad053ef09c Fix tests for improved error 305(hopefully)
bbdfe7dea6 Improve error messages for error 305
d713727f22 Merge pull request #1202 from dennisfischer/develop
04597c3a66 Merge pull request #1214 from devsisters/fix-1213
aada309f61 Fix #1213
359f98d140 Merge branch 'release/3.2.0' into develop
8c20571136 Merge branch 'release/3.2.0'
dfe607c6ff Export package to allow builds without installing
9f3857ef6f :bookmark: set version to 3.2.0
7608a64e1e :hammer: fixed amalgamation
a7b02bdce0 :bookmark: preparing 3.2.0 release
c6a482b16c :memo: added example for sax_parse
5ad52f4167 :arrow_up: Catch 1.12.0
3811daa8a3 :memo: release preparation
6899fa304c Merge branch 'develop' of https://github.com/nlohmann/json into develop
57faaf42ca :rotating_light: fixed a compiler warning
f78ac4fbd3 Merge pull request #1200 from thyu/develop
3004a73951 Fix -Wno-sometimes-uninitialized by initializing "result" in parse_sax
e33b31e6aa :bug: fixed callback-related issue (https://github.com/nlohmann/json/issues/971#issuecomment-413678360)
b5c54b41fd :memo: overworked documentation
07494e06d7 :rotating_light: fixed some compiler warnings
d5b21b051c Merge pull request #1153 from theodelrieu/refactor/no_virtual_sax
0cc3db4f15 add static_asserts on SAX interface
38f8a51a8f use abstract sax class in parser tests
9bbb133094 remove no_limit constant and default values
442886d040 use templates in the sax interface instead of virtuals
f6febbe359 split meta.hpp, add detected_t (used to define concepts)
3ac2d81a95 :hammer: fixed a MinGW error #1193
be2065dce9 :rotating_light: fixing a MinGW warning #1192
fed70f6bff :art: reindented code
0e748f2f8c Merge pull request #1187 from devsisters/json-internal-catch
861ee400cc Merge pull request #1176 from grembo/develop
3ce4325350 :memo: updated documentation of used compilers
ba4a19d4af :construction_worker: added more CI workers
043eff5ba8 :construction_worker: added more CI workers
05b27e83b7 Exclude bytewise comparison in certain tests. These tests never worked - they weren't run before d5aaeb4.
d5aaeb4cce Make section names unique in loops, as catch doesn't support duplicate sections, see also https://github.com/catchorg/Catch2/issues/816#issuecomment-278268122
3760a38b7e :checkered_flag: implicit conversion is not allowed with MSVC
5b14411669 :checkered_flag: trying to fix C2440 error
347e77bdc1 :ambulance: fix for #1169
04372a8c56 :checkered_flag: fix for #1168
d0e60de433 Add new JSON_INTERNAL_CATCH macro function
7bfc406ded :memo: added note about CocoaPods #1148
d456a2d777 Merge pull request #1151 from sonulohani/bigObjFix
b8ad3388ec Fixed compiler error in VS 2015 for debug mode https://github.com/nlohmann/json/issues/1114
39dd775e38 :hammer: cleanup after #1134
86a96b059d Merge pull request #1134 from Daniel599/feature/items_iterator
396a914f9e :hammer: added macro to disable compiler check #1128
bab5826504 Merge pull request #1144 from jrakow/cppreference-link-fix
515cfc2d89 Merge pull request #1142 from jrakow/develop
963d06a13c :memo: fix links to cppreference named requirements
9f00db48d9 :memo: link to cppreference via HTTPS
ec2ebd5ec9 meson: add multiple headers target
0bb36bb140 meson: fix include directory
62457729e8 :memo: mentioned MinGW in README
09c0df4a21 :construction_worker: choosing correct image
1bbc4a0859 :construction_worker: using Ninja to speed up build
d8fe13fc83 :hammer: fixed escaping for MinGW
e59b930927 :construction_worker: trying a more recent compiler
937d68e2e5 :construction_worker: forgot old PATH
989ad9b759 :construction_worker: using help from https://stackoverflow.com/a/48509334/266378
067e288289 :construction_worker: set build type
7bbc06b487 :construction_worker: forgot quotes
441e5d87e6 :construction_worker: experimenting with AppVeyor and MinGW
7fa4ddf93e :lipstick: fixed indentation
bf348ca8a4 Merge pull request #1028 from gracicot/develop
ed6a0686df :hammer: small refactoring to improve branch coverage
c8bfdfd961 :construction_worker: tryping different platforms for AppVeyor
c02de445bf :rotating_light: fixed more compiler warnings
66dd1a846d :rotating_light: fixed more compiler warnings
850922269d :rotating_light: removed compiler warnings
0460b90977 :memo: fix for #1052 #1139
85f35a1d59 :memo: documentation fix
e7c1638d11 :lipstick: cleanup
1c81e9f5ae Merge pull request #1130 from agrianius/develop
d505ed7b31 Merge pull request #1138 from theodelrieu/feature/unordered_map_conversion
2c920a1032 run make amalgamate
2b37d7ed86 from_json: add overload for std::unordered_map
299469cfd5 from_json: add missing template arguments for std::map
1566ad4053 fixed compile error for #1045; to_json for iternation_proxy_internal was needed
f574d7e084 simplify templates for operators, add more checks
cd28d872e7 forward declarations to make new compilers happy
3d3055909c define global operator< for const char* and alt_string
4feb8211ca test (non)equality for alt_string implementation
14e6278c2f Merge branch 'develop' of github.com:gracicot/json into develop
7acd90b651 Fixed check for compatible string type
5676a2a076 Aligned template declaration
e0e7fa39e7 Re-added external_constructor with string compatible types
4778c02ab5 Set MSVC version from 1514 and older
714c592680 Disabled implicit conversion to string_view on MSVC 15.13 and older
e830bc502f Merge pull request #1117 from TinyTinni/develop
ecadcdb593 added char cast
48656a49f5 typo
64acb42aa7 remove stringstream dependency
8efbf8d7bb :memo: documentation to avoid future issues like #1108
e5a67fc3f8 Merge branch 'develop' of https://github.com/nlohmann/json into develop
a49644ab74 :ambulance: adjusted Fuzzer to new parser
0efaf891e5 Merge pull request #1089 from theodelrieu/feature/map_conversion
c5e63fd684 Provide a from_json overload for std::map
db03d09312 Merge branch 'feature/key_ref' into develop (fixes #1098)
cf9299d222 Merge branch 'feature/sax2' into develop #971
3cdc4d784b :memo: added documentation
adf09726b0 Merge branch 'develop' into feature/sax2
481ace65c4 :hammer: only calculate array index string when needed #1098
1c6b332dcd :ok_hand: mitigating cppcheck bug #1101
90eb0a91e0 :zap: keys are now returned as const reference #1098
1f84cc2c88 :white_check_mark: adjusted test cases
717301d1bc Merge branch 'testsuite' into feature/sax2
4639bb2c8f :white_check_mark: added more tests from recent nst's JSONTestSuite
e94862a649 :ambulance: fixed error in callback logic
ae213721b1 :hammer: removed unget function for wstring parsers
5ff2abb90d Merge branch 'develop' into feature/sax2
567fe9b7a0 Merge pull request #1078 from martin-mfg/patch-1
377e956655 fix typo in readme
5da596385b Update issue templates
7bbe7bb98f :fire: removed old issue template
14f01e1981 :wrench: update issue templates
86b0732a10 :memo: added public key used for commits and releases
ed69e50ad2 :page_facing_up: added SPDX-License-Identifier
5bc4ff9da3 Merge branch 'feature/wstring' into develop
fa3e42f826 Merge branch 'develop' into feature/wstring
b5d1755dfb :fire: removed commented-out test cases #1060
0ab8fab338 Merge pull request #1058 from dns13/patch-1
65b4d8251b Fix typo in single_include, too
53fb230098 Fix typo
46ec2fddf8 :memo: updated THANKS list
b8bfd1140d Merge pull request #1048 from chuckatkins/misc-cmake-packaging-enhancements
33a2154f8d Enable target namespaces and build dir project config
29362c6ace Merge pull request #1047 from jammehcow/patch-1
c02a3155d4 :construction_worker: added Xcode 9.3 builder
8d8f890771 :hankey: first try on #1045
7f20e9ddc7 Fixed incorrect version number in README
031b88d315 Make the CMake install dir user-configurable
aaee18ce90 Added test for string conversion with string_view
7c503c64b7 Merge pull request #1043 from coryan/patch-1
4286b16b71 Fix trivial typo in comment.
cf91b4f2bb Merge branch 'develop' into feature/wstring
f924df1835 Merge branch 'develop' into feature/sax2
acf10d9af7 Merge pull request #1041 from ax3l/topic-spack
e1ea8369ad Merge branch 'develop' into feature/sax2
40f279c59d Merge branch 'feature/issue1021' into develop
18a0271a95 Merge branch 'develop' into feature/issue1021
1ae9896387 Package Manager: Spack
83b143382e Merge pull request #1040 from ax3l/topic-debugViewMSVCcmakeMin
e439a1a9a7 CMake: 3.8+ is Sufficient
495436a5d5 Merge pull request #1026 from ktonon/develop
a35d414c39 Update CMake to latest on Travis
08a7233d1b :ambulance: fixed commit 1e08654
1e08654f99 :hammer: cleanup
aa89c5e048 :hammer: removing unget_character() function from input adapters #834
6678eb2b4a :white_check_mark: improved test coverage #1031
16c5bfeaad :ok_hand: fixed compiler warnings #1031
727dd4664b :hammer: trying to make tests run with MSVC #1031
ab89ae4e50 :hammer: trying to make tests run with MSVC #1031
eb06d0531a :construction: added input adapter for wide strings #1031
ba6edd5634 :hammer: cleanup
850671b9f1 :hammer: using a vector<bool> for the parser hierarchy
4efa8cdb4c :green_heart: fixed Valgrind options #1030
830c93fd09 :memo: fixed example for operator> #1029
c78dbc366c Added test for conversion to string_view
53d8d57921 Amalgamate single include
5f723bbec6 :hammer: realized callback parser wirh SAX interface #971
896a9db461 :hammer: improved code #1021
73cc5089e3 Using target_compile_features to specify C++ 11 standard
a9baab76c2 :ambulance: fix for #1021
4f6b2b6429 :hammer: changed SAX interface
2537677e4c :white_check_mark: improved test coverage
9e1abb4842 :white_check_mark: improved coverage
1e38ffc014 :white_check_mark: more tests
25f56ff207 :memo: updated documentation
99ecca55c4 :white_check_mark: improved test coverage
9e07e9b4ec :sparkles: implemented non-throwing binary reader
a271ee5f16 :recycle: proper use of SAX parser for binary formats
943d641054 :hammer: some refactoring
22929fe189 :construction: started a SAX/DOM/callback parser
375b05a17d :hammer: cleanup
606a25195f :white_check_mark: improved test coverage
c87ffad45c :recycle: implemented a non-recursive parser
2a5506ed98 Amalgamated headers
8165707990 basic_json now supports getting many type of strings
27cf05af8d Merge branch 'develop' into feature/sax2
d2dd27dc3b Merge branch 'release/3.1.2' into develop
183390c10b Merge branch 'release/3.1.2'
8a6c8cb0f7 :bookmark: set version to 3.1.2
afef474c0d :bookmark: set version to 3.1.2
a52e8355b8 :rewind: oops
21410d50af :checkered_flag: moved /Wall to CMake
829ed74d66 :checkered_flag: experimenting with /Wall
1262d474eb :checkered_flag: fixed an MSVC warning
282bafae4f :hammer: fixed compilation error
abac6a0e84 Merge branch 'develop' into feature/sax2
919d1fef8f Merge pull request #1009 from nlohmann/user_string_parser
8557151d90 :recycle: adjusting lexer/parser in symmetry to #1006
b56ac86471 :memo: thanks for #1006
0cab3b2c8e Merge pull request #1006 from agrianius/dump-template
3d4f6a2940 :hammer: cleaner exception interface
ad47b0fbde :recycle: refactored binary readers to use a SAX parser
392c033805 test refactoring
51349537fc add unit test: checking dump to alternative string type
830f3e5290 forward alternative string class from output_adapter to output_string_adapter
ed6b1464f9 dump to alternate implementation of string, as defined in basic_json template (changes to amalgamated code)
faccc37d0d dump to alternate implementation of string, as defined in basic_json template
149d2fd09c :green_heart: improved test coverage
6399cd3039 Merge branch 'develop' into feature/sax2
6151dfaed7 :ok_hand: made changes proposed in #1001
35e43df625 Merge branch 'develop' into feature/sax2
9918523077 :memo: cleanup after #1001
e737de8941 Merge pull request #1001 from nlohmann/leak
aa8fc2a41c :ambulance: hopefully fixed the memory leak
7c1a788893 Merge branch 'develop' into feature/sax2
cf60e18c89 :fire: removing failing test (work on this in branch "leak")
97559bb1b2 :hammer: trying to fix the leak
38345fd06c :ok_hand: fixed some more warnings
8b379948d0 :fire: replaced acceptor with SAX parser
303a0c5843 Merge branch 'develop' into feature/sax2
d183d34b96 :green_heart: added another test case
d2d65bb25b :recycle: refined SFINAE to fix some warnings
476b2e09be :green_heart: added regression tests for #972 and #977
62030615a0 Merge pull request #986 from theodelrieu/fix/basic_json_conversion
5beab80553 :hammer: using the SAX-DOM parser
faf2546a15 :hammer: simplified SAX-DOM parser
5b9d03cfdb :hammer: added SAX-DOM-Parser
9d27429527 :hammer: added error messages to SAX interface
86991d5204 Merge branch 'develop' into feature/sax2
fdecbf6e1e Merge pull request #992 from bogemic/pvs_studio_fix_misprinted_condition
fd30ad8a14 did make amalgamate
2a2ed799b1 pvs_studio fix. misprinted condition
8d104e6fe3 :green_heart: fixed test case
5773e164bb :rotating_light: fixed a linter warning
8711ec6034 support construction from other basic_json types
c22f2d41f3 missing CHECK_NOTHROW in unit-udt
3ff9455332 :hammer: added a SAX-DOM-Parser
21352c4d8e :recycle: refactored SAX parser
981e226ca2 Merge branch 'develop' into feature/sax2
1f3d2a3be7 :memo: overworked README
13ca723c38 Merge pull request #981 from wla80/develop
05d3bf1699 Make integration section concise
8d6b3d44d6 :ok_hand: fixed some compiler warnings
8c7f46f7d0 :hammer: removed a logic error and improved coverage
922f7a3d0e :white_check_mark: added more tests for SAX parsing
ac230e8b4b :hammer: fixed test cases to be more robust
374ebacc51 :sparkles: added a SAX parser #971
8968adcd53 Merge branch 'release/3.1.1' into develop
c8ea63a31b Merge branch 'release/3.1.1'
8424d10e45 :bookmark: set version to 3.1.1
938c861a09 :bookmark: set version to 3.1.1
94b7a8da66 :lipstick: fixed indentation
20b5f4d89c Merge pull request #969 from theodelrieu/fix/924
01d6118828 Fix constraints on from_json(CompatibleArrayType)
b02e3bb0b6 Merge pull request #957 from theodelrieu/fix_coveralls
41db7cd818 Make the coveralls job use the multiple header version
447f5421eb :hammer: overworked release target
61f0bfb15c :hammer: enforce using Python 2 for the wandbox script
548f488941 :hammer: overworked Makefile
865ff00de0 :memo: updated documentation wrt. objects #963
addbbbe136 Merge branch 'develop' of https://github.com/nlohmann/json into develop
0a64982e86 :memo: cleanup after #954
e5d538c5ea Merge pull request #954 from pfultz2/patch-1
2dda87c3b7 Merge branch 'feature/coverage_multi' into develop
5731695d7b Clarify dev version and add space after the word flag.
74675dd69c :rewind: back to the original version
50863c5a09 Latest updates based on feedback
ab05df3a48 :hammer: another try
b455154cc9 :hammer: another try
1e8f4d6ab3 :hammer: more trying
316634e129 :hammer: added quotes around parameters
0111f3187e :hammer: working on #953
83db7876c5 :checkered_flag: removing test case that fails on MSVC #962
33a9b00ce6 :bug: fix for #962
8b457ace25 :bug: fixing CBOR's indefinity length strings #961
556e30f759 Merge pull request #955 from patrikhuber/patch-1
ee76436592 Change to angle brackets
737cffe0cb :hammer: fixed directory for lcov coverage
ae688016f6 Changed links from master to develop branch
2b7b39c72d :rocket: added release target #956
44b40d7c6a Fix links in README.md
3402260983 Add a note about installing the library with cget
3a887dc9fe :construction_worker: fixed coveralls
5c2a0a511e :construction_worker: fixed coveralls
b779666916 :construction_worker: re-added homebrew tests
97309f0da9 Merge branch 'release/3.1.0' into develop
15acf260ca Merge branch 'release/3.1.0'
a8fcfd9880 :construction_worker: fixed travis file
f5c03999d0 :hammer: fixed benchmark compilation
0258484626 :bookmark: set version to 3.1.0
ce7d0ebf5d Merge pull request #944 from theodelrieu/fix/cmake_install
14cd019861 fix cmake install directory (for real this time)
9958dde3da Merge pull request #950 from kaidokert/develop
aed4a080bf Templatize std::string in binary_reader #941
e8bf1f62f7 :sparkles: added define for library version #948 #943
552d153842 :memo: added more statistics on binary formats
60e2d28eb7 :bug: fix for #947
51c774f208 :memo: added documentation for binary formats
57e6fddd90 :rotating_light: fixed warnings
f7131715b1 Merge branch 'develop' of https://github.com/nlohmann/json into develop
ce273af9b6 :memo: added documentation for binary formats
ae235139b9 Merge pull request #940 from kaidokert/develop
8049442c2a :hammer: rename yytext to token_buffer (fixes #933)
d0c9e5fffc Allow overriding THROW/CATCH/TRY macros with no-exceptions (redo) #938
b3bd3b726b :memo: added link to OSS-Fuzz project repository
52e9449563 :memo: added more functions to overview
cb4a9c85cb :hammer: excluded code from coverage
1483d39c91 :hammer: moved class json_pointer into separate file #920
e95578f884 :memo: documented JSON Merge Patch (RFC 7386)
102c474397 :hammer: clean up
6855bbb902 :hammer: split "parsing" directory to "input" and "output"
05f49fa401 :white_check_mark: added roundtrip tests for UBJSON
f0b26c8f38 :white_check_mark: added fuzzer for UBJSON input
b0a68f540f :white_check_mark: added roundtrip tests for UBJSON
1be3935e9d :memo: cleanup after #936
7aace7c976 Merge pull request #936 from zerodefect/improvement/fix_kmin_compiler_warning
0e2211df0e Merge pull request #925 from zerodefect/improvement/improve_readme_json_fwd
95cf1fefaa Removed compiler warning about unused variable 'kMinExp'.
355c1e946b :construction_worker: added task to check amalgamation #906
dbfd7e532b Merge branch 'develop' of https://github.com/nlohmann/json into develop
3c68a796df :fire: deprecated iterator_wrapper #874
f05c3edc21 Merge pull request #930 from Pipeliner/develop
f5c4e9f3a1 Merge pull request #919 from theodelrieu/fix/sfinae_for_incomplete_types
7eabb6ba36 :memo: updated documentation for UBJSON functions
fc32b8a9bc Fix a typo in README.md
3cca630836 :hammer: cleanup after #915
010e596001 Merge pull request #915 from abolz/dtoa
3d776b0582 :memo: updated README
9e5d901f55 Merge branch 'feature/ubjson' into develop
327b8bb09e Merge branch 'feature/strings' into develop
d2b3fd156e Updated README.md to explain how installation of json_fwd.hpp can be achieved as part of install step.
b406e3704b :heavy_plus_sign: using Google Benchmark #921
a8f711a2f1 :heavy_plus_sign: using Google Benchmark #921
6402077ac2 Merge pull request #876 from nlohmann/feature/rfc7396
dcee778c1e fix sfinae on basic_json UDT constructor
7456f1d87b :recycle: re-used existing UTF-8 decoder to simplfy string serialization
afe4571309 :hammer: cleanup + some noexcept
b182308eff :hammer: cleanup
9b9919d460 Use max_digits10 in dump_float for float->text->float round-trip
810f81bbd9 Regenerate src/json.hpp
787204f076 Add unit-tests for detail::to_chars
9f7c2c04c8 Use the Grisu2 algorithm for formatting 'float's and 'double's
332f352033 Add an implementation of the Grisu2 algorithm for binary to decimal floating-point conversion
0695ac4001 Add tests for #360
68a9736738 Tests: Re-enable some round-trip tests
6e2e466c27 Tests: Don't rely on the format used for floating-point formatting
107c21a488 Tests: Exponents are formatted with a leading '+' sign
3ae82d91a2 Tests: Floating-point formatting uses lower case 'e'
92f7295063 :hammer: cleanup
3ac674562f :hammer: clean up
d9446b0e6e Merge pull request #911 from theodelrieu/fix/cmake_install
9d6b3731b9 :white_check_mark: improved test coverage
06cddd371b :hammer: removed failing amalgamation test
f85f4967fe :white_check_mark: improved test coverage
6965ff00c8 Merge branch 'develop' into feature/ubjson
411c16cbb2 :memo: overworked documentation wrt. amalgamation #906
fea5f3792b :memo: it's 2018
541b46132d :recycle: adjusted code to split headers
0e8f01a963 Merge branch 'develop' into feature/rfc7396
c772c01a48 :recycle: refactored code to split headers
1b54d4a5aa Merge branch 'develop' into feature/ubjson
420dcf1f25 :construction: added check whether code is amalgamated
5775084ffc cmake: add option to use/install the non-amalgamated version
84bffd5d36 move amalgamate tool to third_party folder
922b56e492 cmake: add back trailing slash to NLOHMANN_JSON_SOURCE_DIR
a66b2d20c6 :rotating_light: removed linter warnings for Python code
f4a55f26b0 :heavy_plus_sign: added amalgamate Python script
241eea0c0e :memo: documentation
10bad9381d :construction: added size benchmark for binary formats
3a7585e738 :white_check_mark: added more tests
31bfabc4c0 :hammer: optimized input format
965a70e38d :hammer: optimized output format
85173f5627 :hammer: some clean up
ce53537ba2 :heavy_minus_sign: :heavy_plus_sign: replaces amalgamation tool
0a2920e0fd :recycle: reorganized code
b67e00b9b5 Merge pull request #700 from theodelrieu/refactor/split_it
fd04967676 :bug: fixed copy-paste error
fb1154c237 :construction: debug
97e0d20ce9 :construction: debug
ebf28a26ee :construction: another try
7e4ee23f40 add single_header CMake target
57d822b6e2 add missing includes, put back include comments
9cab30cfce add adl_serializer.hpp
8e9714fe3d add detail/json_ref.hpp
a3473fda6a add detail/serializer.hpp
c117515e31 add detail/parsing/binary_writer.hpp
d620f76f0d add detail/parsing/binary_reader.hpp
4dbb433a79 add detail/parsing/output_adapters.hpp
ae6f66048c add detail/iterators/json_reverse_iterator.hpp
5fc9ef2b90 add detail/iterators/iteration_proxy.hpp
bf06cf6c22 add detail/iterators/iter_impl.hpp
3e65a65290 add detail/iterators/internal_iterator.hpp
51ecc31db7 add detail/iterators/primitive_iterator.hpp
9ea25685a8 add detail/parsing/parser.hpp
3a0743db97 add detail/parsing/lexer.hpp
7ab3e8d7b3 add detail/parsing/input_adapters.hpp
21881606f2 add detail/conversions/to_json.hpp
e0c02c14f0 add detail/conversions/from_json.hpp
7056b375c4 add detail/value_t.hpp
8c555db970 add detail/exceptions.hpp
f364f5ac5a add detail/meta.hpp
d686713f91 add detail/macro_{un}scope.hpp
5bffc95773 add json_fwd.hpp
3d7658da89 :construction: working on AppVeyor's errors
126ce2e56c :construction: further UBJSON
c9938ea838 :construction: started UBJSON implementation
15b6421d07 :white_check_mark: added UTF-8 decoder capability and stress test
78f8f837e6 added items() function #874
96b40b27a5 :memo: fixed Doxygen warnings
337e9824ea Merge pull request #900 from Dobiasd/patch-1
ba2316372a fix link to the documentation of the emplace function
a43347e1f9 Merge branch 'develop'
ce1dccf347 Merge branch 'release/3.0.1' into develop
5681e55da8 Merge branch 'release/3.0.1'
92484f0caf :bookmark: set version to 3.0.1
ebc6849b71 :white_check_mark: added test for #894
3c76ff353d :memo: updated docs after PRs
d45183d426 Merge branch 'develop' of https://github.com/nlohmann/json into develop
3b3b6e8e69 :ambulance: fix for #894
f28fc2261a Merge pull request #858 from mattismyname/develop
72bff90ed9 :wrench: Fix up a few more effc++ items
3113a52a7d :memo: added exception 403 to documentation of at (#888)
184e9c6aa7 Merge pull request #885 from TinyTinni/develop
d1cda6888e includes CTest module resp. BUILD_TESTING option
88ddb12afc :memo: fix for #883
e54b6ace94 Merge pull request #882 from erengy/fix-msvc-c4819
ab0e8b2f3a Fix MSVC warning C4819
1ca6ec1dc0 Merge pull request #880 from nlohmann/coverity_scan
1856f38c85 :memo: removed paragraph on version 3.0.0
afebb6a3bb Merge branch 'release/3.0.0' into develop
9f81beb5e2 Merge branch 'release/3.0.0'
106f9f5436 :arrow_up: updated git-update-ghpages script
9eb5e2c271 :bookmark: set version to 3.0.0
9e3c4ad11f :bookmark: set version to 3.0.0
314e4e7699 :memo: improved documentation for dump and iterator_wrapper
9a51fb4da2 :rotating_light: fixed some warnings
7bf007f2bc Merge pull request #879 from nlohmann/feature/algorithms
980795b644 :pencil2: fixed typos
f3bd755cab :heavy_minus_sign: removing <iomanip> header
4c871c58f8 :white_check_mark: re-added tests for algorithms
c23f5dcea6 :memo: fixed year
2e1b1061cd Merge pull request #875 from nlohmann/feature/spelling
261caec2de :busts_in_silhouette: added contributor image
f80827d068 Merge pull request #873 from nlohmann/feature/issue872
9a70c60fa5 Revert ":arrow_up: updated to Catch 2.0.1"
fb8482db76 :ok_hand: fixed some issues from the last commit #875
c6e7eae394 :sparkles: implemented JSON Merge Patch (RFC 7396)
920f64c01c :arrow_up: updated to Catch 2.0.1
293748a9a9 :memo: overworked README
e8d9963abe :ok_hand: cosmetic changes and overworked spelling
a9a4ff61c6 :rotating_light: remove C4996 warnings #872
f7ae143a93 Merge pull request #870 from nlohmann/feature/issue838
8419bfbbd2 :white_check_mark: improved test coverage
569d275f65 :boom: throwing an exception in case dump encounters a non-UTF-8 string #838
383743c6c0 Merge pull request #868 from nlohmann/feature/issue867
7de009edd1 :pencil2: fixing typos #869
772bb3cc20 :memo: fixing documentation #867
0693945230 Merge pull request #860 from bogemic/std_iterator_conformance_cpp17
64d6daa76e iter_impl template conformance with C++17
7c2d4f1852 :construction_worker: added Xcode 9.1 and 9.2
9e2f185ac6 :lipstick: reformatted code after PRs
c5e731774a Merge pull request #856 from bogemic/std_allocator_conformance_cpp17
25d205c16d :memo: clarified difference between serialization and string value retrieval #853
fa76f2efd7 Merge pull request #855 from theodelrieu/fix/cmake_include_directories
8890b935fd fixed merge conflicts
daba1b6a0b fixed conformance with C++17, some members of allocator are depricated and should be used via allocator_traits
0e3a0b730b Merge pull request #854 from theodelrieu/fix/force_msvc_stacktrace
541ee62a05 cmake: use BUILD_INTERFACE/INSTALL_INTERFACE in target_include_directories
c9a02cbc59 to/from_json: add a MSVC-specific static_assert to force a stacktrace
f4c01601fa Merge pull request #844 from TinyTinni/develop
24fe572d98 missing new line
8e9a8792a9 moved natis to root dir
af775ddbb8 add compiler & cmake version check
48d7a32daa add .natvis for MSVC debug view
5b4855dea2 fix targetname
cc937deaf6 :ambulance: the last commit contained a bug #821
430f03512c :rotating_light: fixed some warnings #821
ea5aed0769 Merge branch 'feature/to_array' into develop
de75cf89f7 :white_check_mark: improved test coverage
52ca35b2b0 Merge pull request #829 from jowr/patch-1
7b8ddadd83 removed hunter badge
b5ddd99adf Updated hunter package links
4c4f60f438 :memo: fixes #820
1af5601a2a Merge pull request #811 from Itja/patch-1
e423aea64a Typos README
5696660eba :hammer: another try to fix #714
c4d6626745 :rocket: installed Request Info Bot
6d2981db82 :memo: overworked templates
87df1d6708 Merge branch 'develop' of https://github.com/nlohmann/json into develop
fa1425b87c :rocket: installed Sentiment Bot
73d0095154 Merge pull request #807 from theodelrieu/fix/805
4b46abf97c add forwarding references to json_ref constructor
8e067c0c3c :hammer: set bidirectional iterator tag #593
cea3f24ff9 :memo: comment to address #561
61cc07ff38 :memo: some documentation
734e2b73cf :hammer: cleanup
7820b5eccb :memo: thanks for #795
77f8e2f987 Merge pull request #795 from jseward/develop
c215b77936 :rocket: installed Stale Bot
992c836b30 Add missing spaces
715c98b404 Remove extra spaces
6c9a401ebc Remove old non-perfect forwarding find and count
16ffdbcb20 Remove c++17 support flag in cmake
73b1629a15 Remove tabs for spaces
1b1bd0e3e6 :rewind: #714 is still not fixed
33c6511dd0 Remove JSON_HAS_STRING_VIEW
89650c99dd :construction: checking if #714 is now fixed with MSVC
b0c380b0f8 :memo: cleanup after the last PRs
be4fba7baf Merge branch 'develop' of https://github.com/nlohmann/json into develop
f193427e91 :hammer: some simplifications
24b6e028a9 :white_check_mark: improved test coverage
3094640446 Merge pull request #764 from pjkundert/develop-simplify-istream
ef40673acb Merge branch 'develop' into develop-simplify-istream
d468f8c4e6 Use consistent logic to determine if string_view exists
59cde1ad6e Fix for _HAS_CXX17 == 0
1a66679929 Add string_view support
33df3250c3 Merge pull request #793 from sonulohani/develop
92da334862 Error : 'identifier "size_t" is undefined' in linux
2e281ba64b Merge pull request #788 from jseward/develop
a99fcb4e7d Add comments and newline
917d9d8bc3 Fix Visual Studio 2017 warnings
7c8f0a4186 Merge pull request #785 from jseward/develop
b27a142ec0 Merge pull request #783 from eld00d/patch-1
a8cc7a1bc8 Consistently use std::char_traits int_type-->char conversion intrinsics
af99090742 Disable warning C4389: '==': signed/unsigned mismatch
8ba7f69ab4 Fix whitespace
8a4af820c7 Fix warning C4706
19f8f1c075 Add missing "u8"
5ec44fe9e3 Add /W4 for MSVS
727ee7d03e Set GENERATE_TAGFILE in Doxyfile
d300a8e268 :rotating_light: fixed warnings #776
0b803d0a5f Simplify the json/src/benchmarks.cpp to allow more optimal code gen. o For some unknown reason, the complexity of the benchmark platform   prevented some C++ compilers from generating optimal code, properly   reflective of the real performance in actual deployment. o Added the json_benchmarks_simple target, which performs the same   suite of tests as json_benchmarks. o Simplified the benchmark platform, and emit an "Average" TPS   (Transactions Per Second) value reflective of aggregate parse/output   performance.
23440eb86e Remove outdated commentary about the value of eof(), retain input type o We assume the same character int_type as the unerlying std::istream o There are no assumptions on the value of eof(), other than that it   will not be a valid unsigned char value. o To retain performance, we do not allow swapping out the underlying   std::streambuf during our use of the std::istream for parsing.
45e1e3d48a Revert some unnecessary member initializer changes.
5e480b56d8 Further simplify character type handling
1b43a45bec Implement correct handling of std::streambuf int_type, eof() o Make no assumptions about eof(), other than that it is somewhere   outside of the valid range of char_type.
184dab60e6 Accelerate access to underlying std::istream streambuf
f775922ca8 Specify initializers for yytest, token_string using initializer-lists o We can retain -Weffc++ and specify default initializers by using   initializer lists.  The risks are low (of additional non-conformat   compilers), because there is already one other such initialization   used in the code-base.
546e148b24 Further performance improvements, and corrections in get_token_string o An (-'ve valued, typically -1) EOF must never be allowed in   token_string, as it be converted to 255 -- a legitimate value. o Comparing against a specific eof() (-1, typically) is more costly than   detecting +'ve/-'ve.  Since EOF is the only non-positive value allowed   we can use the simpler test. o Removed unnecessary test for token_string size, as it is already   tested in the method, and must never occur in correct code; used an   assert instead.
8665e25942 Rename get_string to move_string to imply side-effect
e0d890cc23 Corrected unnnecessary const restriction on returned std::string
97a388802d Improve performance by constructing yytext as a std::string o Return its contents when necessary.  In many cases, this avoids   construction of multiple copies of the yytext token.  Exceeds   performance of current develop branch.
7c523338c5 Remove unnnecessary NUL termination of yytext (as it may contain NULs)
14ca1f6f09 Restore istream performance #764 o Use std::streambuf I/O instead of std::istream; does not maintain   (unused) istream flags. o Further simplify get/unget handling. o Restore original handling of NUL in input stream; ignored during   token_string escaping.
12efeadc2e Further simplify istream handling; use native unget
f585fe4eec Test to confirm parsing of multiple JSON records in a istream #367
90adf6ec20 Simplify get_token_string, unnecessary buffering, handle Byte Order Mark
0c0851dbea :memo: comment how to integrate tsl::ordered_map (#546)
bab4a15748 :memo: comment how to integrate fifo_map (#485)
60439aff05 :memo: different cmake call
73d1b55aba :wrench: executing tests in parallel
615366447a :wrench: removing -Weffc++ warnings
73727c989c Merge branch 'feature/coveralls' into develop
75f4678b96 :hammer: added filter script for branch coverage
c204ac82e0 :hammer: adjusted Coverity script to work without Makefile
7b82e4b4c8 :hammer: added Makefile target to calculate lcov coverage
1b3df3a63f :hammer: trying to use Coveralls with CMake #698
99ee4c1eaf :hammer: cleaned up Makefiles and docs #698
5cb6d7187d :rotating_light: fixing last warning in #755
4e81c1db47 Merge pull request #765 from nlohmann/feature/issue698
e2045eae53 :checkered_flag: and another try
a85bc358f7 :checkered_flag: another try
3457e7bc5b :checkered_flag: try to get MSVC 2017 running again
54bd1b5124 Merge branch 'develop' into feature/issue698
7435d54e97 :hammer: clean up
4912231450 Merge branch 'develop' into feature/issue698
b91805e1f0 :rotating_light: removing a compiler warning #755
f89f8b2d0b Merge branch 'develop' into feature/issue698
8be303d4fb :checkered_flag: fixing a min() call for MSVC #762
1df836ce40 :rewind: removed call to std::signbit #761
8af49d4be5 :rotating_light: removing compiler warnings #755
1a66527dca :memo: fixed documentation #745
b05ea3de55 Merge pull request #753 from gregmarr/patch-1
ec60ff3451 Add info for the vcpkg package.
647711fad1 :white_check_mark: improved test coverage
737816d0cd :construction_worker: another try with Travis
e75adc21a5 Merge branch 'develop' into feature/issue698
b90529c36d :white_check_mark: improved test coverage
82c93680d1 Merge branch 'develop' into feature/issue698
e2e0ecd867 …
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
state: please discuss please discuss the issue or vote for your favorite option
Projects
None yet
Development

Successfully merging a pull request may close this issue.

4 participants