haraldwolff/json
1
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2024-07-07 12:23:49 +02:00
Code Issues Packages Projects Releases Wiki Activity
3775 commits 11 branches 56 tags 222 MiB
Commit graph

3775 commits

This branch
This branch
All branches
Author SHA1 Message Date
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 a1dbfcd736
Merge pull request #2306 from jwittbrodt/develop 
added inline to NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE macro
 2020-07-25 10:52:56 +02:00
Niels Lohmann c00c3162b2
Merge branch 'develop' into develop 2020-07-25 10:52:42 +02:00
Niels Lohmann 448ceb2e12
Merge pull request #2303 from nlohmann/cleanup 
Cleanup
 2020-07-25 05:41:51 +02:00
Niels Lohmann 480ad529e3
🐛 fix bug in CBOR tag handling 2020-07-24 14:18:39 +02:00
Jonas Wittbrodt 0f22ed0b5b added inline to DEFINE_TYPE macro 2020-07-23 19:24:21 +02:00
Niels Lohmann 3c7dc635e7
🙈 extend ignore list 2020-07-23 14:19:57 +02:00
Niels Lohmann 27232455c8
📝 update documentation 2020-07-23 14:17:02 +02:00
Niels Lohmann 59cb7674be
📝 update documentation 2020-07-23 14:15:20 +02:00
Niels Lohmann 0cd120f7e1
🚨 fix UBSAN warning 2020-07-23 14:06:09 +02:00
Niels Lohmann bba57cc4af
🚨 fix UBSAN warning 2020-07-23 14:02:49 +02:00
Niels Lohmann e571c67c0d
🚨 fix implicit conversion warning when opening binary file 2020-07-23 14:02:12 +02:00
Niels Lohmann 43e07bb92d
Merge pull request #2301 from nlohmann/regression2281 
Add test with multiple translation units
 2020-07-23 13:14:24 +02:00
Niels Lohmann fb22233f34
🔊 add message if implicit conversions are switched off 2020-07-23 13:11:48 +02:00
Niels Lohmann f9b71afebf
🚚 unify cmake build dir names 2020-07-23 13:02:53 +02:00
Niels Lohmann 8159091d8f
🔀 rename variable to avoid shadowing 2020-07-23 12:58:09 +02:00
Niels Lohmann 230dcfb7a3
🚨 add prefix to avoid shadowing 2020-07-23 12:57:52 +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 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
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
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