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

528 commits

Author SHA1 Message Date
Niels Lohmann 3790bd9ae0
👷 add Xcode 10.2 2019-11-04 06:22:39 +01:00
Niels Lohmann e779714dd8
👷 add Xcode 10.2 2019-11-03 20:45:21 +01:00
Niels Lohmann 0db1692f45
👥 update contributors 2019-11-02 10:24:06 +01:00
Niels Lohmann 1307862b1d
Merge pull request #1694 from eli-schwartz/release-include-meson 
release: add singleinclude and meson.build to include.zip
 2019-11-02 09:28:51 +01:00
Niels Lohmann f7e7a62358
📝 add comment on JSON_THROW_USER, JSON_TRY_USER, and JSON_CATCH_USER 2019-10-23 20:58:06 +02:00
Eli Schwartz f4332d4097
README: describe how to use json as a meson subproject 
Also call out to the guidelines for using pkg-config dependencies first,
and reference it for other build systems as well.

Although the possibility of installing with a pkg-config file is
somewhat hidden away in the meson docs, it's been deemed less invasive
due to not distracting away from cmake. So it will have to do.
 2019-10-17 15:38:06 -04:00
0xflotus d7579b8cbf
did you mean 'serialization'? 2019-09-30 18:11:44 +02:00
Niels Lohmann 99d7518d21
📝 add OSS Fuzz status badge 2019-09-24 21:01:06 +02:00
Niels Lohmann bf4156056b
✏️ fix a typo 2019-08-27 20:18:04 +02:00
Niels Lohmann d275d05514
📝 update documentation 2019-07-28 20:54:02 +02:00
Niels Lohmann 6c7cde181c
Merge branch 'develop' of https://github.com/nlohmann/json into develop 2019-07-14 20:58:29 +02:00
Konstantin Podsvirov 6a3cdb281e
Package Manager: MSYS2 (pacman) 
Add a package installation instructions for MSYS2 software distro.
 2019-07-12 22:27:17 +03:00
Niels Lohmann 346e9813c5
🚧 add more annotations 2019-07-02 20:25:51 +02:00
Isaac Nickaein 0c214949f5 ✏️ Fix links to create an issue page 2019-06-04 11:27:25 +04:30
Isaac Nickaein b22c577e83 ✏️ Fix brew instructions in README 2019-06-04 11:25:44 +04:30
Isaac Nickaein 0d55ddc5bf ✏️ Fix a typo in README 2019-06-04 11:24:22 +04:30
Isaac Nickaein 40c3d5024a
Fix broken links to documentation 
Fixes #1597 and some other links
 2019-05-12 22:04:01 +04:30
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 63fe1cbbcf
📝 updated README 2019-04-05 18:29:57 +02:00
Viktor Kirilov 82af0ecdc1
Merge branch 'develop' into doctest 2019-03-26 23:32:32 +02:00
Niels Lohmann 24d91cf36f
📝 added Doozer to README 2019-03-26 10:49:14 +01:00
onqtam 2b346099df Merge branch 'develop' of https://github.com/nlohmann/json into doctest 2019-03-24 17:21:44 +02:00
Niels Lohmann b37392b7ac
🔖 set version to 3.6.0 2019-03-20 00:19:07 +01:00
Niels Lohmann a6f9b4e36d
👥 added contributors 2019-03-19 17:18:33 +01:00
Viktor Kirilov 365944b0bc
Merge branch 'develop' into doctest 2019-03-18 16:59:36 +02:00
Niels Lohmann 02b3494711
🔥 removing unstable macOS builds on Traivs 2019-03-16 08:28:44 +01:00
Niels Lohmann d39842e68f
Merge pull request #1330 from ax3l/topic-installEmbed 
CMake: Optional Install if Embedded
 2019-03-13 11:13:09 +01:00
Niels Lohmann c11bead2ae
👷 removing more retired Travis images 2019-03-11 21:22:30 +01:00
Niels Lohmann 16d9cdce45
📝 updated documentation of CI 2019-03-11 15:19:50 +01:00
Niels Lohmann e3729ba0a5
💚 fix compiler selection 2019-03-11 07:44:40 +01:00
Niels Lohmann e5c7fd488d
👷 trying new Travis workers 2019-03-10 22:56:14 +01:00
njlr 8aeee4f7e3
Update README.md 
* Updates Buckaroo instructions to v2
 2019-02-25 09:44:38 +00:00
