Commits · ae04426c856ef5f5bd6d54fea069836ba3499f94 · Libraries / json

08 Jun, 2020 1 commit

Niels Lohmann authored Jun 08, 2020

🏁 fix for MSVC (see https://github.com/nlohmann/json/pull/2178#issuecomment-640622532)

ae04426c

07 Jun, 2020 9 commits
- ✅ add test for character types · 2cf16625
  Niels Lohmann authored Jun 07, 2020
  
  2cf16625
- ✅ add test for character types · d4bc0c39
  Niels Lohmann authored Jun 07, 2020
  
  d4bc0c39
- 🚨 fix warnings · 6d73126e
  Niels Lohmann authored Jun 07, 2020
  
  6d73126e
- Merge branches 'develop' and 'mkdocs' of https://github.com/nlohmann/json into develop · 28048d82
  Niels Lohmann authored Jun 07, 2020
```
 Conflicts:
	doc/examples/swap__binary_t.link
```
  28048d82
- 📝 add example link for swap function · eca5490b
  Niels Lohmann authored Jun 07, 2020
  
  eca5490b
- 📝 add documentation and example for accept function · 8c1d26e1
  Niels Lohmann authored Jun 07, 2020
  
  8c1d26e1
- Merge pull request #2174 from nlohmann/fix_warnings · 543dcee3
  Niels Lohmann authored Jun 07, 2020
```
Fix warnings
```
  543dcee3
- 🏁 fix MSVC 2015 compilation · 90780318
  Niels Lohmann authored Jun 07, 2020
  
  90780318
- 🚑 hotfix for #2177 · e6a7e7a1
  Niels Lohmann authored Jun 07, 2020
  
  e6a7e7a1
06 Jun, 2020 1 commit
- 🚨 fix warnings · bf2e714e
  Niels Lohmann authored Jun 06, 2020
  
  bf2e714e
05 Jun, 2020 5 commits
- Merge pull request #2145 from FrancoisChabot/1813-user-input · 7444c7fa
  Niels Lohmann authored Jun 05, 2020
```
Fix Issue#1813: user defined input adapters
```
  7444c7fa
- 🚨 fix warning · dd7e2592
  Niels Lohmann authored Jun 05, 2020
  
  dd7e2592
- Merge pull request #2158 from dota17/output_adapter · 5fe6b83c
  Niels Lohmann authored Jun 05, 2020
```
Fix PR#1006
```
  5fe6b83c
- recover original blank line · ad2b4ff2
  chenguoping authored Jun 05, 2020
  
  ad2b4ff2
- undo: remove comment · 0f67c584
  chenguoping authored Jun 05, 2020
  
  0f67c584
04 Jun, 2020 2 commits
- 📝 add page on parsing and exceptions · 2df5f107
  Niels Lohmann authored Jun 04, 2020
  
  2df5f107
- Merge branches 'develop' and 'mkdocs' of https://github.com/nlohmann/json into mkdocs · 32bda1a7
  Niels Lohmann authored Jun 04, 2020
  
  32bda1a7
03 Jun, 2020 9 commits
- 👥 update contributor list · 92125907
  Niels Lohmann authored Jun 03, 2020
  
  92125907
- 🔥 remove Code Inspector · 9708b1e9
  Niels Lohmann authored Jun 03, 2020
  
  9708b1e9
- 👷 add Code Inspector via GitHub Action · 68fd772f
  Niels Lohmann authored Jun 03, 2020
  
  68fd772f
- 👷 add Code Inspector via GitHub Action · 9bc2a7fa
  Niels Lohmann authored Jun 03, 2020
  
  9bc2a7fa
- Merge remote-tracking branch 'origin/develop' into develop · c24218af
  Niels Lohmann authored Jun 03, 2020
  
  c24218af
- Merge pull request #2152 from TotalCaesar659/patch-1 · 2c4be7d6
  Niels Lohmann authored Jun 03, 2020
```
Update URLs to HTTPS
```
  2c4be7d6
- 🔨 fix doxygen link · 2ad847f2
  Niels Lohmann authored Jun 03, 2020
  
  2ad847f2
- 🔨 fix Doxygen link · fdf5a63d
  Niels Lohmann authored Jun 03, 2020
  
  fdf5a63d
- Merge pull request #2153 from dota17/issue#1972 · 309acb44
  Niels Lohmann authored Jun 03, 2020
```
Fix issue#1972
```
  309acb44
02 Jun, 2020 2 commits
- fix test case in PR#1006 · eca4b878
  chenguoping authored Jun 02, 2020
  
  eca4b878
- add comment about PR#1006 · fff14999
  chenguoping authored Jun 02, 2020
  
  fff14999
01 Jun, 2020 1 commit
- add test case · 8cd39578
  chenguoping authored Jun 01, 2020
  
  8cd39578
30 May, 2020 2 commits
- fix bug in issue#1972 · 4350c5ed
  chenguoping authored May 30, 2020
  
  4350c5ed
- Update URLs to HTTPS · 0aa13599
  TotalCaesar659 authored May 30, 2020
  
  0aa13599
28 May, 2020 8 commits
- minor readme correction · 0da131d7
  Francois Chabot authored May 28, 2020
  
  0da131d7
- changed macro order to satisfy clang · b715a706
  Francois Chabot authored May 28, 2020
  
  b715a706
- fix inconsistent fwd declaration · 76462539
  Francois Chabot authored May 28, 2020
  
  76462539
- use correct deprecation macro · ce3143a0
  Francois Chabot authored May 28, 2020
  
  ce3143a0
- brought back the from_*(ptr, len) syntax with a deprecation warning · d5755344
  Francois Chabot authored May 28, 2020
  
  d5755344
- cleaned up custom iterator example · 248f3102
  Francois Chabot authored May 28, 2020
  
  248f3102
- amalgamate · 897061c4
  Francois Chabot authored May 28, 2020
  
  897061c4
- Merge branch '1813-user-input' of https://github.com/FrancoisChabot/json into 1813-user-input · 7ceb06ba
  Francois Chabot authored May 28, 2020
  
  7ceb06ba