1
0
mirror of https://github.com/nlohmann/json.git synced 2025-07-29 23:01:16 +03:00
Commit Graph

4336 Commits

Author SHA1 Message Date
3322c9df6e 🔒 use HTTPS 2020-12-06 14:41:48 +01:00
cde29b3a11 Merge branch 'develop' of https://github.com/nlohmann/json into develop 2020-12-03 12:47:34 -08:00
eaac918034 👷 remove clang9 CI 2020-12-02 08:58:45 +01:00
9f45d314d5 Apply suggestions from code review
Co-authored-by: Niels Lohmann <niels.lohmann@gmail.com>
2020-11-24 11:02:58 -08:00
64ff1cf90d Add asserts to suppress C28020 2020-10-26 13:57:38 -07:00
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
42a9dc0bc3 Improve json_ref implementation 2020-09-27 10:45:21 +05:00
b273f28dae 📝 add CPM.Cmake example 2020-09-26 19:16:03 -03:00
fd7a9f6007 💰 add sponsor 2020-09-23 19:55:03 +02:00
1bcabd9e83 📝 fix URLs to documentation 2020-09-02 22:25:32 +02:00
1047d09b2a annotate non-reproducible tests #2324 2020-08-30 13:23:34 +02:00
d9843fc9fc 📝 add note for Intel compilers #2346 2020-08-29 12:46:47 +02:00
6030a11051 Merge pull request #2367 from nlohmann/hedley14
Update Hedley
2020-08-26 08:13:43 +02:00
14f8be11ce Merge branch 'develop' of https://github.com/nlohmann/json into hedley14 2020-08-24 16:12:11 +02:00
b9d76516a2 Merge pull request #2363 from nlohmann/issue2360
Fix and extend documentation of discarded values
2020-08-20 11:38:43 +02:00
9d81eedb42 📝 fix and extend documentation of discarded values 2020-08-19 20:26:30 +02:00
b386f4de0b 📝 fix and extend documentation of discarded values 2020-08-19 20:26:06 +02:00
3be6ee3525 🚚 remove < from filename to fix Windows build 2020-08-16 21:39:40 +02:00
fe507a7ee8 🚚 remove < from filename to fix Windows build 2020-08-16 21:36:21 +02:00
6b04f05eba 📝 add more API documentation 2020-08-16 21:23:44 +02:00
5c4cc20ed8 📝 add more API documentation 2020-08-16 20:48:10 +02:00
a430d25f22 📝 add more API documentation 2020-08-16 14:48:48 +02:00
fb5c20134f 📝 add more API documentation 2020-08-16 14:27:26 +02:00
d8ed98a7af 📝 add more API documentation 2020-08-15 15:18:07 +02:00
1ce0ed5a52 👷 ignore gh-pages branch in CircleCI 2020-08-14 13:58:55 +02:00
0c2088823d 👷 ignore gh-pages branch in CircleCI 2020-08-14 13:56:42 +02:00
fb8adb8e93 👷 ignore gh-pages branch in CircleCI 2020-08-14 13:52:42 +02:00
f6c2947f1e 📝 add more API documentation 2020-08-14 13:47:54 +02:00
0356e0c75b 📝 add more API documentation 2020-08-14 13:05:16 +02:00
6674561d6a 📝 add more API documentation 2020-08-14 10:48:32 +02:00
772f37c12d Merge pull request #2354 from rbuch/develop
Fix typos in documentation
2020-08-14 06:04:56 +02:00
67d822d951 Fix typos in documentation 2020-08-13 15:44:58 -04:00
298420263b 🚚 remove quotes from filename to fix Windows build 2020-08-13 15:12:41 +02:00
dd2fb3b454 📝 add more API documentation 2020-08-13 15:03:28 +02:00
ce6adc447a 📝 add more API documentation 2020-08-13 14:04:08 +02:00
d360fec216 📝 add offline pages for docset 2020-08-13 13:35:05 +02:00
178125ff9b 📝 add docset 2020-08-13 10:52:20 +02:00
8d0aa09ab5 Merge pull request #2352 from nlohmann/private_macro
Remove "#define private public" from tests
2020-08-13 10:06:59 +02:00
874f49e945 📝 add more API documentation 2020-08-12 14:29:25 +02:00
fe89049aee 📝 add more API documentation 2020-08-12 13:41:59 +02:00
9d726c25d5 ♻️ remove "#define private public" 2020-08-12 13:30:06 +02:00
411fc3249b ⬆️ Hedley 14 (dev branch) 2020-08-12 13:00:57 +02:00
b888afe5f4 Merge pull request #2349 from nlohmann/issue2348
Remove -Wimplicit-fallthrough warning
2020-08-11 09:05:02 +02:00
37ce871eeb Merge pull request #2347 from nlohmann/no_exceptions
Fix code to work without exceptions
2020-08-10 22:47:27 +02:00
dd8cb2acc1 🚨 remove -Wimplicit-fallthrough warning #2348 2020-08-10 20:48:39 +02:00
4080d0b1a4 add test to compile without exceptions 2020-08-10 09:48:11 +02:00
1b28a58280 Merge remote-tracking branch 'origin/develop' into develop 2020-08-10 09:24:25 +02:00
824d55bf26 📝 fix documentation #1668 2020-08-10 09:24:11 +02:00
e030d26089 Merge pull request #2344 from ongjunjie/fix-cmake-overwrite-compiler
fix cmake script overwriting compiler path
2020-08-08 12:15:10 +02:00
41a99567e0 fix cmake script overwriting compiler path
This fixes #2343
2020-08-07 16:08:02 +08:00