External/json
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,745 Commits 10 Branches 56 Tags 212 MiB
cc5b565a58
Commit Graph

2745 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Heikki Hellgren
cc5b565a58 Add integration to conan.io package manager 
Unfortunately not all cmake tests pass during the packaging so they had
to be disabled for the time being. This is due to conan changing the
project directories during packaging.

Feel free to distribute this great library with conan to for example
bintray.
 2018-10-16 22:14:17 +03:00
Niels Lohmann
dd672939a0
Merge pull request #1294 from theodelrieu/fix/json_ref_ctor 
add constraints for variadic json_ref constructors
 2018-10-12 17:35:41 +02:00
Théo DELRIEU
11fecc25af
add constraints for variadic json_ref constructors 
Fixes #1292
 2018-10-12 10:54:58 +02:00
Niels Lohmann
e426219256
Merge pull request #1282 from nlohmann/feature/lines_columns 
Improve diagnostic messages
 2018-10-08 22:17:33 +02:00
Niels Lohmann
adfa961ed0
Merge pull request #1280 from nlohmann/feature/linter 
Removed linter warnings
 2018-10-08 21:05:33 +02:00
Niels Lohmann
6d34d64bfd
🚑 fixed compilation error 2018-10-08 06:54:51 +02:00
Niels Lohmann
74a31075e3
♿ improved parse error messages 2018-10-07 22:39:17 +02:00
Niels Lohmann
6e49d9f5ff
🚑 fixed compilation error 2018-10-07 21:34:40 +02:00
Niels Lohmann
f8158997b5
📝 fixed documentation 2018-10-07 21:30:58 +02:00
Niels Lohmann
3abb788139
🚨 fixed some more clang-tidy warnings 2018-10-07 19:07:58 +02:00
Niels Lohmann
858e75c4df
🚨 fixed some clang-tidy warnings 2018-10-07 18:39:18 +02:00
Niels Lohmann
6d09cdec34
🐛 fixed a bug in the unget function 2018-10-07 16:48:45 +02:00
Niels Lohmann
011b15dd08
♿ added line positions to error messages 
This is a follow-up to #1210.
 2018-10-07 12:27:24 +02:00
Niels Lohmann
ac38e95780
Merge pull request #1277 from performous/fix-clang-detection 
Thirdparty benchmark: Fix Clang detection.
 2018-10-06 16:29:26 +02:00
Niels Lohmann
fa722d5ac3
🚨 fixed another linter warning 2018-10-06 16:26:47 +02:00
Niels Lohmann
ec95438a59
🚨 fixed some linter warnings 2018-10-06 13:49:02 +02:00
Niels Lohmann
f1768a540a
Merge branch 'release/3.3.0' into develop 2018-10-05 12:59:41 +02:00
Niels Lohmann
cdfe6ceda6
🔖 set version to 3.3.0 2018-10-05 11:20:10 +02:00
Niels Lohmann
b968faa882
🔖 set version to 3.3.0 2018-10-05 10:59:33 +02:00
Niels Lohmann
cd518fbbab
📝 small update to pass test suite 2018-10-05 08:58:38 +02:00
Gregorio Litenstein
e8427061a0 Thirdparty benchmark: Fix Clang detection. 
CMake 3.0+ refers to macOS’ Clang as AppleClang, which would fail a STREQUAL check. Fixed by changing it to MATCHES.
 2018-10-05 02:01:43 -03:00
Niels Lohmann
b911654857
📝 updated contributor list 2018-10-04 22:30:18 +02:00
Niels Lohmann
bb55885215
💄 cleaned code 2018-10-04 20:42:19 +02:00
Niels Lohmann
5c7d27c338
Merge pull request #1272 from antonioborondo/fix_warning 
Fix warning C4127: conditional expression is constant
 2018-10-04 20:33:26 +02:00
