j3d1/json
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
3700 commits 1 branch 0 tags 274 MiB
Commit graph

3700 commits

This branch
This branch
All branches
Author SHA1 Message Date
Niels Lohmann
548e7e54c9
Merge pull request #2273 from nlohmann/issue1968 
Add option to ignore CBOR tags
 2020-07-17 13:59:55 +02:00
Niels Lohmann
270f1ae482
Merge pull request #2269 from nlohmann/hash 
Hash function without allocation
 2020-07-17 13:57:47 +02:00
Niels Lohmann
23c97f4aa5
Merge pull request #2268 from t-b/feature/add-clang-cl 
Add ClangCL for MSVC
 2020-07-16 07:40:58 +02:00
Niels Lohmann
93cdf05928
✅ add tests 2020-07-15 14:23:22 +02:00
Niels Lohmann
01e196f6b6
Merge branch 'develop' of https://github.com/nlohmann/json into issue1968 2020-07-15 13:50:00 +02:00
Niels Lohmann
b821ed074f
💡 add documentation 2020-07-15 13:45:16 +02:00
Niels Lohmann
496ddd127c
💚 make test deterministic 2020-07-15 12:14:30 +02:00
Niels Lohmann
9449dfcc6a
💚 add test cases for hash 2020-07-15 09:27:01 +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
33b0bed7fe
💚 fix compilation 2020-07-14 14:34:55 +02:00
Niels Lohmann
5b229f4cce
⚡ hash function without allocation 2020-07-14 14:31:19 +02:00
Niels Lohmann
1a521cbd36
Merge pull request #2264 from t-b/feature/use-proper-SED-in-makefile 
Makefile: Always use SED variable
 2020-07-14 14:07:33 +02:00
Niels Lohmann
8921e5e5db
Merge pull request #2262 from nlohmann/more_ci 
Add Xcode 12 CI
 2020-07-13 21:04:57 +02:00
Thomas Braun
88adffdaba Makefile: Always use SED variable 
We need to have a proper sed, even on MacOSX. So let's use the variable
introduced in 191aa0fd (🔧 overworked maintaner targets,
2019-03-28) in more places.
 2020-07-13 14:44:40 +02:00
Niels Lohmann
938b867450
📝 add Xcode 12 to CI list 2020-07-12 21:45:00 +02:00
Niels Lohmann
3952739189
✨ add CBOR tag handler #1968 2020-07-12 16:51:43 +02:00
Niels Lohmann
a244531627
♻️ overwork Travis YAML 2020-07-12 15:33:16 +02:00
Niels Lohmann
cf741313b3
📝 add Clang on Windows to CI list 2020-07-12 15:31:17 +02:00
Niels Lohmann
e316f5c5b6
Merge pull request #2258 from nlohmann/issue2179 
Add ordered_json specialization with ordered object keys
 2020-07-12 13:11:23 +02:00
Niels Lohmann
486812904f
Merge pull request #2259 from nlohmann/clang_windows 
Make library work with Clang on Windows
 2020-07-12 13:09:35 +02:00
Niels Lohmann
4d28694756
♻️ replace further alternative operators 2020-07-11 19:28:58 +02:00
Niels Lohmann
738c83d6af
💚 add test for ordered_map 2020-07-11 19:24:32 +02:00
Niels Lohmann
8d295235a5
🔥 remove unused boolean_operators.hpp header 2020-07-11 19:20:44 +02:00
Niels Lohmann
6477b9b20a
♻️ replace further alternative operators 2020-07-11 14:09:06 +02:00
Niels Lohmann
7f923424b3
🔀 merge develop branch and resolve conflicts 2020-07-11 14:05:02 +02:00
Niels Lohmann
dc06f100be
Merge branch 'develop' of https://github.com/nlohmann/json into clang_windows 
 Conflicts:
	include/nlohmann/detail/input/binary_reader.hpp
	include/nlohmann/detail/input/json_sax.hpp
	include/nlohmann/detail/input/lexer.hpp
	include/nlohmann/detail/input/parser.hpp
	include/nlohmann/detail/json_pointer.hpp
	include/nlohmann/detail/output/serializer.hpp
	include/nlohmann/json.hpp
	single_include/nlohmann/json.hpp
 2020-07-11 14:04:40 +02:00
Niels Lohmann
889f269a6c
♻️ replace further alternative operators 2020-07-11 13:51:25 +02:00
Niels Lohmann
b2240f7508
🏁 remove failing code for Clang/Windows 2020-07-11 13:46:04 +02:00
Niels Lohmann
609a0046c4
♻️ replace further alternative operators 2020-07-11 13:39:14 +02:00
Niels Lohmann
3a80823ff8
🔀 merge develop branch and resolve conflicts 2020-07-11 13:21:13 +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
Niels Lohmann
5f146cb853
Merge pull request #2206 from gatopeich/issue2179 
Simple ordered_json that works on all supported compilers
 2020-07-11 13:15:40 +02:00
gatopeich
47d154dd49
Remove redundant comment 2020-07-11 00:34:12 +01:00
gatopeich
f9a1fec272
Remove redundant comment 2020-07-11 00:34:02 +01:00
Niels Lohmann
cbafed3494
⬇️ require CMake 3.1 2020-07-10 12:53:48 +02:00
gatopeich
f62b4626be Removing comment about AllocatorType per review request 2020-07-09 21:12:14 +01: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
Niels Lohmann
4c7bd014d9
Merge pull request #2242 from nlohmann/issue2239 
Make assert configurable via JSON_ASSERT
 2020-07-09 15:13:12 +02:00
Niels Lohmann
d740622f96
📝 add documentation for macros 2020-07-09 13:23:33 +02:00
Érico Rolim
251fce819c README: add explanation on how to use pkg-config. 2020-07-09 03:59:53 -03:00
Palmer Dabbelt
c7d18c1625 cmake: Generate and install a pkg-config file. 
The meson builds install a pkg-config file, but the cmake builds don't.
This adds a pkg-config file to the cmake builds that is functionally
equivalent to the one generated from meson.
 2020-07-09 03:59:53 -03:00
Niels Lohmann
0306525cdb
Merge pull request #2251 from nlohmann/fix_2181 
Fix regression from #2181
 2020-07-09 07:33:03 +02:00
Niels Lohmann
f774a32d2b
✅ fix test 2020-07-08 14:47:22 +02:00
Niels Lohmann
e3e9ccfc02
🚑 fix regression from #2181 2020-07-08 14:02:28 +02:00
Niels Lohmann
1b04092c5c
✅ fix test 2020-07-08 12:38:46 +02:00
Niels Lohmann
d019ddfcdb
👷 add code scanning 2020-07-08 12:25:53 +02:00
Niels Lohmann
28ef87370b
🚨 fix warning 2020-07-06 13:19:06 +02:00
Niels Lohmann
99fc6b16ab
Merge branch 'develop' of https://github.com/nlohmann/json into issue2239 2020-07-06 12:52:59 +02:00