starred/json
1
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2026-09-24 06:10:22 +01:00
Code Issues Packages Projects Releases 10 Wiki Activity
3,696 Commits 43 Branches 57 Tags
issue2228
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Niels Lohmann c13ecd5344 💚 add trait for 128 bit integers 2020-07-13 14:03:04 +02:00
Niels Lohmann 0f1f5052bf 💚 add trait for 128 bit integers 2020-07-13 13:46:56 +02:00
Niels Lohmann e3aace6dac 🔊 add test for type traits 2020-07-13 13:23:36 +02:00
Niels Lohmann 039c97694d 🔥 remove failing test 2020-07-13 12:51:39 +02:00
Niels Lohmann 23496a3abf 🔊 add test for type traits 2020-07-13 12:44:34 +02:00
Niels Lohmann bffa18b46e ♻️ replace alternative operator 2020-07-12 17:44:39 +02:00
Niels Lohmann de4933e093 🎨 fix format 2020-07-12 17:39:36 +02:00
Niels Lohmann aba37d001e Merge branch 'develop' of https://github.com/nlohmann/json into issue2228 2020-07-12 17:39:13 +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 b6d0a4ab30 Merge branch 'develop' of https://github.com/nlohmann/json into issue2228 2020-07-10 12:46:43 +02:00
Niels Lohmann 2c231f9567 💚 remove failing test 2020-07-10 12:46:31 +02:00
Niels Lohmann 7fbcae2679 🚨 fix a warning 2020-07-09 22:17:59 +02:00
Niels Lohmann 3aa4c0b827 ✅ add tests for number types 2020-07-09 22:07:07 +02:00
Niels Lohmann 612f326052 ♻️ add proper SFINAE for 64 bit check 2020-07-09 21:31:01 +02:00
Niels Lohmann 0c4e6aa2cd ♻️ move integer conversion out of scan_number 2020-07-09 14:21:39 +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
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 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
Niels Lohmann ba8174041e ✅ add test case for JSON_ASSERT 2020-07-06 12:52:48 +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 f59f4a2b61 💚 fix build 2020-06-30 19:55:40 +02:00
Niels Lohmann c7e079cc98 🚑 add specialization of get_to #2175 2020-06-30 14:26:52 +02:00
Niels Lohmann ad6eadeb70 📝 refine documentation of error_handler parameter 2020-06-30 13:59:43 +02:00
Niels Lohmann 470f7c0c68 📝 add documentation 2020-06-29 13:43:06 +02:00
Niels Lohmann d7a2956b24 🔀 merge from develop 2020-06-27 13:16:20 +02:00
Niels Lohmann ac3922c7aa Merge branch 'develop' of https://github.com/nlohmann/json into clang_windows 
 Conflicts:
	include/nlohmann/detail/input/binary_reader.hpp
	include/nlohmann/detail/input/input_adapters.hpp
	include/nlohmann/detail/input/lexer.hpp
	include/nlohmann/detail/output/binary_writer.hpp
	include/nlohmann/json.hpp
	single_include/nlohmann/json.hpp
 2020-06-27 13:14:48 +02:00