Isaac Nickaein 088a245218
Fix typo in README.ME 
Fixes https://github.com/nlohmann/json/issues/1486.
 2019-02-22 01:05:00 +03:30
Niels Lohmann 68ec3eb8d6
Merge pull request #1451 from Afforix/Afforix-fix-extra-semicolon 
remove extra semicolon from readme
 2019-01-25 13:36:18 +01:00
Mark Beckwith cca6d0dbae
docs: README type 
Just another small typo I found in the README.
 2019-01-24 10:49:45 -06:00
Matěj Plch dc21cbb751
remove extra semicolon 
in example of NLOHMANN_JSON_SERIALIZE_ENUM
 2019-01-22 10:13:12 +01:00
onqtam 2f44ac1def moved from Catch to doctest for unit tests 2019-01-15 22:02:16 +02:00
Bruno Oliveira b025d66eb5 Add instructions about using nlohmann/json with the conda package manager 2019-01-15 11:06:26 -02:00
Jef LeCompte 7f73915d4f
Updated year in README.md 2019-01-11 08:54:03 -05:00
Michele Caini 6546cad7bf
Fixed broken links in the README file 2019-01-10 08:54:53 +01:00
Niels Lohmann 847dd2a954
Merge pull request #1420 from skypjack/patch-1 
Fixed broken links in the README file
 2019-01-09 22:33:40 +01:00
Niels Lohmann 937b642e0e
📝 added description on how to use NuGet package #1132 
Closes #1132.
 2019-01-09 21:08:06 +01:00
Michele Caini b8be0f64ae
Fixed broken links to operator[]() and at() 2019-01-09 15:11:54 +01:00
Michele Caini 619bf9c20d
Fixed broke links to RFC7159 2019-01-09 15:05:09 +01:00
Mark Beckwith a559ff8fc6
typo in README 
inintended -> unintended
 2019-01-08 13:24:07 -06:00
Niels Lohmann 98f4e31c3e
📝 formatted picture 2018-12-21 18:33:46 +01:00
Niels Lohmann 58c269b039
📝 updated documentation 2018-12-21 18:27:56 +01:00
Niels Lohmann 117c1d14fb
📝 added contributors to 3.5.0 2018-12-20 22:20:47 +01:00
kjpus 767a3a327d
Link to issue #958 broken 2018-12-04 10:03:10 -05:00
Niels Lohmann d53873a251
Merge pull request #1363 from theodelrieu/doc/implicit_conversions 
recommend using explicit from JSON conversions
 2018-12-02 17:27:46 +01:00
Manvendra Singh 5de184b8fb
readme: fix typo 2018-12-02 01:50:57 +05:30
Théo DELRIEU 7b961368d5
recommend using explicit from JSON conversions 2018-11-20 14:14:07 +01:00
Axel Huebl f049836d68
CMake: Optional Install if Embedded 
When adding this library as embedded library with private
"target link", e.g. only used inside private source files, the
library does not need to be installed when the main project gets
installed.

This adds an additional option `JSON_Install` similar to the
test-build control switch in order to skip installing headers and
CMake config files if requested.

Avoids using
```cmake
add_subdirectory(path/to/nlohmann_json EXCLUDE_FROM_ALL)
```

which has further side-effects:
https://cmake.org/cmake/help/v3.0/command/add_subdirectory.html
 2018-11-02 10:18:00 +01:00
Axel Huebl 689382a722
Fix EOL Whitespaces & CMake Spelling 
Fix little leftover EOL whitespaces in `CMakeLists.txt` and
a spelling of CMake in README.md
 2018-11-02 09:35:17 +01:00
Niels Lohmann 0f3c74d821
🔖 set version to 3.4.0 2018-10-30 22:18:45 +01:00
Niels Lohmann 85aaf91b85
Merge branch 'develop' into feature/enum_json_mapping 2018-10-27 16:52:59 +02:00
Niels Lohmann ad639ad5e6
✨ added NLOHMANN_JSON_SERIALIZE_ENUM marco #1208 2018-10-26 14:48:20 +02:00
Niels Lohmann 62126278a6
🔨 added fix for arrays 2018-10-25 13:01:18 +02:00
Niels Lohmann f102df3cba
📝 updated documentation #1314 2018-10-24 09:28:57 +02:00
Kostiantyn Ponomarenko f0c55ce0e0 Add Meson related info to README 
Add more information about how one can get a Meson wrap file.

