haraldwolff/json
1
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2024-07-07 12:23:49 +02:00
Code Issues Packages Projects Releases Wiki Activity
4358 commits 11 branches 56 tags 222 MiB
Commit graph

572 commits

Author SHA1 Message Date
Niels Lohmann 312a998873
🚸 add GDB pretty printer 2021-01-23 13:26:44 +01:00
bl-ue c9d325b64b readme: fix tilde character display 2021-01-14 15:59:28 -05:00
Niels Lohmann 14be8c69fe
💰 add sponsor 2021-01-11 08:00:49 +01:00
Niels Lohmann 085d497bf7
📄 update copyright year 2021-01-03 20:28:06 +01:00
Niels Lohmann 1587acdb1d
📝 adjust wording 2020-12-31 14:34:37 +01:00
Niels Lohmann 581f92b601
Merge branch 'develop' of https://github.com/nlohmann/json into issue2324 2020-12-30 20:23:07 +01:00
Niels Lohmann 47c2004f7f
Merge branch 'develop' of https://github.com/nlohmann/json into develop 2020-12-12 14:10:05 +01:00
Niels Lohmann fc4040ce9d
🔨 clean up CI 2020-12-12 14:09:50 +01:00
leozz37 b273f28dae 📝 add CPM.Cmake example 2020-09-26 19:16:03 -03:00
Niels Lohmann fd7a9f6007
💰 add sponsor 2020-09-23 19:55:03 +02:00
Niels Lohmann 1bcabd9e83
📝 fix URLs to documentation 2020-09-02 22:25:32 +02:00
Niels Lohmann 1047d09b2a
✅ annotate non-reproducible tests #2324 2020-08-30 13:23:34 +02:00
Niels Lohmann d9843fc9fc
📝 add note for Intel compilers #2346 2020-08-29 12:46:47 +02:00
I 2d3fe9d135 fix typo 2020-07-28 21:54:53 +09:00
Niels Lohmann 84a899f511
👥 update list of contributors 2020-07-26 14:54:51 +02:00
Niels Lohmann 7a4841a42a
📝 add binary() function to SAX documentation 2020-07-26 14:40:46 +02:00
Niels Lohmann 27232455c8
📝 update documentation 2020-07-23 14:17:02 +02:00
Thomas Braun 25a59b59f2 Github Actions: Add ClangCL on Windows 
MS Visual Studio 2019 has builtin support for other compiler toolsets [1].

This commit adds support for compiling using LLVM/Clang 10 using Visual
Studio.

ClangCL pretends to be MSVC so the usual MSVC flags apply, see also [2].
For detecting if ClangCL is used, newer cmake verisons (>= 3.15) have
builtin support using CMAKE_CXX_COMPILER_FRONTEND_VARIANT [3], for older
ones a workaround is available using CMAKE_CXX_SIMULATE_ID [4].

[1]: https://devblogs.microsoft.com/cppblog/clang-llvm-support-in-visual-studio/
[2]: https://clang.llvm.org/docs/UsersManual.html#clang-cl
[3]: https://stackoverflow.com/a/10055571
[4]: 4fe34b2d29
 2020-07-14 16:02:44 +02:00
Thomas Braun 6d7f8b3793 README.md: Remove trailing whitespace 2020-07-14 15:36:42 +02:00
Niels Lohmann 938b867450
📝 add Xcode 12 to CI list 2020-07-12 21:45:00 +02:00
Niels Lohmann cf741313b3
📝 add Clang on Windows to CI list 2020-07-12 15:31:17 +02:00
Niels Lohmann 9c21285133
Merge branch 'develop' of https://github.com/nlohmann/json into issue2179 
 Conflicts:
	single_include/nlohmann/json.hpp
 2020-07-11 13:20:16 +02:00
gatopeich 0eb7b0a991
Update README.md per review comments 
Co-authored-by: Niels Lohmann <niels.lohmann@gmail.com>
 2020-07-09 20:47:19 +01:00
Niels Lohmann 75d5d05993
Merge pull request #2253 from ericonr/pkgconf 
Add pkg-config file
 2020-07-09 20:42:42 +02:00
