Niels Lohmann
|
14f8be11ce
|
Merge branch 'develop' of https://github.com/nlohmann/json into hedley14
|
2020-08-24 16:12:11 +02:00 |
|
Niels Lohmann
|
9d726c25d5
|
♻️ remove "#define private public"
|
2020-08-12 13:30:06 +02:00 |
|
Niels Lohmann
|
411fc3249b
|
⬆️ Hedley 14 (dev branch)
|
2020-08-12 13:00:57 +02:00 |
|
Niels Lohmann
|
b888afe5f4
|
Merge pull request #2349 from nlohmann/issue2348
Remove -Wimplicit-fallthrough warning
|
2020-08-11 09:05:02 +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
|
824d55bf26
|
📝 fix documentation #1668
|
2020-08-10 09:24:11 +02:00 |
|
Niels Lohmann
|
b3e5cb7f20
|
🔖 set version to 3.9.1
|
2020-08-06 13:45:29 +02:00 |
|
Niels Lohmann
|
f4155e4727
|
Merge pull request #2333 from nlohmann/fallthrough
Fix fallthrough warning
|
2020-08-01 15:32:21 +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
|
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
|
e110667d21
|
🔖 set version to 3.9.0
|
2020-07-27 15:48:09 +02:00 |
|
Niels Lohmann
|
67ed63b196
|
Merge pull request #2312 from nlohmann/docs
Update documentation
|
2020-07-26 10:06:01 +02:00 |
|
Niels Lohmann
|
808aca41aa
|
Merge pull request #2305 from AODQ/develop
fixes unused variable 'ex' for #2304
|
2020-07-25 21:51:54 +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
|
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
|
40b78d3847
|
Merge pull request #2308 from nlohmann/cbor_tags
Fix bug in CBOR tag handling
|
2020-07-25 19:43:11 +02:00 |
|
Niels Lohmann
|
fad14aabe7
|
📝 update output of meta function
|
2020-07-25 14:41:06 +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
|
c00c3162b2
|
Merge branch 'develop' into develop
|
2020-07-25 10:52:42 +02:00 |
|
aodq
|
15ec0fe150
|
change c-style cast to static_cast for #2304
|
2020-07-24 16:21:30 -04: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
|
33662417c1
|
✅ improve coverage
|
2020-07-24 09:32:03 +02:00 |
|
Jonas Wittbrodt
|
0f22ed0b5b
|
added inline to DEFINE_TYPE macro
|
2020-07-23 19:24:21 +02:00 |
|
aodq
|
12885446d8
|
fixes unused variable 'ex' for #2304
|
2020-07-23 13:21:38 -04:00 |
|
Niels Lohmann
|
230dcfb7a3
|
🚨 add prefix to avoid shadowing
|
2020-07-23 12:57:52 +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
|
a048b72fe1
|
Merge pull request #1559 from theodelrieu/feat/explicit_conversion_operator
Feat/explicit conversion operator
|
2020-07-23 08:52:51 +02:00 |
|
Théo DELRIEU
|
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 |
|
Niels Lohmann
|
8b14c9b305
|
🚨 fix warnings
|
2020-07-21 23:00:56 +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
|
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
|
8344857764
|
Merge pull request #2287 from pfeatherstone/develop
Serialisation macros: increase upper bound on number of member variables
|
2020-07-20 21:35:55 +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
|
893eda8353
|
Merge pull request #2294 from jprochazk/develop
fix eof for get_binary and get_string
|
2020-07-20 08:02:03 +02:00 |
|
pf
|
8a045713ed
|
[JSON] - dirty code for building intrusive and non-intrusive serialisation/deserialisation macros for custom types
- used code to increase the upper bound on number of member variables to 64
|
2020-07-19 17:26:56 +01:00 |
|
Niels Lohmann
|
b1da58b76b
|
Merge pull request #2282 from nlohmann/missing_sax_check
Add static assertion for missing binary function in SAX interface
|
2020-07-19 18:09:08 +02:00 |
|
jprochazk
|
d371a5283c
|
run amalgamate
|
2020-07-19 10:57:17 +02:00 |
|
jprochazk
|
ab25de05f7
|
fix: return -> result.push_back
|
2020-07-19 10:51:13 +02:00 |
|
jprochazk
|
a3a9d5665e
|
add break to binary_reader::get_binary and get_string
|
2020-07-19 09:35:49 +02:00 |
|
T0b1-iOS
|
281349d0d6
|
add inline specifier for detail::combine
|
2020-07-18 06:28:11 +02:00 |
|