Signed-off-by: Kostiantyn Ponomarenko <konstantin.ponomarenko@gmail.com>
 2018-10-17 21:46:45 +03:00
Niels Lohmann b911654857
📝 updated contributor list 2018-10-04 22:30:18 +02:00
Chuck Atkins 4c617611e2 docs: Add additional CMake documentation 2018-10-02 14:28:20 -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
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
Henry Fredrick Schreiner 7a37ba0c02 Adding 4.8 test to travis 2018-09-27 22:31:39 +02: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 3811daa8a3
📝 release preparation 2018-08-18 12:00:14 +02:00
Niels Lohmann b5c54b41fd
📝 overworked documentation 2018-08-16 21:53:47 +02:00
Niels Lohmann 3ce4325350
📝 updated documentation of used compilers 2018-08-01 22:31:51 +02:00
Niels Lohmann 7bfc406ded
📝 added note about CocoaPods #1148 2018-07-05 21:18:46 +02:00
Niels Lohmann 396a914f9e
🔨 added macro to disable compiler check #1128 2018-06-26 22:47:40 +02:00
Julius Rakow 963d06a13c 📝 fix links to cppreference named requirements 
"Concepts" have been renamed to "named requirements".
This is because P0898R3 Standard Library Concepts has been merged into
C++20.
Cppreference have moved their links accordingly.
 2018-06-24 22:36:19 +02:00
Julius Rakow 9f00db48d9 📝 link to cppreference via HTTPS 2018-06-24 22:34:47 +02:00
Niels Lohmann 62457729e8
📝 mentioned MinGW in README 2018-06-24 18:03:59 +02:00
Niels Lohmann 0460b90977
📝 fix for #1052 #1139 2018-06-22 22:35:48 +02:00
Niels Lohmann 8efbf8d7bb
📝 documentation to avoid future issues like #1108 2018-05-28 18:14:44 +02:00
martin-mfg 377e956655
fix typo in readme 
The README says:
> "The library itself contains of a single header file ..."

I guess "consists of a" is the wording that was intended here. Alternatively, "contains a" might also be what was intended. Either way, I think both versions work equally well and thus choose the one that I believe was intended.
 2018-05-03 22:42:52 +02:00
Niels Lohmann 86b0732a10
📝 added public key used for commits and releases 2018-05-03 18:11:42 +02:00
Niels Lohmann 46ec2fddf8
📝 updated THANKS list 2018-04-10 18:13:37 +02:00
James Upjohn 7f20e9ddc7
Fixed incorrect version number in README 
clang-900.0.39.2 is from LLVM 9.0.0, not 8.1.0
 2018-04-10 17:16:44 +12:00
Axel Huebl 1ae9896387
Package Manager: Spack 
I contributed a package to the Spack package manager.

Spack is a flexible package manager that supports multiple versions,
configurations, platforms, and compilers. It is popular in
high-performance computing.
 2018-04-08 01:12:49 +02:00
Niels Lohmann afef474c0d
🔖 set version to 3.1.2 2018-03-14 21:09:27 +01:00
Niels Lohmann b56ac86471
📝 thanks for #1006 2018-03-12 18:44:19 +01:00
Niels Lohmann 9918523077
📝 cleanup after #1001 2018-03-09 21:31:46 +01:00
Niels Lohmann 1f3d2a3be7
📝 overworked README 2018-02-26 17:37:24 +01:00
Wilson 05d3bf1699 Make integration section concise 2018-02-25 22:12:44 -08:00
Niels Lohmann 938c861a09
🔖 set version to 3.1.1 2018-02-12 22:59:36 +01:00
Niels Lohmann addbbbe136
Merge branch 'develop' of https://github.com/nlohmann/json into develop 2018-02-09 23:32:37 +01:00
Niels Lohmann 0a64982e86
📝 cleanup after #954 2018-02-09 23:32:28 +01:00
Niels Lohmann e5d538c5ea
Merge pull request #954 from pfultz2/patch-1 
Add a note about installing the library with cget
 2018-02-09 23:28:54 +01:00
Paul Fultz II 5731695d7b
Clarify dev version and add space after the word flag. 2018-02-09 15:45:20 -06:00
Paul Fultz II 50863c5a09
Latest updates based on feedback 2018-02-09 15:35:46 -06:00
Niels Lohmann 8b457ace25
🐛 fixing CBOR's indefinity length strings #961 
Beside the fix discussed in #961, we also had to re-adjust a test case. It seems that it was failing before, and I "fixed" it to work with the broken implementation...
 2018-02-06 20:43:03 +01:00
