mirror/json
1
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2024-11-24 06:29:03 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
3,907 Commits 13 Branches 56 Tags 232 MiB
5cc5285fe8
Commit Graph

3907 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Niels Lohmann
5cc5285fe8
🚨 fix shadowing warning 2020-12-15 22:15:36 +01:00
Niels Lohmann
2fc1f694ad
Merge pull request #2514 from globberwops/develop 
Add MAIN_PROJECT check for test and install options
 2020-12-14 13:41:46 +01:00
Martin Stump
1771e9249f
Remove comment on CTest inclusion 
Co-authored-by: Niels Lohmann <niels.lohmann@gmail.com>
 2020-12-14 10:59:38 +01:00
Niels Lohmann
85ffc85a29
🎨 amalgamate code 2020-12-14 10:38:49 +01:00
Martin Stump
ea759d0360
Compare to CMAKE_CURRENT_SOURCE_DIR for main project check 2020-12-13 20:34:51 +01:00
Niels Lohmann
97fe455ad5
Merge branch 'develop' of https://github.com/nlohmann/json into develop 2020-12-12 17:17:43 +01:00
Niels Lohmann
d028eff9e1
📦 add license to include.zip #2487 2020-12-12 17:17:38 +01:00
Niels Lohmann
be32cc4f5e
Merge pull request #2525 from YarikTH/feature/doctest_v2.4.1 
Doctest is updated to v2.4.1
 2020-12-12 15:08:55 +01:00
Niels Lohmann
47c2004f7f
Merge branch 'develop' of https://github.com/nlohmann/json into develop 2020-12-12 14:10:05 +01:00
Niels Lohmann
fc4040ce9d
🔨 clean up CI 2020-12-12 14:09:50 +01:00
Krylov Yaroslav
6390fca71a
Doctest is updated to v2.4.1 2020-12-12 05:27:03 +03:00
Niels Lohmann
260be043ba
Merge pull request #2406 from leozz37/develop 
📝  add CPM.Cmake example
 2020-12-11 14:47:18 +01:00
Niels Lohmann
5026acd70c
Merge pull request #2444 from linev/fix_gcc48_warn 
Change argument name "subtype" in byte_container_with_subtype
 2020-12-11 13:46:41 +01:00
Sergey Linev
30dd0c0f09 Change underscore placement 2020-12-11 13:43:17 +01:00
Niels Lohmann
3ad6992f50
Merge pull request #2405 from karzhenkov/fix-json_ref-move 
Fix move constructor of json_ref
 2020-12-11 13:36:33 +01:00
Niels Lohmann
e3643aadf7
Merge pull request #2447 from jbzdarkid/develop 
Add asserts to suppress C28020
 2020-12-11 13:27:52 +01:00
Niels Lohmann
d9e2b191ad
Merge pull request #2512 from YarikTH/issue2490 
Ranged insert test section is added in unit-ordered_json.cpp
 2020-12-11 13:21:33 +01:00
Martin Stump
790508887e
Set MAIN_PROJECT=OFF initially 2020-12-09 12:39:44 +01:00
Martin Stump
5c589dd138
Add MAIN_PROJECT check for test and install options 2020-12-09 11:37:01 +01:00
Krylov Yaroslav
972c15f26e
ordered_map::insert(InputIt first, InputIt last) is added 2020-12-07 20:15:41 +03:00
Krylov Yaroslav
5155cc2c48
Ranged insert test section is added in unit-ordered_json.cpp 2020-12-07 19:47:41 +03:00
Niels Lohmann
d8d8cbf6e0
🔨 fix site URL 2020-12-07 15:30:28 +01:00
Niels Lohmann
3322c9df6e
🔒 use HTTPS 2020-12-06 14:41:48 +01:00
jbzdarkid
cde29b3a11 Merge branch 'develop' of https://github.com/nlohmann/json into develop 2020-12-03 12:47:34 -08:00
Niels Lohmann
eaac918034
👷 remove clang9 CI 2020-12-02 08:58:45 +01:00
Joseph Blackman
9f45d314d5
Apply suggestions from code review 
Co-authored-by: Niels Lohmann <niels.lohmann@gmail.com>
 2020-11-24 11:02:58 -08:00
jbzdarkid
64ff1cf90d Add asserts to suppress C28020 2020-10-26 13:57:38 -07:00
Sergey Linev
71cb7d12da Change argument name "subtype" in byte_container_with_subtype 
Fix warnings on older g++ 4.8

declaration of ‘subtype’ shadows a member of 'this'
 2020-10-23 13:52:24 +02:00
Alexander Karzhenkov
42a9dc0bc3 Improve json_ref implementation 2020-09-27 10:45:21 +05:00
leozz37
b273f28dae 📝 add CPM.Cmake example 2020-09-26 19:16:03 -03:00
Niels Lohmann
fd7a9f6007
💰 add sponsor 2020-09-23 19:55:03 +02:00
Niels Lohmann
1bcabd9e83
📝 fix URLs to documentation 2020-09-02 22:25:32 +02:00
Niels Lohmann
d9843fc9fc
📝 add note for Intel compilers #2346 2020-08-29 12:46:47 +02:00
Niels Lohmann
6030a11051
Merge pull request #2367 from nlohmann/hedley14 
Update Hedley
 2020-08-26 08:13:43 +02:00
Niels Lohmann
14f8be11ce
Merge branch 'develop' of https://github.com/nlohmann/json into hedley14 2020-08-24 16:12:11 +02:00
Niels Lohmann
b9d76516a2
Merge pull request #2363 from nlohmann/issue2360 
Fix and extend documentation of discarded values
 2020-08-20 11:38:43 +02:00
Niels Lohmann
9d81eedb42
📝 fix and extend documentation of discarded values 2020-08-19 20:26:30 +02:00
Niels Lohmann
b386f4de0b
📝 fix and extend documentation of discarded values 2020-08-19 20:26:06 +02:00
Niels Lohmann
3be6ee3525
🚚 remove < from filename to fix Windows build 2020-08-16 21:39:40 +02:00
Niels Lohmann
fe507a7ee8
🚚 remove < from filename to fix Windows build 2020-08-16 21:36:21 +02:00
Niels Lohmann
6b04f05eba
📝 add more API documentation 2020-08-16 21:23:44 +02:00
Niels Lohmann
5c4cc20ed8
📝 add more API documentation 2020-08-16 20:48:10 +02:00
Niels Lohmann
a430d25f22
📝 add more API documentation 2020-08-16 14:48:48 +02:00
Niels Lohmann
fb5c20134f
📝 add more API documentation 2020-08-16 14:27:26 +02:00
Niels Lohmann
d8ed98a7af
📝 add more API documentation 2020-08-15 15:18:07 +02:00
Niels Lohmann
1ce0ed5a52
👷 ignore gh-pages branch in CircleCI 2020-08-14 13:58:55 +02:00
Niels Lohmann
0c2088823d
👷 ignore gh-pages branch in CircleCI 2020-08-14 13:56:42 +02:00
Niels Lohmann
fb8adb8e93
👷 ignore gh-pages branch in CircleCI 2020-08-14 13:52:42 +02:00
Niels Lohmann
f6c2947f1e
📝 add more API documentation 2020-08-14 13:47:54 +02:00
Niels Lohmann
0356e0c75b
📝 add more API documentation 2020-08-14 13:05:16 +02:00