1
0
mirror of https://github.com/nlohmann/json.git synced 2025-07-28 12:02:00 +03:00
Commit Graph

4336 Commits

Author SHA1 Message Date
095aae19fe Supress -Wfloat-equal on intended float comparisions 2021-08-03 08:58:38 +02:00
7c19aa2210 ♻️ overwork byte_container_with_subtype 2021-08-01 22:00:57 +02:00
eb488bb4d9 📝 add note for wstring handling 2021-08-01 20:54:02 +02:00
c3df4ffd5a 🚨 fix warning 2021-08-01 14:08:14 +02:00
5a1bc76f34 ⚗️ switch off exceptions 2021-08-01 13:34:55 +02:00
e7260f07f5 Merge branch 'develop' of https://github.com/nlohmann/json into issue2824 2021-08-01 13:07:43 +02:00
a54403290e 📄 add CITATION file 2021-08-01 12:42:59 +02:00
9ed027ac10 Merge pull request #2902 from nlohmann/issue2893
Fix useless-cast warnings
2021-07-31 20:42:55 +02:00
8676f6745e add regression test #2824 2021-07-30 21:18:25 +02:00
f4716a0d42 🚨 fix useless-cast warnings 2021-07-30 21:12:55 +02:00
9a459e1bd5 🚨 fix useless-cast warnings 2021-07-30 15:20:22 +02:00
c7822840eb add regression test #2824 2021-07-30 15:00:54 +02:00
7feb2c20cf 🚨 fix useless-cast warnings 2021-07-30 14:48:25 +02:00
2c030bac2c add regression test #2824 2021-07-30 14:41:06 +02:00
1c030cccf1 add regression test #2824 2021-07-29 15:23:21 +02:00
a563338039 Merge pull request #2825 from ldionne/ldionne-lazy
Properly constrain the basic_json conversion operator
2021-07-22 12:24:56 +02:00
19a5e12136 CMake cleanup (#2885)
* 🔥 clean CMake files and Makefile
* 💡 update documentation
2021-07-22 09:25:55 +02:00
eba82ecd62 Refactor Unicode tests (#2889)
* ♻️ split Unicode tests
2021-07-21 21:17:01 +02:00
b0e5965d71 Properly constrain the basic_json conversion operator
Fixes #2491
2021-07-19 11:16:27 -04:00
03270ef090 👥 update contributors 2021-07-19 16:57:15 +02:00
45016c4429 ⬆️ update Doxyfile 2021-07-19 16:56:43 +02:00
7066ab128f 🎨 reindent code 2021-07-19 16:56:28 +02:00
926fab47d0 📝 fix GIF examples #2457 2021-07-17 14:43:01 +02:00
a0863b8c20 📝 add support section 2021-07-17 13:44:54 +02:00
517aeec299 Merge remote-tracking branch 'origin/develop' into develop 2021-07-17 12:39:45 +02:00
8f0a880c89 Merge pull request #2879 from nlohmann/issue2598
Avoid string in case of empty CBOR objects
2021-07-17 12:38:33 +02:00
3db8903f29 📝 restructure README 2021-07-16 15:00:11 +02:00
fb1ee4f94b 📝 update documentation 2021-07-16 14:41:14 +02:00
835749efcc add test for JSON_SystemInclude flag 2021-07-16 12:34:15 +02:00
fb31616a61 Merge remote-tracking branch 'origin/develop' into develop 2021-07-16 12:27:53 +02:00
b2d21067d1 Merge pull request #2762 from jpl-mac/no.tidy.warnings.dev
Add a cmake option to use SYSTEM in target_include_directories
2021-07-16 12:06:26 +02:00
c65369acbe 👷 fix Codacity badge 2021-07-16 11:44:07 +02:00
f907f9502d Merge pull request #2875 from nlohmann/issue2592
Suppress C4127 warning in unit-json_pointer.cpp
2021-07-16 10:11:29 +02:00
b7cc47089f avoid string in case of empty objects 2021-07-16 09:27:18 +02:00
c89e23c69b Merge pull request #2874 from nlohmann/issue2572
Fix truncation warning
2021-07-16 07:54:48 +02:00
f883ddd1c2 Merge pull request #2872 from nlohmann/issue2865
Fix memory leak in to_json
2021-07-16 06:52:28 +02:00
92ec35735c Merge branch 'develop' of https://github.com/nlohmann/json into issue2592 2021-07-15 22:28:03 +02:00
953dcfb611 🚨 fix warning #2572 2021-07-15 22:00:16 +02:00
996ac1c017 Merge branch 'develop' of https://github.com/nlohmann/json into issue2572
 Conflicts:
	include/nlohmann/detail/output/serializer.hpp
	single_include/nlohmann/json.hpp
2021-07-15 21:57:52 +02:00
3e4723a49f 🔨 remove noexcept annotation 2021-07-15 21:49:09 +02:00
ecaac22656 💡 add comment to describe j.m_value.destroy(j.m_type) calls 2021-07-15 20:34:50 +02:00
f6863e062c 🐛 fix leak for all types 2021-07-15 20:32:37 +02:00
0011cd1b72 🐛 fix leak for strings 2021-07-15 13:12:21 +02:00
0f8666ecdc 🐛 fix leak for strings 2021-07-15 13:03:20 +02:00
c1298e69a6 🐛 fix leak for strings 2021-07-15 12:52:17 +02:00
6cbdc83994 🐛 fix leak for strings 2021-07-15 12:47:15 +02:00
149ded856f ♻️ simplify destroy() function for primitive types 2021-07-15 12:46:48 +02:00
db98073930 add regression test 2021-07-15 09:02:24 +02:00
c9c5c016a2 Merge pull request #2866 from nlohmann/issue2838 2021-07-14 12:04:37 +02:00
4e92a61784 Merge pull request #2795 from turintech/develop
Specified git branch for google benchmark fetch in benchmark test
2021-07-13 16:58:25 +02:00