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 |
|
Niels Lohmann
|
484029b51c
|
Merge pull request #2299 from nlohmann/fix_warnings
Fix unused parameter
|
2020-07-22 18:43:33 +02:00 |
|
Niels Lohmann
|
a6d112ffbf
|
✅ add regression test for #2281
|
2020-07-22 13:39:40 +02:00 |
|
Niels Lohmann
|
2301bd1177
|
✅ add regression test for #2281
|
2020-07-22 13:24:07 +02:00 |
|
Niels Lohmann
|
c4356c68e0
|
✅ add regression test for #2281
|
2020-07-22 12:38:39 +02:00 |
|
Niels Lohmann
|
4d63252c6c
|
✅ add regression test for #2281
|
2020-07-22 12:23:58 +02:00 |
|
Niels Lohmann
|
a7c4c84d68
|
✅ add regression test for #2281
|
2020-07-22 12:03:37 +02:00 |
|
Théo DELRIEU
|
797329315a
|
add a CI job for explicit conversions on every os
|
2020-07-22 10:49:01 +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
|
2cd10a7405
|
Merge pull request #2300 from nlohmann/gihub_actions
Merge Gitlab actions
|
2020-07-22 09:45:55 +02:00 |
|
Niels Lohmann
|
6bd38a2cb9
|
👷 merge Gitlab actions
|
2020-07-22 09:02:55 +02:00 |
|
Niels Lohmann
|
8b14c9b305
|
🚨 fix warnings
|
2020-07-21 23:00:56 +02:00 |
|
Niels Lohmann
|
3bb43ecd51
|
🔀 merge develop branch
|
2020-07-21 22:02:14 +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
|
96e9f66025
|
🔇 remove debug output
|
2020-07-21 22:01:15 +02:00 |
|
Niels Lohmann
|
8046754c15
|
🔊 add debug output to tests
|
2020-07-21 12:44:38 +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 |
|
pf
|
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 |
|
Niels Lohmann
|
7cf2fe149c
|
🚧 support for UBJSON high-precision numbers #2286
|
2020-07-20 09:42:37 +02:00 |
|
pf
|
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 |
|
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
|
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 |
|
pf
|
e83ddb185d
|
[JSON] use CHECK from doctest
|
2020-07-19 21:25:27 +01:00 |
|
pf
|
254f0e3cee
|
[JSON] CHECK in doctest only accepts std::string ? Use assert statement instead. Does the job
|
2020-07-19 18:22:16 +01:00 |
|
pf
|
578217eaa3
|
[JSON] doctest: need another section ?
|
2020-07-19 18:17:03 +01:00 |
|
pf
|
6d9b2040ab
|
[JSON] as per Nlohmann's suggestion, added unit tests for the (de)serialisation macros
|
2020-07-19 18:12:13 +01:00 |
|
pf
|
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 |
|
pf
|
8f14aaa13f
|
[JSON] as per Nlohmann's suggestion, moved the macro builder code to third_party directory
|
2020-07-19 18:10:08 +01:00 |
|
jprochazk
|
851315c878
|
add regression test
|
2020-07-19 18:35:58 +02:00 |
|
pf
|
f7374c9a8d
|
Merge branch 'develop' of https://github.com/pfeatherstone/json into develop
|
2020-07-19 17:32:35 +01:00 |
|
pf
|
0a158ee830
|
[JSON] rough and ready code for generating (de)serialisation macros. Current upper bound on number of member variables is set to 64
|
2020-07-19 17:32:16 +01:00 |
|
pf
|
21bd6e971b
|
[JSON] - dirty code for building intrusive and non-intrusive serialisation/deserialisation macros for custom types
- updated .gitignore file to ignore private netbeans project configurations
|
2020-07-19 17:26:56 +01:00 |
|
pf
|
0b744e1ed0
|
[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 |
|
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 |
|
pf
|
a575008c48
|
[JSON] - dirty code for building intrusive and non-intrusive serialisation/deserialisation macros for custom types
- updated .gitignore file to ignore "dist" and "build" directories in netbeans project
|
2020-07-19 17:26:56 +01:00 |
|
pf
|
5eb739a585
|
[JSON] - dirty code for building intrusive and non-intrusive serialisation/deserialisation macros for custom types
- netbeans project configurations
|
2020-07-19 17:26:56 +01:00 |
|
pf
|
68122fe0ed
|
[JSON] dirty code for building intrusive and non-intrusive serialisation/deserialisation macros for custom types
|
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 |
|
Niels Lohmann
|
1fd6c5882a
|
Merge pull request #2285 from T0b1-iOS/develop
add inline specifier for detail::combine
|
2020-07-19 17:55:51 +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 |
|