|
|
33662417c1
|
✅ improve coverage
|
2020-07-24 09:32:03 +02:00 |
|
|
|
0f22ed0b5b
|
added inline to DEFINE_TYPE macro
|
2020-07-23 19:24:21 +02:00 |
|
|
|
12885446d8
|
fixes unused variable 'ex' for #2304
|
2020-07-23 13:21:38 -04:00 |
|
|
|
3c7dc635e7
|
🙈 extend ignore list
|
2020-07-23 14:19:57 +02:00 |
|
|
|
27232455c8
|
📝 update documentation
|
2020-07-23 14:17:02 +02:00 |
|
|
|
59cb7674be
|
📝 update documentation
|
2020-07-23 14:15:20 +02:00 |
|
|
|
0cd120f7e1
|
🚨 fix UBSAN warning
|
2020-07-23 14:06:09 +02:00 |
|
|
|
bba57cc4af
|
🚨 fix UBSAN warning
|
2020-07-23 14:02:49 +02:00 |
|
|
|
e571c67c0d
|
🚨 fix implicit conversion warning when opening binary file
|
2020-07-23 14:02:12 +02:00 |
|
|
|
43e07bb92d
|
Merge pull request #2301 from nlohmann/regression2281
Add test with multiple translation units
|
2020-07-23 13:14:24 +02:00 |
|
|
|
fb22233f34
|
🔊 add message if implicit conversions are switched off
|
2020-07-23 13:11:48 +02:00 |
|
|
|
f9b71afebf
|
🚚 unify cmake build dir names
|
2020-07-23 13:02:53 +02:00 |
|
|
|
8159091d8f
|
🔀 rename variable to avoid shadowing
|
2020-07-23 12:58:09 +02:00 |
|
|
|
230dcfb7a3
|
🚨 add prefix to avoid shadowing
|
2020-07-23 12:57:52 +02:00 |
|
|
|
b315fe484a
|
🔀 merge develop branch
|
2020-07-23 12:30:26 +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 |
|
|
|
88122467bd
|
♻️ pull code into function
|
2020-07-23 12:16:18 +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 |
|
|
|
484029b51c
|
Merge pull request #2299 from nlohmann/fix_warnings
Fix unused parameter
|
2020-07-22 18:43:33 +02:00 |
|
|
|
a6d112ffbf
|
✅ add regression test for #2281
|
2020-07-22 13:39:40 +02:00 |
|
|
|
2301bd1177
|
✅ add regression test for #2281
|
2020-07-22 13:24:07 +02:00 |
|
|
|
c4356c68e0
|
✅ add regression test for #2281
|
2020-07-22 12:38:39 +02:00 |
|
|
|
4d63252c6c
|
✅ add regression test for #2281
|
2020-07-22 12:23:58 +02:00 |
|
|
|
a7c4c84d68
|
✅ add regression test for #2281
|
2020-07-22 12:03:37 +02:00 |
|
|
|
797329315a
|
add a CI job for explicit conversions on every os
|
2020-07-22 10:49:01 +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 |
|
|
|
2cd10a7405
|
Merge pull request #2300 from nlohmann/gihub_actions
Merge Gitlab actions
|
2020-07-22 09:45:55 +02:00 |
|
|
|
6bd38a2cb9
|
👷 merge Gitlab actions
|
2020-07-22 09:02:55 +02:00 |
|
|
|
8b14c9b305
|
🚨 fix warnings
|
2020-07-21 23:00:56 +02:00 |
|
|
|
3bb43ecd51
|
🔀 merge develop branch
|
2020-07-21 22:02:14 +02:00 |
|
|
|
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 |
|
|
|
96e9f66025
|
🔇 remove debug output
|
2020-07-21 22:01:15 +02:00 |
|
|
|
8046754c15
|
🔊 add debug output to tests
|
2020-07-21 12:44:38 +02:00 |
|
|
|
b1903fff1f
|
💚 fix build
|
2020-07-21 09:09:30 +02:00 |
|
|
|
1339d6b683
|
🐛 add missing EOF check
|
2020-07-20 22:40:28 +02:00 |
|
|
|
a9117828e1
|
🚨 fix warnings
|
2020-07-20 22:38:00 +02:00 |
|
|
|
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 |
|
|
|
4a5277d09d
|
📝 update documentation
|
2020-07-20 14:11:43 +02:00 |
|
|
|
8aa6da61dc
|
🚧 support for UBJSON high-precision numbers #2286
|
2020-07-20 13:57:19 +02:00 |
|
|
|
7360e09830
|
🚧 support for UBJSON high-precision numbers #2286
|
2020-07-20 13:12:20 +02:00 |
|
|
|
35b899e988
|
[JSON] initialise all member variables. Maybe this will shut valgrind up. std::tie probably wasn't the problem initially
|
2020-07-20 10:51:43 +01:00 |
|
|
|
7cf2fe149c
|
🚧 support for UBJSON high-precision numbers #2286
|
2020-07-20 09:42:37 +02:00 |
|
|
|
7660ea12f6
|
[JSON] drop use of std::tie and std::tupe for operator== overload. valgrind and clang < 4 complain
|
2020-07-20 08:31:56 +01:00 |
|
|
|
893eda8353
|
Merge pull request #2294 from jprochazk/develop
fix eof for get_binary and get_string
|
2020-07-20 08:02:03 +02:00 |
|
|
|
678d310b85
|
[JSON] don't know why CHECK doesn't like "CHECK(obj1 == obj2)". So using a temporary bool.
|
2020-07-19 21:29:39 +01:00 |
|
|
|
e83ddb185d
|
[JSON] use CHECK from doctest
|
2020-07-19 21:25:27 +01:00 |
|
|
|
254f0e3cee
|
[JSON] CHECK in doctest only accepts std::string ? Use assert statement instead. Does the job
|
2020-07-19 18:22:16 +01:00 |
|
|
|
578217eaa3
|
[JSON] doctest: need another section ?
|
2020-07-19 18:17:03 +01:00 |
|
|
|
6d9b2040ab
|
[JSON] as per Nlohmann's suggestion, added unit tests for the (de)serialisation macros
|
2020-07-19 18:12:13 +01:00 |
|
|
|
75a6888d55
|
[JSON] since we no longer use a netbeans project for the (de)serialisation macro building code, can revert the changes made to the .gitignore file
|
2020-07-19 18:11:37 +01:00 |
|