Patrik Huber ee76436592
Change to angle brackets 2018-02-06 11:29:37 +00:00
Patrik Huber ae688016f6
Changed links from master to develop branch 2018-02-04 12:41:46 +00:00
Patrik Huber 44b40d7c6a
Fix links in README.md 2018-02-03 15:48:02 +00:00
Paul Fultz II 3402260983
Add a note about installing the library with cget 2018-02-02 11:13:13 -06:00
Niels Lohmann 0258484626
🔖 set version to 3.1.0 
- updated documentation wrt. new repository layout
- temporarily switched off Homebrew --HEAD building (can only be switched on after release)
- set copyright date to 2018
 2018-02-01 22:20:26 +01:00
Niels Lohmann b3bd3b726b
📝 added link to OSS-Fuzz project repository 2018-01-28 21:02:02 +01:00
Niels Lohmann e95578f884
📝 documented JSON Merge Patch (RFC 7386) 2018-01-28 14:36:17 +01:00
Niels Lohmann 1be3935e9d
📝 cleanup after #936 2018-01-27 17:43:44 +01:00
Niels Lohmann 0e2211df0e
Merge pull request #925 from zerodefect/improvement/improve_readme_json_fwd 
Howto installation of json_fwd.hpp (fixes #923)
 2018-01-25 17:11:21 +01:00
Niels Lohmann dbfd7e532b
Merge branch 'develop' of https://github.com/nlohmann/json into develop 2018-01-23 16:33:10 +01:00
Niels Lohmann 3c68a796df
🔥 deprecated iterator_wrapper #874 
Also fixed some warnings from GCC.
 2018-01-23 16:33:08 +01:00
Vadim Evard fc32b8a9bc
Fix a typo in README.md 2018-01-22 13:14:39 +03:00
Niels Lohmann 3cca630836
🔨 cleanup after #915 2018-01-21 15:55:35 +01:00
Niels Lohmann 010e596001
Merge pull request #915 from abolz/dtoa 
Floating-point formatting
 2018-01-21 15:02:57 +01:00
Niels Lohmann 3d776b0582
📝 updated README 2018-01-21 14:13:42 +01:00
zerodefect d2b3fd156e Updated README.md to explain how installation of json_fwd.hpp can be achieved as part of install step. 2018-01-19 11:42:53 +00:00
Niels Lohmann a8f711a2f1
➕ using Google Benchmark #921 2018-01-18 21:57:21 +01:00
abolz 332f352033 Add an implementation of the Grisu2 algorithm for binary to decimal floating-point conversion 
This is an attempt to fix #360. The algorithm produces
decimal representations which are guaranteed to roundtrip
and in ~99.8% actually produces the shortest possible
representation. So this is a nice compromise between using
a precision of digits10 and max_digits10.

Note 1:

The implementation only works for IEEE single/double precision
numbers. So the old implementation is kept for compatibility
with non-IEEE implementations and 'long double'.

Note 2:

If number_float_t is 'float', not all serialized numbers can
be recovered using strtod (strtof works, though). (There is
exactly one such number and the result is off by 1 ulp.)
This can be avoided by changing the implementation (the fix
is trivial), but then the resulting decimal numbers are not
exactly short.
 2018-01-15 21:07:26 +01:00
Niels Lohmann 411c16cbb2
📝 overworked documentation wrt. amalgamation #906 2018-01-14 13:08:28 +01:00
Niels Lohmann fea5f3792b
📝 it's 2018 2018-01-14 10:41:59 +01:00
Tobias Hermann ba2316372a
fix link to the documentation of the emplace function 2018-01-03 11:06:32 +01:00
Niels Lohmann 92484f0caf
🔖 set version to 3.0.1 2017-12-29 18:31:13 +01:00
Niels Lohmann 3c76ff353d
📝 updated docs after PRs 2017-12-29 16:52:09 +01:00
Niels Lohmann 1856f38c85
📝 removed paragraph on version 3.0.0 2017-12-17 11:22:35 +01:00
Niels Lohmann 9eb5e2c271
🔖 set version to 3.0.0 2017-12-17 08:40:19 +01:00
Niels Lohmann c23f5dcea6
📝 fixed year 2017-12-15 23:49:37 +01:00
Niels Lohmann 261caec2de
👥 added contributor image 2017-12-14 22:29:39 +01:00
Niels Lohmann fb8482db76
👌 fixed some issues from the last commit #875 2017-12-13 23:44:53 +01:00
Niels Lohmann 293748a9a9
📝 overworked README 
- Added recent contributors to thanks list.
- Linked PGP key for private mails.
- Updated compiler list.
 2017-12-13 22:17:02 +01:00
Niels Lohmann 569d275f65
💥 throwing an exception in case dump encounters a non-UTF-8 string #838 
We had a lot of issues with failing roundtrips (i.e., parse errors from serializations) in case string were stored in the library that were not UTF-8 encoded. This PR adds an exception in this case.
 2017-12-11 22:38:05 +01:00
Niels Lohmann 772bb3cc20
📝 fixing documentation #867 
The example in the documentation on how to "force" an array of arrays was wrong since the first release. Fixed the documentation and added checks for the README unit tests.
 2017-12-10 12:32:20 +01:00
Niels Lohmann 25d205c16d
📝 clarified difference between serialization and string value retrieval #853 2017-12-06 21:42:36 +01:00
Jorrit Wronski 7b8ddadd83
removed hunter badge 2017-11-16 21:01:27 +01:00
Jorrit Wronski b5ddd99adf
Updated hunter package links 2017-11-15 08:48:11 +01:00
Niels Lohmann 4c4f60f438
📝 fixes #820 2017-11-06 20:35:05 +01:00
Itja e423aea64a
Typos README 
Hey, thanks for this great library which I've used in many occasions now. I know it's not much, but I wanted to contribute at least a tiny bit back to you by this PR :-) Keep up the good work!
 2017-10-31 16:31:14 +01:00
