Commits · 7a4841a42affe9260f6e112cde56ec5613921c9e · Libraries / json

26 Jul, 2020 4 commits
- 📝 add binary() function to SAX documentation · 7a4841a4
  Niels Lohmann authored Jul 26, 2020
  
  7a4841a4
- 🚚 move test utils header file · bbcdf18b
  Niels Lohmann authored Jul 26, 2020
  
  bbcdf18b
- 🚨 fix warning · e22cbacc
  Niels Lohmann authored Jul 26, 2020
  
  e22cbacc
- Merge pull request #2312 from nlohmann/docs · 67ed63b1
  Niels Lohmann authored Jul 26, 2020
```
Update documentation
```
  67ed63b1
25 Jul, 2020 15 commits
- ✅ fix test for meta() function · a34070d3
  Niels Lohmann authored Jul 25, 2020
  
  a34070d3
- 🔧 clean generated XML files · 9c75c7ea
  Niels Lohmann authored Jul 25, 2020
  
  9c75c7ea
- 📝 add more documentation · 7bd6242f
  Niels Lohmann authored Jul 25, 2020
  
  7bd6242f
- Merge pull request #2305 from AODQ/develop · 808aca41
  Niels Lohmann authored Jul 25, 2020
```
fixes unused variable 'ex' for #2304
```
  808aca41
- Merge pull request #2297 from nlohmann/issue2286 · 63e7c40e
  Niels Lohmann authored Jul 25, 2020
```
Add support for high-precision numbers in UBJSON encoding
```
  63e7c40e
- Merge branch 'develop' of https://github.com/nlohmann/json into docs · 1816aae8
  Niels Lohmann authored Jul 25, 2020
  
  1816aae8
- 🔀 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
- 📝 update output of meta function · fad14aab
  Niels Lohmann authored Jul 25, 2020
  
  fad14aab
- 📝 add more documentation · 6e5be17b
  Niels Lohmann authored Jul 25, 2020
  
  6e5be17b
- Merge branch 'develop' of https://github.com/nlohmann/json into docs · 62f98b75
  Niels Lohmann authored Jul 25, 2020
  
  62f98b75
- 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 6 commits
- change c-style cast to static_cast for #2304 · 15ec0fe1
  aodq authored Jul 24, 2020
  
  15ec0fe1
- 📝 add more documentation · 58167173
  Niels Lohmann authored Jul 24, 2020
  
  58167173
- 📝 add more documentation · d8d499ce
  Niels Lohmann authored Jul 24, 2020
  
  d8d499ce
- 🐛 fix bug in CBOR tag handling · 480ad529
  Niels Lohmann authored Jul 24, 2020
  
  480ad529
- 📝 add more documentation · a84370c6
  Niels Lohmann authored Jul 24, 2020
  
  a84370c6
- ✅ improve coverage · 33662417
  Niels Lohmann authored Jul 24, 2020
  
  33662417
23 Jul, 2020 15 commits
- added inline to DEFINE_TYPE macro · 0f22ed0b
  Jonas Wittbrodt authored Jul 23, 2020
  
  0f22ed0b
- fixes unused variable 'ex' for #2304 · 12885446
  aodq authored Jul 23, 2020
  
  12885446
- 🙈 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