Florian Albrechtskirchinger
307c053b9b
Add missing <numeric> include ( #3719 )
2022-08-30 20:55:47 +02:00
Raphael Grimm
bed648ca55
Allow custom base class as node customization point ( #3110 )
...
Co-authored-by: Niels Lohmann <niels.lohmann@gmail.com>
Co-authored-by: Florian Albrechtskirchinger <falbrechtskirchinger@gmail.com>
Co-authored-by: barcode <barcode@example.com>
2022-08-28 13:59:07 +02:00
Niels Lohmann
f7973f46d6
Use official Clang/GCC containers ( #3703 )
2022-08-27 17:28:50 +02:00
Florian Albrechtskirchinger
4c8cdd7afc
Add 'Check amalgamation' workflow ( #3693 )
2022-08-27 14:20:51 +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
Niels Lohmann
500bdc56bf
Add labeler action ( #3671 )
...
👷 add labeler action
2022-08-04 16:46:45 +02:00
Niels Lohmann
98d70d4676
Publish documentation on push to develop branch ( #3660 )
...
👷 add job to publish the documentation
2022-08-03 22:28:26 +02:00
Niels Lohmann
22cd1c9eb9
🔧 adjust naming of GitHub action jobs ( #3661 )
2022-08-03 18:37:02 +02:00
Niels Lohmann
ac20714e2e
👥 complete contributor list ( #3662 )
2022-08-03 18:36:46 +02:00
Florian Albrechtskirchinger
2ac7d023d4
Add Discord badge to README ( #3651 )
2022-08-03 09:17:02 +02:00
Florian Albrechtskirchinger
32242022f7
Minor BJData fixes ( #3637 )
...
* Replace vector/map LUTs in binary_reader with arrays
* Replace string_t::npos in binary_reader
2022-08-03 09:15:37 +02:00
Florian Albrechtskirchinger
ac9e668e63
Update CI ( #3626 )
...
* Bump macos-10.5 runner to macos-11 and update Xcode versions
* Address CodeQL warning
* Only build relevant commits on AppVeyor
* Don't hardcode paths in Ubuntu workflow
2022-08-03 09:15:16 +02:00
Niels Lohmann
df98ca29f8
Merge tag 'v3.11.1' into develop
...
JSON for Modern C++ 3.11.1
2022-08-01 23:31:54 +02:00
Niels Lohmann
69d744867f
Merge branch 'release/3.11.1'
2022-08-01 23:31:38 +02:00
Niels Lohmann
f2020da0dd
🔖 set version to 3.11.1
2022-08-01 23:27:58 +02:00
Florian Albrechtskirchinger
cbaf1033be
Fix global UDLs ( #3646 )
...
* Add ci_test_noglobaludls to CI
* Really default JSON_GLOBAL_UDLS to 1
* Test global UDLs
* Suppress warnings
* Clarify documentation
2022-08-01 22:42:35 +02:00
Niels Lohmann
817a4a2117
Merge tag 'v3.11.0' into develop
...
JSON for Modern C++ 3.11.0
2022-08-01 13:15:38 +02:00
Niels Lohmann
499422b303
Merge branch 'release/3.11.0'
2022-08-01 13:12:06 +02:00
Niels Lohmann
ce0e13ccea
🔖 set version to 3.11.0
2022-07-31 23:19:06 +02:00
Florian Albrechtskirchinger
9aafcbe965
Move UDLs out of the global namespace ( #3605 )
...
* Move UDLs into nlohmann::literals::json_literals namespace
* Add 'using namespace' to unit tests
* Add 'using namespace' to examples
* Add 'using namespace' to README
* Move UDL mkdocs pages out of basic_json/
* Update documentation
* Update docset index
* Add JSON_GlobalUDLs CMake option
* Add unit test
* Build examples without global UDLs
* Add CI target
2022-07-31 17:38:52 +02:00
Niels Lohmann
8fd8b52907
Prepare 3.11.0 release ( #3635 )
...
* 📄 add license header
* Update Makefile
Co-authored-by: Florian Albrechtskirchinger <falbrechtskirchinger@gmail.com>
* 🔥 remove unused Doxygen leftover
Co-authored-by: Florian Albrechtskirchinger <falbrechtskirchinger@gmail.com>
2022-07-31 15:28:01 +02:00
Florian Albrechtskirchinger
d3e347bd2d
More documentation updates for 3.11.0 ( #3553 )
...
* mkdocs: add string_view examples
* mkdocs: reference underlying operators
* mkdocs: add operator<=> examples
* mkdocs: fix style check issues
* mkdocs: tweak BJData page
* mkdocs: add CMake option hints to macros
* mkdocs: fix JSON_DISABLE_ENUM_SERIALIZATION definition
* mkdocs: fix link to unit-udt.cpp
* mkdocs: fix "Arbitrary Type Conversions" title
* mkdocs: link to api/macros/*.md instead of features/macros.md
* mkdocs: document JSON_DisableEnumSerialization CMake option
* mkdocs: encode required C++ standard in example files
* docset: detect gsed/sed
* docset: update index
* docset: fix CSS patching
* docset: add list_missing_pages make target
* docset: add list_removed_paths make target
* docset: replace page titles with name from index
* docset: add install target for Zeal docset browser
* Use GCC_TOOL in ci_test_documentation target
2022-07-31 14:05:58 +02:00
Niels Lohmann
11ba5c1120
🚨 fix warning ( #3634 )
2022-07-31 07:23:30 +02:00
Niels Lohmann
9472ab4f84
Add license header to new files ( #3633 )
2022-07-31 07:22:22 +02:00
Florian Albrechtskirchinger
66c8bb5b90
Add a unit test including windows.h ( #3631 )
2022-07-31 07:22:07 +02:00
Florian Albrechtskirchinger
19e4c2bda0
Add regression tests for #3204 and #3333 ( #3629 )
2022-07-31 07:21:48 +02:00
KsaNL
fc3e64cbf9
Fixed latest build error in msvc platform ( #3630 )
...
* Fixed latest build error in msvc platform
warnings in msvc about mix/max macro while windows.h is used in the project #762
* Update for CI
None
* Update single_include/nlohmann/json.hpp
Co-authored-by: Florian Albrechtskirchinger <falbrechtskirchinger@gmail.com>
Co-authored-by: Florian Albrechtskirchinger <falbrechtskirchinger@gmail.com>
2022-07-30 23:03:09 +02:00
