1
0
mirror of https://github.com/nlohmann/json.git synced 2025-07-31 10:24:23 +03:00
Commit Graph

349 Commits

Author SHA1 Message Date
fbf6df63d9 Enable member function calls in trailing return decltype expressions for older compilers. 2021-01-13 00:12:51 +01:00
6ef1614fa9 Refactor json::get() to use priority_tag. 2021-01-12 18:28:47 +01:00
ff57bdcc8b 🐛 fix invariants 2021-01-10 22:40:50 +01:00
9d0150c234 ♻️ simplify code 2021-01-10 15:04:14 +01:00
a83404525e 🚨 fix warnings 2021-01-10 13:39:36 +01:00
e160749003 ♻️ move diagnostic code in header 2021-01-09 19:21:18 +01:00
43cd5c8a4d 👌 fix constructor 2021-01-08 18:00:23 +01:00
d4a91b7445 👌 clean operator[] 2021-01-08 11:29:28 +01:00
e4af1ddb18 👌 fix operator[] 2021-01-08 11:21:41 +01:00
04a0a07159 👌 fix move constructor and move assignment 2021-01-08 11:21:03 +01:00
0617bd248d 👌 fix operator[] 2021-01-08 11:10:24 +01:00
ddc3bb1992 👌 remove unnecessary assignment from destructor 2021-01-08 11:09:58 +01:00
7cdf34b21e Merge branch 'develop' of https://github.com/nlohmann/json into diagnostics 2021-01-08 10:20:34 +01:00
085d497bf7 📄 update copyright year 2021-01-03 20:28:06 +01:00
294fa343d5 🐛 fix bug in move constructor 2021-01-03 20:06:32 +01:00
ec0b1798bc 🚧 implement more parent relations 2021-01-02 21:36:11 +01:00
7323a8eb4e 🚧 add tests 2021-01-02 16:13:04 +01:00
c6e7fa21ed 🚧 fix preprocessor check 2021-01-02 13:58:05 +01:00
7b047861b0 🚧 add diagnostics to exceptions 2021-01-02 13:44:41 +01:00
a4d491e22d 🚧 better diagnostics 2021-01-01 17:23:10 +01:00
cd7acc1dc5 Include <string_view> in "nlohmann/json.hpp" when C++17 is used 2020-12-20 19:40:36 +05:00
5cc5285fe8 🚨 fix shadowing warning 2020-12-15 22:15:36 +01:00
9d726c25d5 ♻️ remove "#define private public" 2020-08-12 13:30:06 +02:00
824d55bf26 📝 fix documentation #1668 2020-08-10 09:24:11 +02:00
b3e5cb7f20 🔖 set version to 3.9.1 2020-08-06 13:45:29 +02:00
e110667d21 🔖 set version to 3.9.0 2020-07-27 15:48:09 +02:00
67ed63b196 Merge pull request #2312 from nlohmann/docs
Update documentation
2020-07-26 10:06:01 +02:00
fad14aabe7 📝 update output of meta function 2020-07-25 14:41:06 +02:00
d8d499ce9b 📝 add more documentation 2020-07-24 14:35:52 +02:00
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
a048b72fe1 Merge pull request #1559 from theodelrieu/feat/explicit_conversion_operator
Feat/explicit conversion operator
2020-07-23 08:52:51 +02:00
74b446f5fd add a switch to enable implicit conversions (defaults to true)
wrap implicit conversions tests around the JSON_USE_IMPLICIT_CONVERSIONS
macro
2020-07-22 10:49:01 +02:00
8b14c9b305 🚨 fix warnings 2020-07-21 23:00:56 +02:00
a9117828e1 🚨 fix warnings 2020-07-20 22:38:00 +02:00
4a5277d09d 📝 update documentation 2020-07-20 14:11:43 +02:00
7360e09830 🚧 support for UBJSON high-precision numbers #2286 2020-07-20 13:12:20 +02:00
548e7e54c9 Merge pull request #2273 from nlohmann/issue1968
Add option to ignore CBOR tags
2020-07-17 13:59:55 +02:00
5b229f4cce hash function without allocation 2020-07-14 14:31:19 +02:00
3952739189 add CBOR tag handler #1968 2020-07-12 16:51:43 +02:00
e316f5c5b6 Merge pull request #2258 from nlohmann/issue2179
Add ordered_json specialization with ordered object keys
2020-07-12 13:11:23 +02:00
8d295235a5 🔥 remove unused boolean_operators.hpp header 2020-07-11 19:20:44 +02:00
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
889f269a6c ♻️ replace further alternative operators 2020-07-11 13:51:25 +02:00
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
4c7bd014d9 Merge pull request #2242 from nlohmann/issue2239
Make assert configurable via JSON_ASSERT
2020-07-09 15:13:12 +02:00
e3e9ccfc02 🚑 fix regression from #2181 2020-07-08 14:02:28 +02:00
98b1c6d302 🚩 use JSON_ASSERT(x) instead of assert(x) 2020-07-06 12:22:31 +02:00
b04dc055b2 Merge pull request #2233 from nlohmann/issue2175
Add specialization of get_to
2020-07-06 07:58:52 +02:00
c7e079cc98 🚑 add specialization of get_to #2175 2020-06-30 14:26:52 +02:00
ad6eadeb70 📝 refine documentation of error_handler parameter 2020-06-30 13:59:43 +02:00