Niels Lohmann
9d726c25d5
♻️ remove "#define private public"
2020-08-12 13:30:06 +02:00
Niels Lohmann
c00c3162b2
Merge branch 'develop' into develop
2020-07-25 10:52:42 +02:00
Jonas Wittbrodt
0f22ed0b5b
added inline to DEFINE_TYPE macro
2020-07-23 19:24:21 +02:00
Niels Lohmann
230dcfb7a3
🚨 add prefix to avoid shadowing
2020-07-23 12:57:52 +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
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
98b1c6d302
🚩 use JSON_ASSERT(x) instead of assert(x)
2020-07-06 12:22:31 +02:00
Niels Lohmann
eb7376bb13
Merge pull request #2225 from nlohmann/issue2175
...
Simplify conversion from/to custom types
2020-06-29 14:41:09 +02:00
Niels Lohmann
0fe9f23254
✨ add macros from #2175
2020-06-20 14:11:37 +02:00
Guillaume Racicot
225c8f150a
Disable std::swap specialization in C++20 and added a friend swap function
2020-06-06 11:36:39 -04:00
Michael Reilly
012c9665ac
Add binary type support to all binary file formats, as well as an internally represented binary type
2020-04-14 10:22:45 -04:00
Anthony Van Herrewege
ddda67a096
Don't capture json input by value ( fixed #1822 ).
2019-10-30 16:16:34 +01:00
Niels Lohmann
1720bfedd1
⚗️ add Hedley annotations
2019-06-30 22:14:02 +02:00
Watal M. Iwasaki
5ccdaf643f
Remove C++17 extension warning from clang; #1535
...
- Switch off `nodiscard` for clang unless C++17 is detected.
- Detect C++ standard before the switch.
2019-03-28 14:38:58 +09:00
Niels Lohmann
002addabd8
🚨 fixed a warning
2019-03-19 23:10:21 +01:00
Niels Lohmann
8d3f4f21bc
🔨 clean up
2019-03-18 13:53:48 +01:00
Niels Lohmann
27011e3718
🚨 fixed warnings
2019-03-15 14:55:13 +01:00
Niels Lohmann
5047c7a217
🐛 added missing include #1500
2019-03-10 22:26:57 +01:00
Niels Lohmann
e36593e960
🔨 trying code from https://godbolt.org/z/-tLO1K
2019-01-20 11:12:20 +01:00
Niels Lohmann
d359fd3a8d
🚧 trying nodiscard attribute #1433
2019-01-19 17:32:23 +01:00
Niels Lohmann
24946f67f1
🚨 fixed some more linter warnings
2018-10-28 09:15:41 +01:00
Niels Lohmann
9f48bb6937
⚡ replaced vector by array #1323
2018-10-27 09:58:23 +02:00
Niels Lohmann
ad639ad5e6
✨ added NLOHMANN_JSON_SERIALIZE_ENUM marco #1208
2018-10-26 14:48:20 +02:00
Chris Harris
99b7c7c8ef
Patch nlohmann/json for GCC 4.8
...
See https://github.com/nlohmann/json/pull/212 for details
2018-09-25 18:10:20 +02:00
Théo DELRIEU
b59c3367c9
use detected instead of has_* traits
2018-09-07 12:17:59 +02:00
Niels Lohmann
eb30ff0615
🚨 fixed a compiler warning #1224
2018-09-06 07:25:19 +02:00
Hyeon Kim
aada309f61
Fix #1213
2018-08-24 21:55:13 +09:00
Hyeon Kim
d0e60de433
Add new JSON_INTERNAL_CATCH macro function
2018-07-19 15:43:41 +09:00
Niels Lohmann
396a914f9e
🔨 added macro to disable compiler check #1128
2018-06-26 22:47:40 +02:00
Théo DELRIEU
14cd019861
fix cmake install directory (for real this time)
...
* Rename 'develop' folder to 'include/nlohmann'
* Rename 'src' folder to 'single_include/nlohmann'
* Use <nlohmann/*> headers in sources and tests
* Change amalgamate config file
2018-02-01 11:06:51 +01:00