Érico Rolim 251fce819c README: add explanation on how to use pkg-config. 2020-07-09 03:59:53 -03:00
Niels Lohmann 99fc6b16ab
Merge branch 'develop' of https://github.com/nlohmann/json into issue2239 2020-07-06 12:52:59 +02:00
Niels Lohmann efcc826ecb
🚨 fix warning 2020-07-06 12:37:39 +02:00
Niels Lohmann 98b1c6d302
🚩 use JSON_ASSERT(x) instead of assert(x) 2020-07-06 12:22:31 +02:00
Niels Lohmann eb7376bb13
Merge pull request #2225 from nlohmann/issue2175 
Simplify conversion from/to custom types
 2020-06-29 14:41:09 +02:00
Niels Lohmann 470f7c0c68
📝 add documentation 2020-06-29 13:43:06 +02:00
gatopeich ddf0a45abb Use AllocatorType<ObjectType::value_type>, 
instead of hard-coding it for std::map's value_type
 2020-06-22 18:35:46 +01:00
Niels Lohmann 65e8ee985a
🔨 clean up 2020-06-22 08:59:03 +02:00
Niels Lohmann 24992003d9
📝 add notes from #2189 2020-06-20 09:55:11 +02:00
Niels Lohmann 1ecb7884d1
👥 update contributor list 2020-06-14 15:22:08 +02:00
Niels Lohmann 7444c7fa25
Merge pull request #2145 from FrancoisChabot/1813-user-input 
Fix Issue#1813: user defined input adapters
 2020-06-05 14:30:39 +02:00
Niels Lohmann 9212590764
👥 update contributor list 2020-06-03 13:56:01 +02:00
Niels Lohmann c24218afe8
Merge remote-tracking branch 'origin/develop' into develop 2020-06-03 13:38:15 +02:00
Niels Lohmann 2ad847f21b
🔨 fix doxygen link 2020-06-03 12:30:42 +02:00
Niels Lohmann fdf5a63dfd
🔨 fix Doxygen link 2020-06-03 12:30:10 +02:00
TotalCaesar659 0aa13599f0
Update URLs to HTTPS 2020-05-30 06:02:25 +03:00
Francois Chabot 0da131d717 minor readme correction 2020-05-28 17:12:26 -04:00
Francois Chabot 248f310215 cleaned up custom iterator example 2020-05-28 10:14:55 -04:00
Niels Lohmann 23c8ab95da
👥 update contributor list 2020-05-28 14:24:08 +02:00
Niels Lohmann 5ff4d7b7ff
Merge branch 'develop' of https://github.com/nlohmann/json into develop 2020-05-28 12:54:13 +02:00
Francois Chabot d3caf93ab0
Merge branch 'develop' into 1813-user-input 2020-05-28 03:40:34 -04:00
Francois Chabot 3a91a05db6 added custom input to readme 2020-05-28 03:13:39 -04:00
Quentin Barbarat e44418ea26
readme: fix typo in CMake FetchContent example 2020-05-27 13:51:13 +02:00
Niels Lohmann 325e8ab8ab
🔧 explicitly switch on tests in CI 2020-05-27 13:22:14 +02:00
Niels Lohmann ed5c28d00c
👥 update contributor list 2020-05-27 13:07:24 +02:00
Niels Lohmann 27fe50dc92
📝 add example for contains #2133 
Closes #2133.
 2020-05-26 12:46:04 +02:00
