Commits · 980f8c6f6157b11dc908554d56ca75028f5a9657 · Libraries / json

25 Jul, 2020 6 commits
- 🔀 merge develop branch · 980f8c6f
  Niels Lohmann authored Jul 25, 2020
  
  980f8c6f
- Merge branch 'develop' of https://github.com/nlohmann/json into issue2286 · 42f87089
  Niels Lohmann authored Jul 25, 2020
```
 Conflicts:
	single_include/nlohmann/json.hpp
```
  42f87089
- Merge pull request #2308 from nlohmann/cbor_tags · 40b78d38
  Niels Lohmann authored Jul 25, 2020
```
Fix bug in CBOR tag handling
```
  40b78d38
- Merge pull request #2306 from jwittbrodt/develop · a1dbfcd7
  Niels Lohmann authored Jul 25, 2020
```
added inline to NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE macro
```
  a1dbfcd7
- Merge branch 'develop' into develop · c00c3162
  Niels Lohmann authored Jul 25, 2020
  
  c00c3162
- Merge pull request #2303 from nlohmann/cleanup · 448ceb2e
  Niels Lohmann authored Jul 25, 2020
```
Cleanup
```
  448ceb2e
24 Jul, 2020 2 commits
- 🐛 fix bug in CBOR tag handling · 480ad529
  Niels Lohmann authored Jul 24, 2020
  
  480ad529
- ✅ improve coverage · 33662417
  Niels Lohmann authored Jul 24, 2020
  
  33662417
23 Jul, 2020 16 commits
- added inline to DEFINE_TYPE macro · 0f22ed0b
  Jonas Wittbrodt authored Jul 23, 2020
  
  0f22ed0b
- 🙈 extend ignore list · 3c7dc635
  Niels Lohmann authored Jul 23, 2020
  
  3c7dc635
- 📝 update documentation · 27232455
  Niels Lohmann authored Jul 23, 2020
  
  27232455
- 📝 update documentation · 59cb7674
  Niels Lohmann authored Jul 23, 2020
  
  59cb7674
- 🚨 fix UBSAN warning · 0cd120f7
  Niels Lohmann authored Jul 23, 2020
  
  0cd120f7
- 🚨 fix UBSAN warning · bba57cc4
  Niels Lohmann authored Jul 23, 2020
  
  bba57cc4
- 🚨 fix implicit conversion warning when opening binary file · e571c67c
  Niels Lohmann authored Jul 23, 2020
  
  e571c67c
- Merge pull request #2301 from nlohmann/regression2281 · 43e07bb9
  Niels Lohmann authored Jul 23, 2020
```
Add test with multiple translation units
```
  43e07bb9
- 🔊 add message if implicit conversions are switched off · fb22233f
  Niels Lohmann authored Jul 23, 2020
  
  fb22233f
- 🚚 unify cmake build dir names · f9b71afe
  Niels Lohmann authored Jul 23, 2020
  
  f9b71afe
- 🔀 rename variable to avoid shadowing · 8159091d
  Niels Lohmann authored Jul 23, 2020
  
  8159091d
- 🚨 add prefix to avoid shadowing · 230dcfb7
  Niels Lohmann authored Jul 23, 2020
  
  230dcfb7
- 🔀 merge develop branch · b315fe48
  Niels Lohmann authored Jul 23, 2020
  
  b315fe48
- Merge branch 'develop' of https://github.com/nlohmann/json into issue2286 · a33c3fdf
  Niels Lohmann authored Jul 23, 2020
```
 Conflicts:
	single_include/nlohmann/json.hpp
```
  a33c3fdf
- ♻ pull code into function · 88122467
  Niels Lohmann authored Jul 23, 2020
  
  88122467
- Merge pull request #1559 from theodelrieu/feat/explicit_conversion_operator · a048b72f
  Niels Lohmann authored Jul 23, 2020
```
Feat/explicit conversion operator
```
  a048b72f
22 Jul, 2020 10 commits
- Merge pull request #2299 from nlohmann/fix_warnings · 484029b5
  Niels Lohmann authored Jul 22, 2020
```
Fix unused parameter
```
  484029b5
- ✅ add regression test for #2281 · a6d112ff
  Niels Lohmann authored Jul 22, 2020
  
  a6d112ff
- ✅ add regression test for #2281 · 2301bd11
  Niels Lohmann authored Jul 22, 2020
  
  2301bd11
- ✅ add regression test for #2281 · c4356c68
  Niels Lohmann authored Jul 22, 2020
  
  c4356c68
- ✅ add regression test for #2281 · 4d63252c
  Niels Lohmann authored Jul 22, 2020
  
  4d63252c
- ✅ add regression test for #2281 · a7c4c84d
  Niels Lohmann authored Jul 22, 2020
  
  a7c4c84d
- add a CI job for explicit conversions on every os · 79732931
  Théo DELRIEU authored Jul 16, 2020
  
  79732931
- add a switch to enable implicit conversions (defaults to true) · 74b446f5
  Théo DELRIEU authored Jul 16, 2020
```
wrap implicit conversions tests around the JSON_USE_IMPLICIT_CONVERSIONS
macro
```
  74b446f5
- Merge pull request #2300 from nlohmann/gihub_actions · 2cd10a74
  Niels Lohmann authored Jul 22, 2020
```
Merge Gitlab actions
```
  2cd10a74
- 👷 merge Gitlab actions · 6bd38a2c
  Niels Lohmann authored Jul 22, 2020
  
  6bd38a2c
21 Jul, 2020 6 commits
- 🚨 fix warnings · 8b14c9b3
  Niels Lohmann authored Jul 21, 2020
  
  8b14c9b3
- 🔀 merge develop branch · 3bb43ecd
  Niels Lohmann authored Jul 21, 2020
  
  3bb43ecd
- Merge branch 'develop' of https://github.com/nlohmann/json into issue2286 · 3249a4d8
  Niels Lohmann authored Jul 21, 2020
```
 Conflicts:
	single_include/nlohmann/json.hpp
```
  3249a4d8
- 🔇 remove debug output · 96e9f660
  Niels Lohmann authored Jul 21, 2020
  
  96e9f660
- 🔊 add debug output to tests · 8046754c
  Niels Lohmann authored Jul 21, 2020
  
  8046754c
- 💚 fix build · b1903fff
  Niels Lohmann authored Jul 21, 2020
  
  b1903fff