Commit graph

3407 commits

Author SHA1 Message Date
Niels Lohmann
0da99027b7
🚨 silenced a warning 2019-04-03 17:44:09 +02:00
Niels Lohmann
1f03395e2c
Merge branch 'develop' of https://github.com/nlohmann/json into develop 2019-04-03 17:28:50 +02:00
Niels Lohmann
2f9095ddab
🔨 relaxed requirements to coverage 2019-04-03 17:28:47 +02:00
Niels Lohmann
ee8732c359
Merge pull request #1555 from theodelrieu/fix/1511
Fix/1511
2019-04-03 17:24:25 +02:00
Niels Lohmann
d1ef75316e
Merge pull request #1439 from onqtam/doctest
moved from Catch to doctest for unit tests
2019-04-03 17:01:48 +02:00
Théo DELRIEU
d66abda4ee
tests: fix coverage 2019-04-03 12:34:15 +02:00
Théo DELRIEU
e6e6805c6c
add built-in array support in get_to 2019-04-01 17:47:45 +02:00
Théo DELRIEU
2806b201a8
make sure values are overwritten in from_json overloads
Caused unexpected behaviors when using get_to with values previously
set.

Fixes !1511
2019-04-01 17:47:42 +02:00
onqtam
da5b7833a0 fixing the remaining of the pedantic gcc/clang target warnings 2019-03-31 13:57:44 +03:00
Viktor Kirilov
64873fb5b8
Merge branch 'develop' into doctest 2019-03-30 23:23:33 +02:00
Niels Lohmann
80daa19331
👷 Ninja seems not to work 2019-03-30 17:39:50 +01:00
Niels Lohmann
0a57c51a69
👷 adding concurrency 2019-03-30 17:32:52 +01:00
Niels Lohmann
a5e00f2cf7
👷 fixed path 2019-03-30 17:19:27 +01:00
Niels Lohmann
5ebe722045
👷 full workflow 2019-03-30 17:14:50 +01:00
Niels Lohmann
ecf4d5e91d
👷 trying CircleCI 2019-03-30 17:05:43 +01:00
Niels Lohmann
53001414c7
🔨 using --exclude-gcov to exclude files 2019-03-30 17:00:30 +01:00
Niels Lohmann
b12287b362
⚗️ trying fastcov 2019-03-30 09:12:32 +01:00
Niels Lohmann
b21c04c938
🔥 removed unsupported flag 2019-03-29 17:34:58 +01:00
Niels Lohmann
c7878173f9
🔨 minor changes to maintainer targets 2019-03-29 13:10:11 +01:00
Niels Lohmann
b52c3638f5
Merge pull request #1551 from heavywatal/fix-1535-nodiscard-clang
Remove C++17 extension warning from clang; #1535
2019-03-29 09:14:25 +01:00
Niels Lohmann
d21d298397
🎨 fixed indentation 2019-03-28 14:23:26 +01:00
Niels Lohmann
23635704c3
⬆️ added script to update cpplint 2019-03-28 14:23:07 +01:00
Niels Lohmann
191aa0fd6f
🔧 overworked maintaner targets 2019-03-28 14:22:48 +01:00
Watal M. Iwasaki
5ccdaf643f Remove C++17 extension warning from clang; #1535
- Switch off `nodiscard` for clang unless C++17 is detected.
- Detect C++ standard before the switch.
2019-03-28 14:38:58 +09:00
onqtam
b4def6dcba tabs instead of spaces... 2019-03-27 01:13:10 +02:00
onqtam
a0000c3235 finished the last of the warnings 2019-03-27 01:09:47 +02:00
onqtam
5d511a6e96 fixed a bunch of warnings from the Makefile from the root of the repo 2019-03-27 00:58:53 +02:00
Viktor Kirilov
82af0ecdc1
Merge branch 'develop' into doctest 2019-03-26 23:32:32 +02:00
Niels Lohmann
d79c16801a
Merge branch 'feature/doozer' into develop 2019-03-26 10:49:56 +01:00
Niels Lohmann
24d91cf36f
📝 added Doozer to README 2019-03-26 10:49:14 +01:00
Niels Lohmann
0991824584
👷 version output 2019-03-26 10:41:05 +01:00
onqtam
0caf986505 reverted the removal of this if/else branching - this is the easiest way to get -std=c++0x support 2019-03-25 22:04:37 +02:00
Niels Lohmann
9d2f0391e0
👷 fixed timeout 2019-03-25 12:30:45 +01:00
Niels Lohmann
af9da22b87
👷 adding xenial-armhf 2019-03-25 07:15:03 +01:00
Niels Lohmann
0a67b51fce
👷 forgot path to ctest 2019-03-25 07:03:41 +01:00
Niels Lohmann
e27b282033
👷 skip certificate check 2019-03-25 06:45:35 +01:00
Niels Lohmann
cde0b24389
👷 fixed required packages 2019-03-25 06:43:14 +01:00
Niels Lohmann
f091fe31bc
👷 increased timeout 2019-03-25 06:39:41 +01:00
Niels Lohmann
28dfbedda7
👷 fixed timeout 2019-03-24 18:14:59 +01:00
onqtam
ff51a32be1 updated doctest to version 2.3.1 released today 2019-03-24 17:28:52 +02:00
onqtam
2b346099df Merge branch 'develop' of https://github.com/nlohmann/json into doctest 2019-03-24 17:21:44 +02:00
Niels Lohmann
dcbc028b5b
👷 fixed syntax 2019-03-24 09:02:46 +01:00
Niels Lohmann
842d42b135
👷 unified paths 2019-03-24 09:02:06 +01:00
Niels Lohmann
1e86976cfe
👷 fixed paths 2019-03-24 08:53:30 +01:00
Niels Lohmann
30211477b7
👷 fixed package name 2019-03-24 08:36:01 +01:00
Niels Lohmann
5e1cae0a7d
👷 install g++ 2019-03-24 08:24:50 +01:00
Niels Lohmann
c871c9a01c
👷 install correct g++ 2019-03-24 06:51:10 +01:00
Niels Lohmann
63d619e21f
👷 need to install g++ 2019-03-24 00:48:59 +01:00
Niels Lohmann
c94b764a6e
👷 fixed installation 2019-03-24 00:43:01 +01:00
Niels Lohmann
65cdccfa8a
👷 fixed syntax error 2019-03-24 00:36:46 +01:00