Thomas Braun
435c7f8498
unit-items.cpp: Silence clang compiler warnings
2020-09-01 13:47:53 +02:00
Thomas Braun
f907c2ac2d
unit-deserialization.cpp: Silence MSVC compiler warning
2020-09-01 13:47:53 +02:00
Thomas Braun
0b8644c452
test/CMakeLists.txt: Use more fine grained compiler detection
...
Clang on Windows comes in two flavours, one which pretens to be like GCC
and one which pretends to be like MSVC. We need to distinguish these two
so that we can pass the correct compiler flags.
Co-authored-by: James Moore <james.moore@veracityuk.com>
2020-09-01 13:47:53 +02:00
Thomas Braun
077122629c
unit-allocator.cpp: Silence compiler warning on MSVC 2015
2020-09-01 13:39:33 +02:00
Thomas Braun
e2889e3138
Tests: Ignore some compiler warnings
...
Co-authored-by: James Moore <james.moore@veracityuk.com>
2020-09-01 13:39:27 +02:00
Thomas Braun
5d053f36d6
Tests: Fix warning about unused result
...
GCC 7.0 and higher complain when compiled in release mode about the
unused result of parse-like functions. This makes totally sense as these
are marked with JSON_HEDLEY_WARN_UNUSED_RESULT.
Store the result in a json object named _ to silence that warning.
2020-09-01 13:22:04 +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
Niels Lohmann
6674561d6a
📝 add more API documentation
2020-08-14 10:48:32 +02:00
Niels Lohmann
772f37c12d
Merge pull request #2354 from rbuch/develop
...
Fix typos in documentation
2020-08-14 06:04:56 +02:00
Ronak Buch
67d822d951
Fix typos in documentation
2020-08-13 15:44:58 -04:00
Niels Lohmann
298420263b
🚚 remove quotes from filename to fix Windows build
2020-08-13 15:12:41 +02:00
Niels Lohmann
dd2fb3b454
📝 add more API documentation
2020-08-13 15:03:28 +02:00
Niels Lohmann
ce6adc447a
📝 add more API documentation
2020-08-13 14:04:08 +02:00
Niels Lohmann
d360fec216
📝 add offline pages for docset
2020-08-13 13:35:05 +02:00
Niels Lohmann
178125ff9b
📝 add docset
2020-08-13 10:52:20 +02:00
Niels Lohmann
8d0aa09ab5
Merge pull request #2352 from nlohmann/private_macro
...
Remove "#define private public" from tests
2020-08-13 10:06:59 +02:00
Niels Lohmann
874f49e945
📝 add more API documentation
2020-08-12 14:29:25 +02:00
Niels Lohmann
fe89049aee
📝 add more API documentation
2020-08-12 13:41:59 +02:00
Niels Lohmann
9d726c25d5
♻️ remove "#define private public"
2020-08-12 13:30:06 +02:00
Niels Lohmann
411fc3249b
⬆️ Hedley 14 (dev branch)
2020-08-12 13:00:57 +02:00
Niels Lohmann
b888afe5f4
Merge pull request #2349 from nlohmann/issue2348
...
Remove -Wimplicit-fallthrough warning
2020-08-11 09:05:02 +02:00
Niels Lohmann
37ce871eeb
Merge pull request #2347 from nlohmann/no_exceptions
...
Fix code to work without exceptions
2020-08-10 22:47:27 +02:00
Niels Lohmann
dd8cb2acc1
🚨 remove -Wimplicit-fallthrough warning #2348
2020-08-10 20:48:39 +02:00
Niels Lohmann
4080d0b1a4
✅ add test to compile without exceptions
2020-08-10 09:48:11 +02:00
Niels Lohmann
1b28a58280
Merge remote-tracking branch 'origin/develop' into develop
2020-08-10 09:24:25 +02:00
Niels Lohmann
824d55bf26
📝 fix documentation #1668
2020-08-10 09:24:11 +02:00
Niels Lohmann
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
Jun Jie
41a99567e0
fix cmake script overwriting compiler path
...
This fixes #2343
2020-08-07 16:08:02 +08:00
Niels Lohmann
db78ac1d77
Merge branch 'release/3.9.1' into develop
2020-08-06 13:49:29 +02:00
Niels Lohmann
b3e5cb7f20
🔖 set version to 3.9.1
2020-08-06 13:45:29 +02:00
Niels Lohmann
f4155e4727
Merge pull request #2333 from nlohmann/fallthrough
...
Fix fallthrough warning
2020-08-01 15:32:21 +02:00
Niels Lohmann
8a54617240
Merge pull request #2332 from nlohmann/issue2330
...
Fix lexer to properly cope with repeated comments
2020-08-01 12:29:33 +02:00
Niels Lohmann
0326e4e2a6
🚨 fix fallthrough warning
2020-07-31 19:24:03 +02:00