Niels Lohmann fa9f4040df 🔥 remove unused typedefs #2221 2020-06-27 13:07:02 +02:00
Niels Lohmann 5ba0f65c34 🔧 remove feature request template 2020-06-27 12:55:41 +02:00
Niels Lohmann aefa0b3e86 🔧 use Github discussions for questions 2020-06-27 12:54:42 +02:00
Niels Lohmann a9809f3381 🏁 revert change that breaks with MSVC 2020-06-22 23:02:28 +02:00
Niels Lohmann 8b3d2399a4 🚨 remove warnings 2020-06-22 22:32:21 +02:00
Niels Lohmann 65e8ee985a 🔨 clean up 2020-06-22 08:59:03 +02:00
Niels Lohmann e22ce45065 🚸 improve diagnostics 2020-06-21 13:28:00 +02:00
Niels Lohmann 139a0258cc Merge branch 'develop' of https://github.com/nlohmann/json into comments 2020-06-21 12:40:21 +02:00
Niels Lohmann 0fe9f23254 ✨ add macros from #2175 2020-06-20 14:11:37 +02:00
Niels Lohmann 6ee9e5f402 ⚗️ remove const from value type 2020-06-20 13:23:44 +02:00
Niels Lohmann 24992003d9 📝 add notes from #2189 2020-06-20 09:55:11 +02:00
Niels Lohmann e4675887a6 Merge branch 'develop' of https://github.com/nlohmann/json into issue2189 2020-06-20 09:47:12 +02:00
Niels Lohmann 4fd0d02b6f 🚧 toward an ordered_json type 2020-06-19 15:27:05 +02:00
Niels Lohmann b64002bbca ♻️ extract common code to function 2020-06-19 13:24:08 +02:00
Niels Lohmann 0585ecc56b ✅ add tests for comment skipping 2020-06-19 13:10:35 +02:00
Niels Lohmann cd115cbc33 ✅ update test suite 2020-06-18 12:50:32 +02:00
Niels Lohmann 74520d8bb0 🚧 extend API 2020-06-17 22:03:14 +02:00
Niels Lohmann 88a37010d6 🐛 serialize 32-bit floating-point numbers as float 32 in MessagePack (0xCA) #2196 2020-06-17 21:14:23 +02:00
Niels Lohmann e9bfcf7255 ⚡ improve comment parsing 2020-06-17 14:59:47 +02:00
Niels Lohmann e86b3fae98 🔧 add label to tests that require a git checkout 2020-06-17 12:35:59 +02:00
Niels Lohmann 4d96f4cf6a 🔧 overwork CMake files 2020-06-16 20:23:01 +02:00
Niels Lohmann f4c4bab600 ✨ add option JSON_TestDataDirectory to set path with test data #2189 2020-06-16 12:55:36 +02:00
Niels Lohmann b53c6e2f81 ✨ ignore comments 2020-06-16 12:28:59 +02:00
Niels Lohmann e7452d8778 Merge branch 'release/3.8.0' into develop 2020-06-14 17:44:18 +02:00
Niels Lohmann 5f862710fe 🔖 set version to 3.8.0 2020-06-14 17:16:45 +02:00
Niels Lohmann 1ecb7884d1 👥 update contributor list 2020-06-14 15:22:08 +02:00
Niels Lohmann 27f5a6e827 🙈 ignore __pycache__ directory 2020-06-09 16:59:03 +02:00
Niels Lohmann 262d9cc67d 🚨 fix a maybe-uninitialized warning 2020-06-09 16:57:06 +02:00
Niels Lohmann ae04426c85 🏁 fix for MSVC (see https://github.com/nlohmann/json/pull/2178#issuecomment-640622532) 2020-06-08 20:07:15 +02:00
Niels Lohmann 2cf16625ac ✅ add test for character types 2020-06-07 22:49:39 +02:00
Niels Lohmann d4bc0c39af ✅ add test for character types 2020-06-07 22:47:54 +02:00
Niels Lohmann 6d73126ea9 🚨 fix warnings 2020-06-07 22:47:25 +02:00
Niels Lohmann 28048d8207 Merge branches 'develop' and 'mkdocs' of https://github.com/nlohmann/json into develop 
 Conflicts:
	doc/examples/swap__binary_t.link
 2020-06-07 21:02:08 +02:00
Niels Lohmann eca5490b94 📝 add example link for swap function 2020-06-07 21:01:13 +02:00
Niels Lohmann 8c1d26e186 📝 add documentation and example for accept function 2020-06-07 20:59:43 +02:00
Niels Lohmann 907803189b 🏁 fix MSVC 2015 compilation 2020-06-07 12:51:33 +02:00
Niels Lohmann e6a7e7a16a 🚑 hotfix for #2177 2020-06-07 12:41:36 +02:00
Niels Lohmann bf2e714e96 🚨 fix warnings 2020-06-06 14:30:17 +02:00
Niels Lohmann dd7e25927f 🚨 fix warning 2020-06-05 08:27:15 +02:00
Niels Lohmann 2df5f107a9 📝 add page on parsing and exceptions 2020-06-04 14:01:57 +02:00
Niels Lohmann 32bda1a7af Merge branches 'develop' and 'mkdocs' of https://github.com/nlohmann/json into mkdocs 2020-06-04 13:07:20 +02:00
Niels Lohmann 24e8562664 👷 remove Clang 8 2020-06-04 12:48:03 +02:00
Niels Lohmann a53e3a5443 👷 try Clang 8 2020-06-04 12:34:56 +02:00
Niels Lohmann dc323314d5 👷 try Clang 10 2020-06-04 12:29:53 +02:00
Niels Lohmann 402c34c526 👷 try Clang 10 2020-06-04 12:27:37 +02:00
Niels Lohmann 65c4b07451 🎨 replace alternative operators (and, not, or) 2020-06-03 21:22:07 +02:00
Niels Lohmann 0498202a03 🎨 replace alternative operators (and, not, or) 2020-06-03 14:20:36 +02:00
Niels Lohmann 4f04ea1bef Merge branches 'clang_windows' and 'develop' of https://github.com/nlohmann/json into clang_windows 2020-06-03 14:01:18 +02:00
Niels Lohmann 9212590764 👥 update contributor list 2020-06-03 13:56:01 +02:00
Niels Lohmann 9708b1e9c3 🔥 remove Code Inspector 2020-06-03 13:49:46 +02:00
Niels Lohmann 68fd772fdf 👷 add Code Inspector via GitHub Action 2020-06-03 13:44:33 +02:00
Niels Lohmann 9bc2a7fa25 👷 add Code Inspector via GitHub Action 2020-06-03 13:39:56 +02:00
Niels Lohmann c24218afe8 Merge remote-tracking branch 'origin/develop' into develop 2020-06-03 13:38:15 +02:00
Niels Lohmann 5ea205f570 👷 install clang 2020-05-30 18:17:54 +02:00
Niels Lohmann 5f10d5d156 👷 install clang 2020-05-30 18:15:13 +02:00
Niels Lohmann 7c0c522b96 👷 install clang 2020-05-30 18:11:54 +02:00
Niels Lohmann 522ec5d7bd 👷 install clang 2020-05-30 18:06:52 +02:00
Niels Lohmann 7e5c2a480a 👷 install clang 2020-05-30 18:04:07 +02:00