Commit Graph

177 Commits (6b74772fe8957ec88efbfb4eed4c7d79d3c0f57a)

Author SHA1 Message Date
Niels Lohmann bdb2469c31
🚨 fix warnings 2020-12-29 21:36:30 +01:00
Niels Lohmann d028eff9e1
📦 add license to include.zip #2487 2020-12-12 17:17:38 +01:00
Niels Lohmann 178125ff9b
📝 add docset 2020-08-13 10:52:20 +02:00
Niels Lohmann 9d726c25d5
♻️ remove "#define private public" 2020-08-12 13:30:06 +02:00
Niels Lohmann 84c0c76849
🚧 add Clang-Tidy configuration 2020-07-27 09:15:57 +02:00
Niels Lohmann bbcdf18ba5
🚚 move test utils header file 2020-07-26 14:07:34 +02:00
Niels Lohmann e571c67c0d
🚨 fix implicit conversion warning when opening binary file 2020-07-23 14:02:12 +02:00
Niels Lohmann f9b71afebf
🚚 unify cmake build dir names 2020-07-23 13:02:53 +02:00
Niels Lohmann 26196f25f6
🔥 remove test Makefile targets (all handled by CMake) 2020-07-16 13:38:25 +02:00
Niels Lohmann 3d60befde3
🔧 adjust analysis targets 2020-07-16 12:14:06 +02:00
Niels Lohmann 7f6ea47bdb
🔧 adjust analysis targets 2020-07-16 09:44:07 +02:00
Thomas Braun 88adffdaba Makefile: Always use SED variable
We need to have a proper sed, even on MacOSX. So let's use the variable
introduced in 191aa0fd (🔧 overworked maintaner targets,
2019-03-28) in more places.
2020-07-13 14:44:40 +02:00
Niels Lohmann 28ef87370b
🚨 fix warning 2020-07-06 13:19:06 +02:00
Niels Lohmann efcc826ecb
🚨 fix warning 2020-07-06 12:37:39 +02:00
Niels Lohmann bf2e714e96
🚨 fix warnings 2020-06-06 14:30:17 +02:00
Niels Lohmann 53ef076715
🔧 add more warning flags from GCC 10 2020-05-28 13:46:56 +02:00
Niels Lohmann fcda998ee2
🔧 add more warning flags from GCC 10 2020-05-28 12:53:22 +02:00
Niels Lohmann 28e20bd9e4
🚨 fix warnings #2113 2020-05-16 14:26:17 +02:00
Niels Lohmann b1c1eb145e
🔧 fix maintainer target 2020-05-12 19:36:33 +02:00
Niels Lohmann 2f0d37d7d2
🔥 remove fastcov 2020-05-02 23:48:11 +02:00
Niels Lohmann 929f5d398c
🔨 fix coverage tests 2020-05-02 23:24:21 +02:00
Niels Lohmann 752c62b4bd
🔨 remove double tests 2020-05-02 16:07:09 +02:00
Niels Lohmann 7b0c50b9a5
🔨 add path 2019-11-10 19:09:48 +01:00
Niels Lohmann 42e9ad32c6
🔨 remove full path 2019-11-03 21:49:22 +01:00
Eli Schwartz 84faa36ec5
release: add singleinclude and meson.build to include.zip
This serves as a minimal release-only way to embed json into a project.
Add meson support to this directly, to make it usable standalone as a
meson subproject.

Implements #1672
2019-10-17 15:26:51 -04:00
Niels Lohmann fe618ac246
👷 adjust maintainer scripts 2019-07-29 18:49:21 +02:00
Niels Lohmann 66d63abe6d
Update Makefile 2019-07-28 18:40:11 +02:00
Niels Lohmann d4fd731f1f
🔨 fix release target 2019-07-28 17:55:01 +02:00
Niels Lohmann 7bf8a86090
🔨 adjust paths 2019-07-28 14:30:17 +02:00
Niels Lohmann 90798caa62
🚚 rename Hedley macros 2019-07-01 22:37:30 +02:00
Niels Lohmann 025f4cea42
🚨 fix warning 2019-07-01 22:29:21 +02:00
Niels Lohmann 897362191d
🔨 add NLOHMANN_JSON prefix and undef macros 2019-07-01 22:24:39 +02:00
Niels Lohmann cf6b6692aa
Merge branch 'develop' into feature/fastcov 2019-04-06 09:03:35 +02:00
Niels Lohmann f0bc16d899
🔨 overworked coverage targets 2019-04-06 09:02:17 +02:00
Niels Lohmann e65cff2a8f
🔨 small cleanup 2019-04-05 23:31:04 +02:00
Niels Lohmann da279234d5
Merge branch 'develop' into feature/fastcov 2019-04-04 09:03:11 +02:00
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
Viktor Kirilov 64873fb5b8
Merge branch 'develop' into doctest 2019-03-30 23:23:33 +02:00
Niels Lohmann b12287b362
⚗️ trying fastcov 2019-03-30 09:12:32 +01:00
Niels Lohmann c7878173f9
🔨 minor changes to maintainer targets 2019-03-29 13:10:11 +01:00
Niels Lohmann 191aa0fd6f
🔧 overworked maintaner targets 2019-03-28 14:22:48 +01:00
onqtam b4def6dcba tabs instead of spaces... 2019-03-27 01:13:10 +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
onqtam 2b346099df Merge branch 'develop' of https://github.com/nlohmann/json into doctest 2019-03-24 17:21:44 +02:00
Niels Lohmann b224c52376
🎨 cleanup 2019-03-19 09:17:14 +01:00
Viktor Kirilov 365944b0bc
Merge branch 'develop' into doctest 2019-03-18 16:59:36 +02:00
Niels Lohmann 9fc093c9e0
👷 added targets for infer and oclint 2019-03-18 00:19:28 +01:00
Niels Lohmann df0f7f2b5d
👷 overworked clang-tidy target 2019-03-17 12:02:23 +01:00