External/json
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,509 Commits 10 Branches 56 Tags 212 MiB
763c59dc7c
Commit Graph

4509 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Raphael Grimm
763c59dc7c
Update docs/mkdocs/docs/api/basic_json/json_base_class_t.md 
Co-authored-by: Niels Lohmann <niels.lohmann@gmail.com>
 2022-08-27 17:11:29 +02:00
Raphael Grimm
b1001c6e9e
Update single_include/nlohmann/json.hpp 
Co-authored-by: Florian Albrechtskirchinger <falbrechtskirchinger@gmail.com>
 2022-08-19 12:49:48 +02:00
Raphael Grimm
0bcc12cb76
Update include/nlohmann/detail/json_custom_base_class.hpp 
Co-authored-by: Florian Albrechtskirchinger <falbrechtskirchinger@gmail.com>
 2022-08-19 12:49:38 +02:00
Raphael Grimm
f5162095eb
Update single_include/nlohmann/json.hpp 
Co-authored-by: Florian Albrechtskirchinger <falbrechtskirchinger@gmail.com>
 2022-08-19 12:49:20 +02:00
Raphael Grimm
afb108a7f8
Update include/nlohmann/detail/json_custom_base_class.hpp 
Co-authored-by: Florian Albrechtskirchinger <falbrechtskirchinger@gmail.com>
 2022-08-19 12:49:11 +02:00
barcode
7cd3033e83 run amalgamate 2022-08-18 23:12:50 +02:00
barcode
962fca21c5 readd suppress for cppcheck 2022-08-18 23:12:50 +02:00
barcode
0a8e16d872 Adapt code to review 2022-08-18 23:12:50 +02:00
Raphael Grimm
5539e6f80c Update docs/mkdocs/docs/api/basic_json/json_base_class_t.md 
Co-authored-by: Florian Albrechtskirchinger <falbrechtskirchinger@gmail.com>
 2022-08-18 23:12:50 +02:00
Raphael Grimm
21d0d38073 Update docs/mkdocs/docs/api/basic_json/json_base_class_t.md 
Co-authored-by: Florian Albrechtskirchinger <falbrechtskirchinger@gmail.com>
 2022-08-18 23:12:50 +02:00
Raphael Grimm
050a831f55 Update docs/mkdocs/docs/api/basic_json/json_base_class_t.md 
Co-authored-by: Florian Albrechtskirchinger <falbrechtskirchinger@gmail.com>
 2022-08-18 23:12:50 +02:00
barcode
c427a52274 Fix clang-tidy-15 warning about use after move 2022-08-18 23:12:50 +02:00
barcode
79a70562d5 Update / add documentation for custom base class 2022-08-18 23:12:50 +02:00
Raphael Grimm
500fc0ab23 Remove accidentally duplicated doc text 2022-08-18 23:12:50 +02:00
Raphael Grimm
2e7e67da97 Fix typo 
Co-authored-by: Niels Lohmann <niels.lohmann@gmail.com>
 2022-08-18 23:12:50 +02:00
Raphael Grimm
5204ebb0d0 Add documentation 2022-08-18 23:12:50 +02:00
Raphael Grimm
f43c6b433d Document what the include of type_traits is used for 
Co-authored-by: Niels Lohmann <niels.lohmann@gmail.com>
 2022-08-18 23:12:50 +02:00
Raphael Grimm
e41e315164 Add NOLINT since clang-tidy requests make_unique, but C++11 jobs don't support it 2022-08-18 23:12:50 +02:00
Raphael Grimm
ef54887aa4 Remove make_unique to make the test c++11 compliant 2022-08-18 23:12:50 +02:00
Raphael Grimm
004634821f Try fixing code for clang-tidy 2022-08-18 23:12:49 +02:00
Raphael Grimm
e5534f15f1 Fix clang-tidy errors 2022-08-18 23:12:49 +02:00
Raphael Grimm
09f42fd23f Suppress fals positive of cppcheck 2022-08-18 23:12:49 +02:00
Raphael Grimm
8f4d8a6f93 Re run make amalgamate 2022-08-18 23:12:49 +02:00
Raphael Grimm
51d8c28ea5 Fix test 2022-08-18 23:12:49 +02:00
Raphael Grimm
a131ecc059 Fix code for msvc 2022-08-18 23:12:49 +02:00
Raphael Grimm
143f868f9c Allow to add a custom base class as an extension point to json nodes 
* by default an empty class is used and the library behaves as it already did
* if a user explicitly adds a base class (last template parameter) each node inherits it
* this can be used to add custom extensions (e.g. add metadata / visitor methods)
* add test for this feature
 2022-08-18 23:12:49 +02:00
Niels Lohmann
8fcdbf2e77
Merge tag 'v3.11.2' into develop 
JSON for Modern C++ 3.11.2 v3.11.2
 2022-08-12 15:06:07 +02:00
