haraldwolff/json
1
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2024-07-04 13:26:58 +02:00
Code Issues Packages Projects Releases Wiki Activity
2791 commits 16 branches 56 tags 222 MiB
Commit graph

2791 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Julian Becker e8730e5e82 BSON: Reworked binary_reader::get_bson_cstr() 2018-09-29 11:50:01 +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
Julian Becker 0a09db9cc2 BSON: Extend binary_reader::get_number to be able to hanlde little endian input to get rid of binary_reader::get_number_little_endian 2018-09-29 11:33:01 +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
Henry Fredrick Schreiner 7a37ba0c02 Adding 4.8 test to travis 2018-09-27 22:31:39 +02:00
Julian Becker ef358ae695 BSON: Fixed hangup in case of incomplete bson input and improved test coverage 2018-09-25 20:34:25 +02:00
Chris Harris 99b7c7c8ef Patch nlohmann/json for GCC 4.8 
See https://github.com/nlohmann/json/pull/212 for details
 2018-09-25 18:10:20 +02:00
Julian Becker bce4816275 BSON: Added test case for the different input/output_adapters 2018-09-24 23:35:19 +02:00
Julian Becker 763705c2a7 Fix: Add missing begin() and end() member functions to alt_string 2018-09-24 19:50:28 +02:00
Niels Lohmann e184b6ecf2
Merge pull request #1252 from koponomarenko/fix-meson-build 
Add version and license to meson.build
 2018-09-22 14:49:03 +02:00
Niels Lohmann 88b055c2df
Merge pull request #1249 from LEgregius/clang-3.4.2-crash-workaround 
#1179 Reordered the code. It seems to stop clang 3.4.2 in RHEL 7 from crash…
 2018-09-22 14:14:56 +02:00
Kostiantyn Ponomarenko 8799759b85 Add version and license to meson.build 2018-09-20 21:54:10 +03:00
Théo DELRIEU 4e52277b70
Fix issue #1237 
* Make the conversion operator SFINAE correct.
* Workaround a GCC bug with some traits in type_traits.hpp

The first bullet-point implies that every `get`/`get_ptr` be SFINAE
correct as well.
 2018-09-20 10:33:14 +02:00
Niels Lohmann e4bc98d036
Merge pull request #1245 from chuckatkins/fix-target-namespace-backward-compatibility 
Use a version check to provide backwards comatible CMake imported target names
 2018-09-19 20:46:51 +02:00
David Guthrie 4d780b091b Reordered the code. It seems to stop clang 3.4.2 in RHEL 7 from crashing intermittently. 2018-09-18 16:38:59 -04:00
Chuck Atkins 3b1a5cafad Use a version check to provide backwards comatible imported target names. 2018-09-18 13:59:19 -04:00
Niels Lohmann 99939d6340
📝 added lgtm.com badge 
See https://lgtm.com/projects/g/nlohmann/json
 2018-09-18 19:27:52 +02:00
Niels Lohmann 4e2f35d4c2
👷 adding Xcode 10 worker 
See https://blog.travis-ci.com/2018-09-13-xcode-10-is-now-available?utm_source=twitter&utm_medium=web&utm_campaign=xcode10_gm
 2018-09-18 19:22:30 +02:00
Niels Lohmann 7fa3b8865c
Merge pull request #1221 from rivertam/better-error-305 
Better error 305
 2018-09-18 12:49:07 +02:00
Ben Berman 8f07ab6392 Replace "key-style argument" with "string argument" 2018-09-17 15:36:38 -04:00
Julian Becker df33a90774 BSON: Bugfix for non-empty arrays 2018-09-15 14:08:38 +02:00
Julian Becker cf485c2907 BSON: Support for arrays 2018-09-15 13:54:08 +02:00
Julian Becker 120d1d77d4 BSON: test case for a more complex document 2018-09-15 13:41:05 +02:00
Julian Becker 5ce7d6bdd7 BSON: support objects with objects as members 2018-09-15 13:03:42 +02:00