Antony Kellermann 49000cd77d Update documentation to reflect addition of Arch Linux CI testing. 2020-05-25 20:46:39 -04:00
Niels Lohmann 5dec7166ea
Merge branches 'binary_type' and 'develop' of https://github.com/nlohmann/json into binary_type 2020-05-18 09:13:22 +02:00
Niels Lohmann 16d78a82e0
👷 add link to GitHub workflows 2020-05-18 09:12:18 +02:00
Niels Lohmann 904642f261
♻️ rename internal_binary_t with binary_t 2020-05-17 22:50:27 +02:00
Niels Lohmann fc267af909
📝 update CI list 2020-05-14 17:53:00 +02:00
Niels Lohmann 33ae93beed
📝 update CI list 2020-05-14 07:55:01 +02:00
Niels Lohmann ec68bb3387
📝 update CI list 2020-05-13 20:18:56 +02:00
Niels Lohmann 6778ad8b0a
📝 update year 2020-05-12 22:26:55 +02:00
Niels Lohmann 7dbe5cf904
📝 update badges 2020-05-12 21:43:33 +02:00
Niels Lohmann a3a803a389
📝 add FOSSA status badge 2020-05-10 13:49:26 +02:00
Niels Lohmann a50a14088c
Merge pull request #2081 from nlohmann/external_test_data 
Use external test data
 2020-05-04 20:58:02 +02:00
Niels Lohmann 2f0d37d7d2
🔥 remove fastcov 2020-05-02 23:48:11 +02:00
Niels Lohmann 9c0c58d948
🔥 remove Doozer CI 2020-05-02 23:41:28 +02:00
ArthurSonzogni f26689e006 Fix README.md 
About pull request:
https://github.com/nlohmann/json/pull/2074

An error has been introduced by accepting the suggestions:
4be4a038cc

