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
3695 commits 11 branches 56 tags 222 MiB
Commit graph

3695 commits

This branch
This branch
All branches
Author SHA1 Message Date
Niels Lohmann 402c34c526
👷 try Clang 10 2020-06-04 12:27:37 +02:00
Niels Lohmann 65c4b07451
🎨 replace alternative operators (and, not, or) 2020-06-03 21:22:07 +02:00
Niels Lohmann 0498202a03
🎨 replace alternative operators (and, not, or) 2020-06-03 14:20:36 +02:00
Niels Lohmann 4f04ea1bef
Merge branches 'clang_windows' and 'develop' of https://github.com/nlohmann/json into clang_windows 2020-06-03 14:01:18 +02:00
Niels Lohmann 9212590764
👥 update contributor list 2020-06-03 13:56:01 +02:00
Niels Lohmann 9708b1e9c3
🔥 remove Code Inspector 2020-06-03 13:49:46 +02:00
Niels Lohmann 68fd772fdf
👷 add Code Inspector via GitHub Action 2020-06-03 13:44:33 +02:00
Niels Lohmann 9bc2a7fa25
👷 add Code Inspector via GitHub Action 2020-06-03 13:39:56 +02:00
Niels Lohmann c24218afe8
Merge remote-tracking branch 'origin/develop' into develop 2020-06-03 13:38:15 +02:00
Niels Lohmann 2c4be7d65c
Merge pull request #2152 from TotalCaesar659/patch-1 
Update URLs to HTTPS
 2020-06-03 12:31:33 +02:00
Niels Lohmann 2ad847f21b
🔨 fix doxygen link 2020-06-03 12:30:42 +02:00
Niels Lohmann fdf5a63dfd
🔨 fix Doxygen link 2020-06-03 12:30:10 +02:00
Niels Lohmann 309acb445a
Merge pull request #2153 from dota17/issue#1972 
Fix issue#1972
 2020-06-03 12:26:17 +02:00
chenguoping eca4b8785c fix test case in PR#1006 2020-06-02 15:44:26 +08:00
chenguoping fff1499963 add comment about PR#1006 2020-06-02 15:43:57 +08:00
chenguoping 8cd39578e3 add test case 2020-06-01 11:34:03 +08:00
Niels Lohmann 5ea205f570
👷 install clang 2020-05-30 18:17:54 +02:00
Niels Lohmann 5f10d5d156
👷 install clang 2020-05-30 18:15:13 +02:00
Niels Lohmann 7c0c522b96
👷 install clang 2020-05-30 18:11:54 +02:00
Niels Lohmann 522ec5d7bd
👷 install clang 2020-05-30 18:06:52 +02:00
Niels Lohmann 7e5c2a480a
👷 install clang 2020-05-30 18:04:07 +02:00
Niels Lohmann 9c971c2d2f
👷 install clang 2020-05-30 17:40:27 +02:00
Niels Lohmann 4ba8c95794
👷 install clang 2020-05-30 13:41:18 +02:00
Niels Lohmann fbd3e8f677
👷 install clang 2020-05-30 13:35:19 +02:00
Niels Lohmann 0309025b45
👷 set full path 2020-05-30 13:28:44 +02:00
Niels Lohmann 9191926fff
👷 use Makefiles 2020-05-30 13:23:13 +02:00
Niels Lohmann 42ef2a5adb
👷 use Clang compiler 2020-05-30 13:15:56 +02:00
Niels Lohmann 2182935397
👷 add Clang/Windows step 2020-05-30 13:07:23 +02:00
chenguoping 4350c5ed97 fix bug in issue#1972 2020-05-30 17:15:56 +08:00
TotalCaesar659 0aa13599f0
Update URLs to HTTPS 2020-05-30 06:02:25 +03:00
Francois Chabot 0da131d717 minor readme correction 2020-05-28 17:12:26 -04:00
Francois Chabot b715a70673 changed macro order to satisfy clang 2020-05-28 12:26:29 -04:00
Francois Chabot 7646253940 fix inconsistent fwd declaration 2020-05-28 12:20:02 -04:00
Francois Chabot ce3143a038 use correct deprecation macro 2020-05-28 12:16:10 -04:00
Francois Chabot d575534471 brought back the from_*(ptr, len) syntax with a deprecation warning 2020-05-28 12:13:43 -04:00
Francois Chabot 248f310215 cleaned up custom iterator example 2020-05-28 10:14:55 -04:00
Francois Chabot 897061c434 amalgamate 2020-05-28 10:11:19 -04:00
Francois Chabot 7ceb06baac Merge branch '1813-user-input' of https://github.com/FrancoisChabot/json into 1813-user-input 2020-05-28 09:30:07 -04:00
Francois Chabot dcf6175978 use the correct convention for boolean operators 2020-05-28 09:29:38 -04:00
Niels Lohmann 23c8ab95da
👥 update contributor list 2020-05-28 14:24:08 +02:00
Niels Lohmann 53ef076715
🔧 add more warning flags from GCC 10 2020-05-28 13:46:56 +02:00
Niels Lohmann 2edb5cb999
👷 fix -DJSON_BuildTests=On parameter placement 2020-05-28 13:46:47 +02:00
Niels Lohmann 61832afe15
Merge pull request #2144 from XyFreak/gcc10_type_limits 
Fix issue#1939: Cast character to unsigned for comparison
 2020-05-28 12:59:57 +02:00
Niels Lohmann 5ff4d7b7ff
Merge branch 'develop' of https://github.com/nlohmann/json into develop 2020-05-28 12:54:13 +02:00
Niels Lohmann fcda998ee2
🔧 add more warning flags from GCC 10 2020-05-28 12:53:22 +02:00
Francois Chabot d3caf93ab0
Merge branch 'develop' into 1813-user-input 2020-05-28 03:40:34 -04:00
Francois Chabot bfcd32c099 removed clang-format 2020-05-28 03:16:24 -04:00
Francois Chabot 3a91a05db6 added custom input to readme 2020-05-28 03:13:39 -04:00
Francois Chabot a4f1cf4d00 better parse documentation 2020-05-28 02:50:58 -04:00
Francois Chabot 76b49f9ee6 misc formatting fixes 2020-05-28 02:29:53 -04:00