Niels Lohmann
bc889afb4c
Merge branch 'release/3.11.2' 2022-08-12 15:06:06 +02:00
Niels Lohmann
9d69186291
🔖 set version to 3.11.2 2022-08-12 15:04:06 +02:00
Florian Albrechtskirchinger
32bbd38072
generate_natvis.py: validate version number; cleanup (#3698) 2022-08-12 12:13:52 +02:00
Florian Albrechtskirchinger
c0dae0f510
Add Python script for generating Natvis file and update file for 3.11.2 (#3697) 2022-08-12 08:24:32 +02:00
Florian Albrechtskirchinger
0e61ee8b07
Restructure inline namespace and allow version component to be disabled (#3683) 2022-08-10 20:24:16 +02:00
Ikko Ashimine
93112fbf4d
fix typo in json_pointer.md (#3692) 2022-08-10 20:01:32 +02:00
Florian Albrechtskirchinger
a92ccafd2c
Deprecate json_pointer/string_t comparisons (#3684) 
* Deprecate json_pointer/string_t comparisons

* Update documentation
 2022-08-07 22:26:59 +02:00
Niels Lohmann
e1a3fb74ba
Add amalgamated json-fwd.hpp to release (#3687) 
* 🔧 add amalgamated json-fwd.hpp to release

* 🔧 add amalgamated json-fwd.hpp to package managers
 2022-08-07 20:33:34 +02:00
Florian Albrechtskirchinger
d79d12f854
Update docset index (#3686) 2022-08-07 20:33:15 +02:00
Florian Albrechtskirchinger
31265dc69c
Make json_pointer usable as map key (again) (#3685) 
* Make json_pointer usable as map key

* Add unit tests
 2022-08-07 14:35:40 +02:00
Florian Albrechtskirchinger
231f3108ff
Amalgamate the forward declaration header (#3679) 
* Amalgamate the forward declaration header

* Update CONTRIBUTING and PULL_REQUEST_TEMPLATE

* Update documentation
 2022-08-07 13:57:32 +02:00
Florian Albrechtskirchinger
dae5412268
Properly constrain non-string json_pointer overloads (#3681) 
Thanks, @alex-700, for reminding me.
 2022-08-07 13:55:09 +02:00
Florian Albrechtskirchinger
0c7a18374c
Reimplement value() access functions (#3663) 
* Reimplement value() access functions

* Merges the 'const char *' with the 'ValueType &&' overloads.
* Fixes ambiguities when default value is 0.
* Fixes 'no matching function' error when specifying ValueType template
  parameter.
* Fixes incorrect template parameter order in previous overloads.

* Add additional value() tests

* Make JSON_MultipleHeaders visible to unit tests

Define the macro JSON_TEST_USING_MULTIPLE_HEADERS to 0/1 depending on
JSON_MultipleHeaders.

* Add type_traits unit test

* Update documentation
 2022-08-07 13:54:55 +02:00
Florian Albrechtskirchinger
8eee62d388
Miscellaneous small fixes (#3643) 
* serve_header: suppress lgtm warning

* serve_header: fix exit code

* serve_header: replace deprecated ssl.wrap_socket()

* Add checks to unit test readme

* Add lgtm configuration file
 2022-08-07 13:52:43 +02:00
Florian Albrechtskirchinger
f1e34070d2
Fix 'const' qualifier on bool& has no effect (#3678) 
* Fix 'const' qualifier on bool& has no effect

Thanks, @georgthegreat, for pointing out this issue.

* Extend std::vector<bool> unit test
 2022-08-07 13:50:08 +02:00
Niels Lohmann
bfbe774d8f
🚑 fix documentation job 2022-08-07 13:34:34 +02:00
Niels Lohmann
b0422f8013
🚑 fix documentation job 2022-08-05 23:09:55 +02:00
Niels Lohmann
7b6cf5918b
Documentation change (#3672) 
Co-authored-by: Florian Albrechtskirchinger <falbrechtskirchinger@gmail.com>
 2022-08-05 19:51:39 +02:00
Florian Albrechtskirchinger
9e1a7c85e3
Add json_pointer/string_t equality comparison operators (#3664) 2022-08-05 14:08:27 +02:00
Niels Lohmann
e839f58a2a
👷 fix whitespace (#3675) 2022-08-05 09:12:28 +02:00
Florian Albrechtskirchinger
01af734d63
Attempt to fix labeler permissions (#3674) 2022-08-04 23:38:27 +02:00
Florian Albrechtskirchinger
b13b8748b6
Refine 'Publish documentation' workflow (#3673) 
* Only publish documentation when changed

* Enable manual publishing of the documentation

* Don't try to publish documentation from forks
 2022-08-04 22:53:05 +02:00
Niels Lohmann
b6e2942d1c
Complete contributor list (#3670) 
* 👥 complete contributor list

* Update README.md

Co-authored-by: Florian Albrechtskirchinger <falbrechtskirchinger@gmail.com>
 2022-08-04 22:48:30 +02:00