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 |
|