wt/json
1
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2026-10-01 05:23:47 +07:00
Code Issues Packages Projects Releases Wiki Activity
3,845 Commits 82 Branches 57 Tags
9d726c25d5b6accabbe70598df644aed809db957
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Niels Lohmann 9d726c25d5 ♻️ remove "#define private public" 2020-08-12 13:30:06 +02:00
Niels Lohmann dd8cb2acc1 🚨 remove -Wimplicit-fallthrough warning #2348 2020-08-10 20:48:39 +02:00
Niels Lohmann 4080d0b1a4 ✅ add test to compile without exceptions 2020-08-10 09:48:11 +02:00
Niels Lohmann 1b28a58280 Merge remote-tracking branch 'origin/develop' into develop 2020-08-10 09:24:25 +02:00
Niels Lohmann 824d55bf26 📝 fix documentation #1668 2020-08-10 09:24:11 +02:00
Niels Lohmann db78ac1d77 Merge branch 'release/3.9.1' into develop 2020-08-06 13:49:29 +02:00
Niels Lohmann b3e5cb7f20 🔖 set version to 3.9.1 2020-08-06 13:45:29 +02:00
Niels Lohmann 0326e4e2a6 🚨 fix fallthrough warning 2020-07-31 19:24:03 +02:00
Niels Lohmann 3888b1642a 🐛 fix lexer to properly cope with repeated comments #2330 2020-07-31 18:59:22 +02:00
Niels Lohmann 501ad6fc59 📝 fix name of Homebrew formula #2326 2020-07-30 13:31:00 +02:00
Niels Lohmann 2326abc547 ♻️ split regression tests 2020-07-30 12:13:05 +02:00
Niels Lohmann f13af83a94 🐛 add more functions from std::map to nlohmann::ordered_map 2020-07-28 21:47:06 +02:00
Niels Lohmann e590604822 🐛 fix a bug due to missing overloads in ordered_map container 2020-07-28 14:20:31 +02:00
Niels Lohmann d34771cafc Merge branch 'release/3.9.0' into develop 2020-07-27 15:54:39 +02:00
Niels Lohmann e110667d21 🔖 set version to 3.9.0 2020-07-27 15:48:09 +02:00
Niels Lohmann c006fc9bec 📝 add more documentation 2020-07-27 14:07:13 +02:00
Niels Lohmann 84c0c76849 🚧 add Clang-Tidy configuration 2020-07-27 09:15:57 +02:00
Niels Lohmann 2f05f5175c 🚧 add Clang-Tidy configuration 2020-07-26 22:38:14 +02:00
Niels Lohmann 1b06184f22 👥 update list of contributors 2020-07-26 20:50:04 +02: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 bbcdf18ba5 🚚 move test utils header file 2020-07-26 14:07:34 +02:00
Niels Lohmann e22cbacc41 🚨 fix warning 2020-07-26 12:12:17 +02:00
Niels Lohmann a34070d36a ✅ fix test for meta() function 2020-07-25 22:28:14 +02:00
Niels Lohmann 9c75c7eace 🔧 clean generated XML files 2020-07-25 22:04:42 +02:00
Niels Lohmann 7bd6242f04 📝 add more documentation 2020-07-25 22:00:28 +02:00
Niels Lohmann 1816aae862 Merge branch 'develop' of https://github.com/nlohmann/json into docs 2020-07-25 21:48:51 +02:00
Niels Lohmann 980f8c6f61 🔀 merge develop branch 2020-07-25 21:45:47 +02:00
Niels Lohmann 42f8708940 Merge branch 'develop' of https://github.com/nlohmann/json into issue2286 
 Conflicts:
	single_include/nlohmann/json.hpp
 2020-07-25 21:44:58 +02:00