Niels Lohmann cea3f24ff9
📝 comment to address #561 2017-10-27 16:39:52 +02:00
Niels Lohmann 7820b5eccb
📝 thanks for #795 2017-10-27 11:49:17 +02:00
Niels Lohmann b0c380b0f8
📝 cleanup after the last PRs 2017-10-22 09:12:35 +02:00
Niels Lohmann 0c0851dbea
📝 comment how to integrate tsl::ordered_map (#546) 2017-10-05 20:36:18 +02:00
Niels Lohmann bab4a15748
📝 comment how to integrate fifo_map (#485) 2017-10-05 20:33:27 +02:00
Niels Lohmann 60439aff05
📝 different cmake call 2017-10-05 19:43:59 +02:00
Niels Lohmann 99ee4c1eaf
🔨 cleaned up Makefiles and docs #698 2017-10-04 19:27:35 +02:00
gregmarr ec60ff3451 Add info for the vcpkg package. 2017-09-26 08:39:38 -07:00
Niels Lohmann cd53790993
👷 using Clang 5.0 2017-08-21 20:03:24 +02:00
Niels Lohmann 76123fab76
📝 added note wrt. #667 2017-08-15 20:49:18 +02:00
Niels Lohmann bade3b3e6c
👷 cleanup 2017-08-10 21:17:40 +02:00
Niels Lohmann 99ea12f304
📝 acknowledgements for #674, #678, #682, #685, and #686 2017-08-10 06:50:34 +02:00
Markus Werle 86b3d06a93 remove duplicate word 
s/to to/to/
 2017-08-09 11:56:48 +02:00
dan-42 db0b9732d4 DOC: add sort mentioning about support in hunter 2017-07-31 23:20:37 +02:00
Niels Lohmann 850d856aae
🔨 cleanup after #663 2017-07-30 20:30:05 +02:00
Niels Lohmann 504012a3db
📝 cleanup after #650 
As <iostream> is not included in json.hpp any more, all code examples need to include <iostream> now.
 2017-07-09 11:51:38 +02:00
Niels Lohmann 1b2fabe802
👷 adding two recent Clang versions 
Maybe the simple approach is working now - at least it is in https://github.com/taocpp/PEGTL/blob/master/.travis.yml
 2017-07-09 11:10:18 +02:00
Niels Lohmann 6f12749ef6
📝 added version string for Xcode 9 2017-07-08 12:55:05 +02:00
Niels Lohmann 32065c8045
📝 fix for #639 
Removed deprecated documentation of the comparison operator.
 2017-07-07 21:16:33 +02:00