Antonio Borondo
b6fdad9acd Remove anonymous namespace 2018-10-03 13:51:49 +01:00
Antonio Borondo
7c385a4844 Fix error: 'wide_string_input_helper' was not declared in this scope 2018-10-03 12:41:34 +01:00
Antonio Borondo
9ba3f79667 Fix error: explicit specialization in non-namespace scope 2018-10-03 12:26:24 +01:00
Antonio Borondo
8d1585f065 Change implementation to use templates 2018-10-03 11:44:02 +01:00
Antonio Borondo
ad3c216bb5 Generate header 2018-10-03 11:27:53 +01:00
Antonio Borondo
0231059290 Fix warning 2018-10-03 11:27:53 +01:00
Niels Lohmann
9f18e17063
Merge pull request #1270 from chuckatkins/add-more-cmake-docs 
docs: Add additional CMake documentation
 2018-10-03 10:11:27 +02:00
Niels Lohmann
53ec0a16f3
Merge pull request #1271 from chuckatkins/cleanup-deprecated-warnings 
Turn off additional deprecation warnings for GCC.
 2018-10-02 22:07:18 +02:00
Chuck Atkins
4c617611e2 docs: Add additional CMake documentation 2018-10-02 14:28:20 -04:00
Chuck Atkins
829571ab5c Turn off additional deprecation warnings for GCC. 
In follow up from the conversation in #1269, this adds the
`-Wno-deprecate-declarations` flag to unit tests to allow them to
test deprecated APIs without all the noisy compiler warnings.
This also refactors the setting of build properties for test targets
to use `target_<...>` commands instead of `set_target_properties()`.
 2018-10-02 13:01:19 -04:00
Niels Lohmann
c8231eff75
Merge pull request #1260 from chuckatkins/fix-cmake-target-alias 
Fix broken cmake imported target alias
 2018-10-01 17:44:50 +02:00
Chuck Atkins
02e653bdf7 docs: add a note in the readme about using the CMake imported target 2018-09-30 22:52:54 -04:00
Chuck Atkins
564506a885 cmake: add import config tests 2018-09-30 22:52:47 -04:00
Chuck Atkins
1729db85c1 cmake: fix package config to deal with versioning and namespaces 2018-09-30 09:56:33 -04:00
Niels Lohmann
910a895027
Merge pull request #1238 from theodelrieu/fix/1237 
Fix issue #1237
 2018-09-29 14:50:54 +02:00
Niels Lohmann
1fae82b7a7
Merge branch 'develop' into fix/1237 2018-09-29 14:50:36 +02:00
Niels Lohmann
22e55349a6
📝 added Wandbox link #1227 2018-09-29 14:33:39 +02:00
Niels Lohmann
70e587c3da
📝 added Wandbox link #1227 2018-09-29 14:33:21 +02:00
Niels Lohmann
d26f39466e
Merge pull request #1231 from theodelrieu/feature/get_with_parameter 
Add a get overload taking a parameter.
 2018-09-29 14:30:04 +02:00
Niels Lohmann
c61a9071ae
🚨 fixed a compilation issue with ICPC #755 
Closes #1222
 2018-09-29 11:50:14 +02:00
Niels Lohmann
b59a58406e
Merge branch 'develop' of https://github.com/nlohmann/json into develop 2018-09-29 11:48:52 +02:00
Niels Lohmann
4e54c9a13d
🚨 fixed a compilation issue with ICPC #755 
Closes #1222
 2018-09-29 11:48:49 +02:00
Niels Lohmann
95432c34f9
Merge pull request #1262 from knilch0r/patch-1 
unit-testsuites.cpp: fix hangup if file not found
 2018-09-29 10:58:10 +02:00
knilch
8c1387cfb3
unit-testsuites.cpp: fix hangup if file not found 
If run from the wrong directory, std::ifstream f("test/data/big-list-of-naughty-strings/blns.json"); will not find the file and thus f.eof() will never return true.
Use canonical C++ file reading loop from https://gehrcke.de/2011/06/reading-files-in-c-using-ifstream-dealing-correctly-with-badbit-failbit-eofbit-and-perror/ instead.
 2018-09-28 11:33:23 +02:00
Théo DELRIEU
521fe49fec
Add basic_json::get_to function. 
Takes an lvalue reference, and returns the same reference.

This allows non-default constructible types to be converted without
specializing adl_serializer.
This overload does not require CopyConstructible either.

Implements #1227
 2018-09-28 11:25:23 +02:00
Niels Lohmann
680a4ab672
Merge pull request #1257 from henryiii/gcc48 
GCC 48
 2018-09-28 10:05:17 +02:00