Commit graph

386 commits

Author SHA1 Message Date
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
Niels Lohmann b9a8425cc8
📝 cleanup after #629 and #630 2017-06-21 18:55:25 +02:00
Niels Lohmann c2044205ef
📝 updated used compilers 2017-06-20 16:12:14 +02:00
Niels Lohmann b79a1a2678
📝 update after #626 2017-06-18 00:00:31 +02:00
Niels Lohmann e1ca484bc1
📝 added note about Conan #566 2017-06-17 11:20:09 +02:00
Niels Lohmann 5fa5c17bc6
✏️ cleanup after #595 2017-06-10 18:29:16 +02:00
Niels Lohmann 92ef19696a
✏️ cleanup after #598 2017-06-06 20:48:11 +02:00
Niels Lohmann 0c3ffe12cd
reverting first/second experiment #350 2017-05-15 21:07:58 +02:00
Jay Sistar 87744fd594 Missed one. 2017-05-09 02:04:02 +00:00
Jay Sistar 0719287e44 Reducing chatter about Meson. 2017-05-09 02:01:55 +00:00
Jay Sistar 31fe2f5825 Adding support for Meson. 2017-05-08 13:35:00 +00:00
Niels Lohmann dbcb032f22
Merge branch 'develop' into feature/manual_lexer 2017-05-05 16:48:47 +02:00
Niels Lohmann 19d2dec8b6
📝 added badge from isitmaintained.com 2017-05-03 22:49:21 +02:00
Niels Lohmann c42273d2a0
📝 fixed documentation #565
The documentation mismatched the actual code.
2017-04-23 21:46:30 +02:00
Niels Lohmann 734297ff45
🔨 cleanup 2017-04-23 20:32:05 +02:00
Niels Lohmann 5bea6f383a
✏️ fixed a typo 2017-04-11 18:57:53 +02:00
Niels Lohmann d07596a0ea
📝 mentioned #540 and fixed #538 2017-03-30 17:39:02 +02:00
Niels Lohmann 19cd206d99
📝 documented Xcode 8.3 2017-03-28 21:39:16 +02:00
Niels Lohmann cc36c65a89
🚑 made exceptions nothrow-copy-constructible #531
To have nothrow-copy-constructible exceptions, we inherit from
std::runtime_error which can cope with arbitrary-length error messages.
Intermediate strings are built with static functions and then passed to
the actual constructor.
2017-03-25 16:22:52 +01:00
Niels Lohmann 20bcf1015b
📝 cleanup after #536 2017-03-25 14:19:05 +01:00
Niels Lohmann 3d597dda5d
📝 update after #534 2017-03-24 19:51:11 +01:00
Berkus Decker b14629b0a6 Fix typo 2017-03-23 14:50:41 +02:00
Niels Lohmann 54db53c230
📝 update after #527 and #525 2017-03-22 08:10:31 +01:00
Alexander “weej” Jones 836f1c4189 🎨 Namespace uint8_t from the C++ stdlib 2017-03-16 18:24:41 +00:00
Niels Lohmann c7afb34e57
🎨 cleanup after #496
Ran “make pretty” and added a note to the README file.
2017-03-11 16:01:26 +01:00
Niels Lohmann a1354184ce
📝 fixed typo #481 2017-03-03 12:56:54 +01:00
Niels Lohmann 6b3912d936
📝 added note to 3.0.0 wiki page #474
I created a wiki page
https://github.com/nlohmann/json/wiki/Road-toward-3.0.0 to describe the
transition toward version 3.0.0. On this page, all API-breaking changes
shall be documented.
2017-03-01 17:26:32 +01:00
Niels Lohmann f84ac523aa
📝 added a note to ordered maps
The library does not preserve the insertion order of object keys. There
are frequent requests to change the library in this aspect. The README
and the contribution guidelines now contain links to containers that
can be used to replace std::map to preserve the insertion order.
2017-03-01 10:15:07 +01:00
Niels Lohmann 9ff0cc0f02
📝 updated documentation 2017-02-25 16:43:15 +01:00
Niels Lohmann 27c65b860b
🔖 version 2.1.1 2017-02-25 16:34:38 +01:00
Niels Lohmann 0234e53e23
📝 added section on used third-party tools 2017-02-22 20:48:52 +01:00
Niels Lohmann 345a106d73
💄 cleanup 2017-02-22 16:56:56 +01:00
Niels Lohmann 7a4a16a7db
💄 updated header list 2017-02-20 16:20:45 +01:00
Niels Lohmann 057b1e606b
🔀 merged #415 (fix for #414) 2017-02-16 08:50:20 +01:00
Niels Lohmann 82fb613763
📝 update after #302 2017-02-14 07:28:30 +01:00
Niels Lohmann ed8516dc39
👷 added Codacy badge 2017-02-09 17:38:02 +01:00
Niels Lohmann c485d46cea
📝 screenshoots look ugly 2017-02-08 20:00:46 +01:00
Niels Lohmann 6fd77cea4a
📝 added screenshots 2017-02-08 19:22:19 +01:00
Niels Lohmann 0ffa18aab8
📝 listing projects using the library 2017-02-08 19:16:38 +01:00
Niels Lohmann 163f8397fd ✏️ fixed a typo #446 2017-02-05 17:11:26 +01:00
Niels Lohmann 77d6f70602 📝 acknowledgments for #442 and #445 2017-02-03 18:28:22 +01:00
Niels Lohmann d6afaa8e16 📝 fixing a documentation issue #442 2017-02-03 18:15:37 +01:00
Niels Lohmann 16af771277 added roundtrip test for the Big List of Naughty Strings 2017-02-01 17:34:39 +01:00