Niels Lohmann fad14aabe7 📝 update output of meta function 2020-07-25 14:41:06 +02:00
Niels Lohmann 6e5be17b62 📝 add more documentation 2020-07-25 14:40:50 +02:00
Niels Lohmann 62f98b7537 Merge branch 'develop' of https://github.com/nlohmann/json into docs 2020-07-25 11:20:13 +02:00
Niels Lohmann 58167173a2 📝 add more documentation 2020-07-24 15:25:53 +02:00
Niels Lohmann d8d499ce9b 📝 add more documentation 2020-07-24 14:35:52 +02:00
Niels Lohmann 480ad529e3 🐛 fix bug in CBOR tag handling 2020-07-24 14:18:39 +02:00
Niels Lohmann a84370c61f 📝 add more documentation 2020-07-24 14:04:58 +02:00
Niels Lohmann 33662417c1 ✅ improve coverage 2020-07-24 09:32:03 +02:00
Niels Lohmann 3c7dc635e7 🙈 extend ignore list 2020-07-23 14:19:57 +02:00
Niels Lohmann 27232455c8 📝 update documentation 2020-07-23 14:17:02 +02:00
Niels Lohmann 59cb7674be 📝 update documentation 2020-07-23 14:15:20 +02:00
Niels Lohmann 0cd120f7e1 🚨 fix UBSAN warning 2020-07-23 14:06:09 +02:00
Niels Lohmann bba57cc4af 🚨 fix UBSAN warning 2020-07-23 14:02:49 +02:00
Niels Lohmann e571c67c0d 🚨 fix implicit conversion warning when opening binary file 2020-07-23 14:02:12 +02:00
Niels Lohmann fb22233f34 🔊 add message if implicit conversions are switched off 2020-07-23 13:11:48 +02:00
Niels Lohmann f9b71afebf 🚚 unify cmake build dir names 2020-07-23 13:02:53 +02:00
Niels Lohmann 8159091d8f 🔀 rename variable to avoid shadowing 2020-07-23 12:58:09 +02:00
Niels Lohmann 230dcfb7a3 🚨 add prefix to avoid shadowing 2020-07-23 12:57:52 +02:00
Niels Lohmann b315fe484a 🔀 merge develop branch 2020-07-23 12:30:26 +02:00
Niels Lohmann a33c3fdf25 Merge branch 'develop' of https://github.com/nlohmann/json into issue2286 
 Conflicts:
	single_include/nlohmann/json.hpp
 2020-07-23 12:30:07 +02:00
Niels Lohmann 88122467bd ♻️ pull code into function 2020-07-23 12:16:18 +02:00
Niels Lohmann a6d112ffbf ✅ add regression test for #2281 2020-07-22 13:39:40 +02:00
Niels Lohmann 2301bd1177 ✅ add regression test for #2281 2020-07-22 13:24:07 +02:00
Niels Lohmann c4356c68e0 ✅ add regression test for #2281 2020-07-22 12:38:39 +02:00
Niels Lohmann 4d63252c6c ✅ add regression test for #2281 2020-07-22 12:23:58 +02:00
Niels Lohmann a7c4c84d68 ✅ add regression test for #2281 2020-07-22 12:03:37 +02:00
Niels Lohmann 6bd38a2cb9 👷 merge Gitlab actions 2020-07-22 09:02:55 +02:00
Niels Lohmann 8b14c9b305 🚨 fix warnings 2020-07-21 23:00:56 +02:00
Niels Lohmann 3bb43ecd51 🔀 merge develop branch 2020-07-21 22:02:14 +02:00
Niels Lohmann 3249a4d821 Merge branch 'develop' of https://github.com/nlohmann/json into issue2286 
 Conflicts:
	single_include/nlohmann/json.hpp
 2020-07-21 22:01:32 +02:00
Niels Lohmann 96e9f66025 🔇 remove debug output 2020-07-21 22:01:15 +02:00
Niels Lohmann 8046754c15 🔊 add debug output to tests 2020-07-21 12:44:38 +02:00
Niels Lohmann b1903fff1f 💚 fix build 2020-07-21 09:09:30 +02:00
Niels Lohmann 1339d6b683 🐛 add missing EOF check 2020-07-20 22:40:28 +02:00
Niels Lohmann a9117828e1 🚨 fix warnings 2020-07-20 22:38:00 +02:00
Niels Lohmann 4a5277d09d 📝 update documentation 2020-07-20 14:11:43 +02:00
Niels Lohmann 8aa6da61dc 🚧 support for UBJSON high-precision numbers #2286 2020-07-20 13:57:19 +02:00
Niels Lohmann 7360e09830 🚧 support for UBJSON high-precision numbers #2286 2020-07-20 13:12:20 +02:00
Niels Lohmann 7cf2fe149c 🚧 support for UBJSON high-precision numbers #2286 2020-07-20 09:42:37 +02:00
Niels Lohmann 7fc4b2901a 🚸 add static assertion for missing binary function in SAX interface 2020-07-17 20:41:11 +02:00
Niels Lohmann 2fd57d3ed1 ✅ add test for target_include_directories #1818 2020-07-17 14:26:22 +02:00
Niels Lohmann d047b3d495 🚨 remove linter warning 2020-07-16 14:45:39 +02:00
Niels Lohmann 26196f25f6 🔥 remove test Makefile targets (all handled by CMake) 2020-07-16 13:38:25 +02:00
Niels Lohmann 3d60befde3 🔧 adjust analysis targets 2020-07-16 12:14:06 +02:00
Niels Lohmann 7f6ea47bdb 🔧 adjust analysis targets 2020-07-16 09:44:07 +02:00
Niels Lohmann 4c59d6aaef 🔥 remove leftover 2020-07-16 09:43:35 +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
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 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 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 cbafed3494 ⬇️ require CMake 3.1 2020-07-10 12:53:48 +02:00
Niels Lohmann d740622f96 📝 add documentation for macros 2020-07-09 13:23:33 +02:00
Niels Lohmann f774a32d2b ✅ fix test 2020-07-08 14:47:22 +02:00