One was about removing ~~~, but it was meant to be replaced by ``` in
reality. This caused the README.md to be slightly broken.
 2020-05-01 13:55:24 +02:00
Niels Lohmann 798dbb5c19
📝 add detail 2020-05-01 13:19:49 +02:00
Arthur Sonzogni 4be4a038cc
Apply suggestions from code review 
Co-Authored-By: Niels Lohmann <niels.lohmann@gmail.com>
 2020-04-29 21:08:39 +02:00
ArthurSonzogni c331706644 Add CMake fetchcontent documentation and tests 
Github issue:
https://github.com/nlohmann/json/issues/2073

nlohmann::json documents 2 way of depending on it using CMake
1) Copy-paste the project/source into your own project.
2) Install nlohman::json and then use find_package.

(1) pollutes your git repository, (2) requires everyone to install the
dependencies themselves.

Since 2018, CMake provide some kind of 'package manager' features using
[FetchContent](https://cmake.org/cmake/help/v3.17/module/FetchContent.html)
It gives the following:
~~~cmake
include(FetchContent)

FetchContent_Declare(json
  GIT_REPOSITORY https://github.com/nlohmann/json
  GIT_TAG v3.7.3)

FetchContent_GetProperties(json)
if(NOT json_POPULATED)
  FetchContent_Populate(json)
  add_subdirectory( ${json_SOURCE_DIR} ${json_BINARY_DIR} EXCLUDE_FROM_ALL)
endif()
~~~

Then declares the dependency in the target using it:
~~~cmake
target_link_library(my_project PRIVATE nlohmann_json::nlohmann_json
~~~

This patch updates the documentation and provides tests.
 2020-04-29 18:28:06 +02:00
Alexander Myasnikov b01bc05b2b
updated wandbox link 2020-04-23 13:32:42 +03:00
Evgenii Sopov d164a2bf09 Added wsjcpp.yml: C++ Source Package Manager 2020-04-11 16:30:04 +07:00
Niels Lohmann c6b298799a
👷 remove failing Travis workers 2020-04-07 09:09:44 +02:00
Niels Lohmann 554e8c7356
Merge pull request #2002 from alexandermyasnikov/develop 
fix error 'setw' is not a member of 'std' in Wandbox example
 2020-04-05 21:58:21 +02:00
Niels Lohmann 379ed1f67e
💰 add sponsor 2020-04-05 15:23:00 +02:00
Alexander Myasnikov 4df7dc04f6 fix error 'setw' is not a member of 'std' in Wandbox example 2020-03-21 18:34:40 +03:00
Niels Lohmann 19843b038c
Merge pull request #1933 from dota17/dota17-FAQ 
Update README.md : add a FAQ about memory release
 2020-03-19 11:25:47 +01:00
Niels Lohmann ebb5a4c09f
💰 add sponsor 2020-03-19 11:14:50 +01:00
chenguoping 2ccdfebaa7 fix typo 2020-03-14 18:10:55 +08:00
Alexander “weej” Jones 5fdb1d08aa
README: Fix string representation of dumped json 
As is it's confusing and inconsistent with the indented form right below. The backslash escapes make it confusing.
 2020-03-10 19:37:20 +00:00
Chen 42566c6bef
Update README.md 2020-02-17 15:40:52 +08:00
Chen 88097a250f
Update README.md : add a FAQ about memory release 2020-02-10 21:03:57 +08:00
Antoine Cœur 8d92ca865f Some typos 2020-02-02 17:29:37 +08:00
Niels Lohmann 6a6790ab68
Merge pull request #1917 from jothepro/update-links-to-hunter 
Readme: Updated links to hunter repo & docs
 2020-01-31 11:47:42 +01:00
Dave Lee f25a1287f9
Fix link to parse function in README 2020-01-29 14:19:00 -08:00
jothepro 0257533866
Updated links to hunter repo & docs 
hunter was recently passed over to a new maintainer, this is why the github url & the link to the documentation have changed.
 2020-01-29 22:33:59 +01:00
Joël Lamotte ab538ba523
Formatting 
(proper naming suggested by `build2`'s author)
 2020-01-21 17:49:23 +01:00
Joël Lamotte 708e107d8e
Adds instruction for using Build2's package manager 
I created a `nlohmann-json` package for `build2` (https://build2.org) that have been published on the central public repository https://cppget.org : https://cppget.org/nlohmann-json (at the moment you can see that there is only one version: 3.7.3).

The repository of the package code is there: https://github.com/build2-packaging/nlohmann-json and is owned by the build2 community now. (with build2 you can use either a repository like cppget.org or a git repository so both are useful to users for different use cases).

This patch just add the basic information as to how to use this library with build2.
 2020-01-20 14:50:15 +01:00
Paul Jurczak bc95563814
Update README.md 2020-01-18 14:25:03 -07:00
Niels Lohmann b568619c4a
💰 add sponsor section 2019-12-15 19:26:51 +01:00
Carlos Gomes Martinho ac9df48453
style: format readme 2019-12-01 10:23:24 +01:00
Carlos Gomes Martinho f44e8ac090
revert: adding conan badge 2019-12-01 10:22:48 +01:00
Carlos Gomes Martinho 134a5faa2b
docs: add central repository as conan source to readme 2019-11-29 13:49:53 +01:00
Konstantin Podsvirov f586bc014f README: Package in MSYS2 renamed to nlohmann-json 
This is done to correctly match with the
corresponding package in Archlinux.
 2019-11-23 05:02:20 +03:00
Niels Lohmann c0f52edbc3
📝 add badges 2019-11-22 21:17:31 +01:00
Niels Lohmann 3f044dad81
📝 add Xocde 11.2.1 to CI list 2019-11-22 08:00:41 +01:00
Niels Lohmann 0f6a58eeaf
👥 update contributors 2019-11-06 17:35:04 +01:00
Niels Lohmann 3790bd9ae0
👷 add Xcode 10.2 2019-11-04 06:22:39 +01:00
Niels Lohmann e779714dd8
👷 add Xcode 10.2 2019-11-03 20:45:21 +01:00
Niels Lohmann 0db1692f45
👥 update contributors 2019-11-02 10:24:06 +01:00
Niels Lohmann 1307862b1d
Merge pull request #1694 from eli-schwartz/release-include-meson 
release: add singleinclude and meson.build to include.zip
 2019-11-02 09:28:51 +01:00
Niels Lohmann f7e7a62358
📝 add comment on JSON_THROW_USER, JSON_TRY_USER, and JSON_CATCH_USER 2019-10-23 20:58:06 +02:00
Eli Schwartz f4332d4097
README: describe how to use json as a meson subproject 
Also call out to the guidelines for using pkg-config dependencies first,
and reference it for other build systems as well.

Although the possibility of installing with a pkg-config file is
somewhat hidden away in the meson docs, it's been deemed less invasive
due to not distracting away from cmake. So it will have to do.
 2019-10-17 15:38:06 -04:00