Commit Graph

652 Commits

Author SHA1 Message Date
Niels Lohmann
3212700eb0
👌 fix code according to review comments 2021-07-22 13:24:23 +02:00
Niels Lohmann
1bd8a10225
👌 fix code according to review comments 2021-07-22 12:38:48 +02:00
Niels Lohmann
575c28ca4c
Merge branch 'develop' of https://github.com/nlohmann/json into string_view 2021-07-22 09:29:17 +02:00
Niels Lohmann
7066ab128f
🎨 reindent code 2021-07-19 16:56:28 +02:00
Niels Lohmann
b7cc47089f
avoid string in case of empty objects 2021-07-16 09:27:18 +02:00
Niels Lohmann
8ba8c43707
Merge branch 'develop' of https://github.com/nlohmann/json into string_view 2021-07-16 08:45:53 +02:00
Niels Lohmann
80cb607e8c
🚧 fix return type 2021-07-16 08:08:26 +02:00
Niels Lohmann
c89e23c69b
Merge pull request #2874 from nlohmann/issue2572
Fix truncation warning
2021-07-16 07:54:48 +02:00
Niels Lohmann
953dcfb611
🚨 fix warning #2572 2021-07-15 22:00:16 +02:00
Niels Lohmann
3e4723a49f
🔨 remove noexcept annotation 2021-07-15 21:49:09 +02:00
Niels Lohmann
ecaac22656
💡 add comment to describe j.m_value.destroy(j.m_type) calls 2021-07-15 20:34:50 +02:00
Niels Lohmann
f6863e062c
🐛 fix leak for all types 2021-07-15 20:32:37 +02:00
Niels Lohmann
0011cd1b72
🐛 fix leak for strings 2021-07-15 13:12:21 +02:00
Niels Lohmann
0f8666ecdc
🐛 fix leak for strings 2021-07-15 13:03:20 +02:00
Niels Lohmann
6cbdc83994
🐛 fix leak for strings 2021-07-15 12:47:15 +02:00
Niels Lohmann
149ded856f
♻️ simplify destroy() function for primitive types 2021-07-15 12:46:48 +02:00
Niels Lohmann
a711e1f5a7
🚨 fix warnings 2021-07-13 15:37:57 +02:00
Niels Lohmann
3bb9467073
♻️ move capacity check to set_parent function 2021-07-13 15:27:27 +02:00
Niels Lohmann
bc7e8faa4f
🔥 remove duplicated line 2021-07-12 19:21:07 +02:00
Niels Lohmann
b0730f29cf
🐛 fix logics 2021-07-12 15:24:06 +02:00
Niels Lohmann
d40e98ecef
🐛 fix assertion failure #2838 2021-07-12 13:38:28 +02:00
David Pfahler
aa849a2275 Merge branch 'nlohmann:develop' into without-io 2021-06-14 08:22:49 +02:00
David Pfahler
e939b59683 fixed amalgation file for #2728 2021-05-31 14:27:23 +02:00
Niels Lohmann
b27938aca3
👌 apply review comments 2021-05-04 12:47:20 +02:00
Niels Lohmann
aaef7cd2f8
👌 apply review comments 2021-05-04 12:35:07 +02:00
Niels Lohmann
b08139ea4b
♻️ replace EOF with std::char_traits<char>::eof() 2021-05-04 10:22:34 +02:00
Niels Lohmann
eb0f8d734c
👌 apply review comments 2021-05-03 20:42:28 +02:00
Niels Lohmann
08185548cc
🔀 merge develop 2021-05-03 20:13:22 +02:00
Niels Lohmann
d0ab2b86c3
📝 update documentation 2021-04-29 17:19:57 +02:00
Niels Lohmann
8a29a6ecf4
Merge pull request #2731 from theShmoo/custom-cpp-version
Fixes #2730
2021-04-29 09:55:16 +02:00
Niels Lohmann
cdfe865486
📝 add documentation for numbers 2021-04-28 20:33:05 +02:00
David Pfahler
d140a1c777 fixed amalgamation file 2021-04-26 08:39:24 +02:00
Niels Lohmann
a34e011e24
Merge pull request #2576 from AnthonyVH/non_default_constructable_stl_containers
Add support for deserialization of STL containers of non-default constructable types (fixes #2574).
2021-04-25 15:22:37 +02:00
David Pfahler
0a2de2f5b9 fixed amalgation file for #2728 2021-04-21 12:54:55 +02:00
David Pfahler
6b267e3cb1 fixed amalgation file for #2730 2021-04-21 12:53:58 +02:00
David Pfahler
38952643c5 generate amalgation to fix CI for #2730 2021-04-21 12:46:37 +02:00
raduteo
e8dbd7be86
Update json.hpp
Proposed fix for #2706
2021-04-09 09:35:58 -04:00
Niels Lohmann
ea4891fb5c
👌 implement some review comments 2021-03-31 10:42:08 +02:00
Niels Lohmann
02b36e928f
⚗️ add forgotten forward 2021-03-30 10:46:00 +02:00
Niels Lohmann
418fdbab62
⚗️ exclude iterators from KeyType 2021-03-30 10:14:26 +02:00
Niels Lohmann
69d74d4e3d
♻️ clean up 2021-03-30 08:41:44 +02:00
Niels Lohmann
0ff33d090b
👌 apply review comments 2021-03-29 22:32:54 +02:00
Niels Lohmann
5c1c79b61e
💚 fix build 2021-03-29 15:11:01 +02:00
Niels Lohmann
203b53d7cb
💡 update documentation 2021-03-29 13:23:09 +02:00
Niels Lohmann
268600e63b
👌 apply review comments 2021-03-29 12:18:33 +02:00
Niels Lohmann
d42f37a5f8
🚧 implement operator[] for string_view 2021-03-28 14:34:14 +02:00
Niels Lohmann
d01a6a4613
🚧 add overload for erase(std::string_view) 2021-03-26 13:33:22 +01:00
Niels Lohmann
16fb0cbb9d
Merge branch 'develop' of https://github.com/nlohmann/json into string_view 2021-03-26 12:10:23 +01:00
Niels Lohmann
2f2c75942b
💚 fix build 2021-03-25 13:31:11 +01:00
Niels Lohmann
5ea15c4419
♻️ unify types for object keys 2021-03-25 12:54:09 +01:00