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

284 commits

Author SHA1 Message Date
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
Niels Lohmann b911654857
📝 updated contributor list 2018-10-04 22:30:18 +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
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 9f3857ef6f
🔖 set version to 3.2.0 2018-08-18 18:46:15 +02:00
Niels Lohmann a7b02bdce0
🔖 preparing 3.2.0 release 2018-08-18 17:48:49 +02:00
Niels Lohmann c6a482b16c
📝 added example for sax_parse 2018-08-18 15:42:18 +02:00
Niels Lohmann e33b31e6aa
🐛 fixed callback-related issue (https://github.com/nlohmann/json/issues/971#issuecomment-413678360) 2018-08-17 23:09:45 +02:00
Niels Lohmann b5c54b41fd
📝 overworked documentation 2018-08-16 21:53:47 +02:00
Niels Lohmann 46ec2fddf8
📝 updated THANKS list 2018-04-10 18:13:37 +02:00
Niels Lohmann 830c93fd09
📝 fixed example for operator> #1029 2018-03-29 17:07:55 +02:00
Niels Lohmann 8a6c8cb0f7
🔖 set version to 3.1.2 2018-03-14 21:32:03 +01:00
Niels Lohmann afef474c0d
🔖 set version to 3.1.2 2018-03-14 21:09:27 +01:00
Niels Lohmann 1f3d2a3be7
📝 overworked README 2018-02-26 17:37:24 +01:00
Niels Lohmann 8424d10e45
🔖 set version to 3.1.1 2018-02-13 15:59:32 +01:00
Niels Lohmann 938c861a09
🔖 set version to 3.1.1 2018-02-12 22:59:36 +01:00
Niels Lohmann 61f0bfb15c
🔨 enforce using Python 2 for the wandbox script 2018-02-11 14:46:15 +01:00
Niels Lohmann 0a64982e86
📝 cleanup after #954 2018-02-09 23:32:28 +01: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 552d153842
📝 added more statistics on binary formats 2018-01-31 21:54:38 +01:00
Niels Lohmann 51c774f208
📝 added documentation for binary formats 2018-01-31 17:23:11 +01:00
Niels Lohmann ce273af9b6
📝 added documentation for binary formats 2018-01-30 23:20:36 +01:00
Niels Lohmann 52e9449563
📝 added more functions to overview 2018-01-28 20:44:45 +01:00
Niels Lohmann 1be3935e9d
📝 cleanup after #936 2018-01-27 17:43:44 +01:00
Niels Lohmann 3c68a796df
🔥 deprecated iterator_wrapper #874 
Also fixed some warnings from GCC.
 2018-01-23 16:33:08 +01:00
Niels Lohmann 7eabb6ba36
📝 updated documentation for UBJSON functions 2018-01-22 23:23:17 +01:00
Niels Lohmann 3d776b0582
📝 updated README 2018-01-21 14:13:42 +01:00
Niels Lohmann 0e8f01a963
Merge branch 'develop' into feature/rfc7396 2018-01-14 10:28:09 +01:00
Niels Lohmann 78f8f837e6
added items() function #874 2018-01-05 18:34:10 +01:00
Niels Lohmann 96b40b27a5
📝 fixed Doxygen warnings 
Apparently, using "\n" inside an alias is an error now, but "^^" basically means the same.
 2018-01-05 18:33:42 +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 3113a52a7d
📝 added exception 403 to documentation of at (#888) 
The at function throws json::out_of_range.403 when a nonexistent object key is provided (just like the usual at function). This was not documented and users could assume json::out_of_range.404 would be thrown instead.

- Updated documentation.
- Added example code.
 2017-12-23 18:38:18 +01:00
Niels Lohmann 88ddb12afc
📝 fix for #883 
- Adjusted table to user-defined exceptions. This was forgotten in the 3.0.0 update.
- Added update function to the table.
 2017-12-18 19:46:53 +01:00
Niels Lohmann 106f9f5436
⬆️ updated git-update-ghpages script 2017-12-17 10:20:30 +01:00
Niels Lohmann 9e3c4ad11f
🔖 set version to 3.0.0 2017-12-17 08:31:18 +01:00
Niels Lohmann 314e4e7699
📝 improved documentation for dump and iterator_wrapper 2017-12-16 23:58:10 +01:00
Niels Lohmann f3bd755cab
➖ removing <iomanip> header 2017-12-16 12:37:25 +01:00
Niels Lohmann 261caec2de
👥 added contributor image 2017-12-14 22:29:39 +01:00
Niels Lohmann c6e7eae394
✨ implemented JSON Merge Patch (RFC 7396) 
SQLite's json1 extension (https://www.sqlite.org/json1.html) supports JSON Merge Patch (https://tools.ietf.org/html/rfc7396). As the implementation is trivial and we already support JSON Patch, I think this could be a nice extension to the library.
 2017-12-13 23:36:22 +01:00
Niels Lohmann 61cc07ff38
📝 some documentation 2017-10-27 16:07:04 +02:00
Nate Vargas 727ee7d03e Set GENERATE_TAGFILE in Doxyfile 
Allows documentation to be linked from other projects to https://nlohmann.github.io/json using Doxygen with the tag:
TAGFILES = $(SOME_PATH)/nlohmann_json.tag=https://nlohmann.github.io/json
 2017-10-14 19:06:38 -05:00
Niels Lohmann 1a66527dca
📝 fixed documentation #745 2017-09-30 10:18:18 +02:00
Niels Lohmann c607b5c2ac
📝 improved documentation 2017-09-06 17:14:06 +02:00
Niels Lohmann 91e0032853
📝 improved documentation 2017-08-29 23:46:26 +02:00
Niels Lohmann 72afe53fa0
📝 updated documentation for update() function #661 2017-08-15 21:42:50 +02:00
Niels Lohmann c819a2d732
🔨 refactored some scanner internals 2017-07-28 19:18:50 +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 f697fec522
📝 fixed documentation 
There was an issue in the documentation example before. Unfortunately, I did not recreate the example outputs.
 2017-07-08 22:16:45 +02:00
Chocobo1 0395f3fdfb fix typo 2017-06-21 21:41:34 +08:00
Niels Lohmann 0c3ffe12cd
⏪ reverting first/second experiment #350 2017-05-15 21:07:58 +02:00
Niels Lohmann 962da00171
✨ implemented an indentation character #520 
An optional parameter for dump() allows to set the character to use for
indentation (default: space). In case a JSON value is serialized to an
output stream, its fill character is used (and can be set with
std::setfill).
 2017-05-07 19:27:40 +02:00
Niels Lohmann ecf895f2d1
📝 mentioned value function on main doc page #570 2017-05-05 16:42:22 +02:00
Niels Lohmann c42273d2a0
📝 fixed documentation #565 
The documentation mismatched the actual code.
 2017-04-23 21:46:30 +02:00
Niels Lohmann 9b32f72584
📝 fixed examples for Wandbox 
As I learned in https://github.com/melpon/wandbox/issues/209, this
library is already installed at Wandbox, so we need to adjust the
examples to use `#include "json.hpp"` insteas of `#include <json.hpp>`.
 2017-04-21 22:07:07 +02:00
Niels Lohmann aea47422a2
📝 updated links and output 2017-04-14 18:13:01 +02:00
Niels Lohmann 6b6e554067
🐛 added missing header 
std::setw needs the iomanip header (at least with GCC).
 2017-04-14 17:37:28 +02:00
Niels Lohmann 951d0920fc
🐛 fixed README example 
The example with the size() operator is bad: using operator[] already
changes the size of the object. The fix makes it clearer.
 2017-04-14 17:36:45 +02:00
Niels Lohmann e2f6cf7f46
🔥 removed .test files 
These files were never meant to be versioned.
 2017-04-14 17:35:31 +02:00
Niels Lohmann 97a25de938
✨ proposal for #428 
This implementation forwards the iterators to std::map::insert.
 2017-04-07 18:29:09 +02:00
Niels Lohmann b8b4362ca4
🔥 removed accidentally committed binaries 2017-03-13 19:04:19 +01:00
Niels Lohmann 28dbe4e651
📝 overworked documentation for the at functions 
Added all possible exceptions to the examples of the at functions.
 2017-03-12 13:49:39 +01:00
Niels Lohmann 0f6b8aa718
📝 more documentation for the new exceptions 2017-03-08 23:30:38 +01:00
Niels Lohmann 1ab580d6e9
📝 more documentation for the new exceptions 2017-03-08 23:12:13 +01:00
Niels Lohmann fe71e7df1f
📝 overworked documentation 
Replacing references to std exceptions with user-defined exceptions.
Also changed some examples to the new exceptions.
 2017-03-08 21:03:19 +01:00
Niels Lohmann c085e3bac2
🔨 started with user-defined exceptions #301 #244 
Added class hierarchy for user-defined exceptions (#244). Integrated
parse exceptions 101-103. Parse exceptions include the byte count of
the last read character to locate the position of the error (#301).
 2017-03-01 21:28:44 +01:00
Niels Lohmann 7b8fd864e2
🔥 removed deprecated constructor #480 
The constructor basic_json(std::istream&, const parser_callback_t) has
been deprecated since version 2.0.0. This commit removes it together
with its code example, deprecation macro, and test cases. The code now
also compiles with -W-deprecated-declarations.
 2017-03-01 17:49:03 +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 967f9144d4
🚧 overworked fix for #465 2017-02-21 19:11:34 +01:00
Niels Lohmann 0ffa18aab8
📝 listing projects using the library 2017-02-08 19:16:38 +01:00
Niels Lohmann 6746a57524 📝 updated slides 2017-01-28 18:41:30 +01:00
Niels Lohmann eb08e8b09b 📝 updated documentation 2017-01-28 18:20:12 +01:00
Niels Lohmann 38e4935db0 📝 added example and documentation for the meta function 2017-01-28 17:12:29 +01:00
Niels Lohmann d870826811 🔖 set version to 2.1.0 2017-01-28 16:03:35 +01:00
Niels Lohmann 2f6260751c 📝 fixed #434 2017-01-27 18:50:52 +01:00
Niels Lohmann 94d9b7bc86 📝 overworked documentation (re-added constructor examples) 2017-01-25 21:59:54 +01:00
Théo DELRIEU af94e712c7 add basic doxygen documentations 2017-01-21 16:14:22 +01:00
Niels Lohmann ce0b3fe5a3 🚧 made type_name() public 2017-01-21 16:12:17 +01:00
Niels Lohmann 7e2c4b3ead 📝 updated online link 2017-01-02 16:37:29 +01:00
Niels Lohmann 69c615e127 🔖 version bump to 2.0.10 2017-01-02 10:00:44 +01:00
Niels Lohmann 8b46eb8ec0 📄 it's 2017 already 2017-01-02 09:40:00 +01:00
Niels Lohmann 60b3703c62 🔖 version bump to 2.0.10 2017-01-02 09:35:57 +01:00
Niels Lohmann 6e129fbfb7 📝 some small documentation fixes 2016-12-25 14:39:08 +01:00
Niels Lohmann 57afd293aa 🔖 updated documentation 2016-12-16 21:34:37 +01:00
Niels Lohmann a507b9b46a 🔖 updated documentation 2016-12-16 21:25:20 +01:00
Niels Lohmann 303e873ae8 🔖 bumped version to 2.0.9 2016-12-16 20:45:46 +01:00
Niels Lohmann dc6fc3e079 📝 clean up and added documentation for #358 2016-12-11 13:36:08 +01:00
Niels Lohmann 44c0f811b1 🔖 version 2.0.8 2016-12-02 20:05:53 +01:00
Niels Lohmann 4adb8a81bf 📝 version bump 2016-12-02 18:39:35 +01:00
Niels Lohmann aeb4f87a27 ✨ added return value for emplace (#349) 2016-11-28 18:33:46 +01:00
Niels 1be73b903e proposal for emplace/emplace_back (#349) 2016-11-11 19:29:14 +01:00
Niels 700977d73e version bump 2016-11-02 20:52:15 +01:00
Niels 3ebe28970a small fixes 2016-10-23 17:25:07 +02:00
Niels 606098f45d release 2.0.6 2016-10-15 16:47:45 +02:00
Niels 2fa8ea0f74 started fixing #323 2016-10-08 14:27:28 +02:00
Vasil Dimov b5128b1610
Fix usage examples' comments for std::multiset 2016-10-04 18:53:44 +03:00
Niels e4366688f7 v2.0.5 2016-09-14 23:42:12 +02:00
Niels 3d104f1d43 version bump 2016-09-14 23:06:39 +02:00
Niels 768d66560e version bump 2016-09-11 23:36:59 +02:00
Niels 357baeff5a release 2.0.3 2016-09-01 08:07:52 +02:00
Niels 42be2edd4c fixed test coverage 2016-09-01 00:29:42 +02:00
Niels df9fd6237e release 2.0.3 2016-08-31 21:27:23 +02:00
Niels ae7aaed4ac Merge branch 'develop' into feature/iterator_range_parsing 2016-08-31 18:07:18 +02:00
Niels 442058f8ed interface cleanup 2016-08-31 17:07:35 +02:00
Niels 04c6c886eb another experiment 2016-08-24 21:02:33 +02:00
Niels a79d634ccb integrated proposals for #290 2016-08-22 21:40:07 +02:00
Niels b4571360df more on #290 2016-08-21 12:35:40 +02:00
Niels 4444ef9396 version bump 2016-07-31 14:39:15 +02:00
Niels a05df038cd prepared release 2016-07-31 13:37:04 +02:00
Niels bdaade91f5 fixed some errors in the README gif 2016-07-27 17:07:00 +02:00
Niels d08e013dd0 improved documentation 2016-07-25 16:06:13 +02:00
Niels 4e7501e59a minor changes 
- fixed a bug that did not discard strings with control characters
between 0x10 and 0x1f
- added termination proofs for two important loops
- made get_ref() constexpr
 2016-07-22 15:34:45 +02:00
Niels b64367e2f7 fix for #279 2016-07-18 16:22:10 +02:00
Muri Nicanor 01f9ee5fd7 let the makefile choose the correct sed 2016-07-09 20:02:41 +02:00
Niels 26cab42c38 some minor improvements 2016-07-01 16:52:05 +02:00
Niels 1c719561b0 update of documentation links 2016-06-24 00:14:27 +02:00
Niels b3cf45c8f5 updated release information 2016-06-23 23:34:41 +02:00
Niels 4e31a0e852 minor doc changes 2016-06-19 16:17:53 +02:00
Niels 04e1e7b586 cleanup 2016-05-29 14:56:08 +02:00
Niels aa8aa3ba9f overworked coverity stuffy 2016-05-29 14:06:43 +02:00
Niels 0a393b8374 indentation cleanup 2016-05-12 07:34:36 +02:00
Niels 9ecf83f630 working on #235 2016-05-08 20:28:20 +02:00
Niels ea84a85b13 simplified flatten/unflatten examples 2016-04-30 10:39:03 +02:00
Niels 1d3b4dd158 added test cases 2016-04-30 00:03:47 +02:00
Niels 5e0bf75d60 cleanup, test, and diff 2016-04-25 23:17:04 +02:00
Niels f4107d0d9c updated documentation 2016-04-17 23:36:37 +02:00
Niels 08c97df420 added examples 2016-04-17 23:18:07 +02:00
Niels 6268287940 improved documentation and test coverage 2016-04-17 22:08:21 +02:00
Niels f883a04c87 more documentation 2016-04-17 18:18:49 +02:00
Niels 40e899a819 cleanup and documentation 2016-04-17 17:39:35 +02:00
Niels d869b0a387 updated online documentation 2016-02-14 22:28:56 +01:00
Niels a69b1a6f0b added noexcept and constexpr 2016-02-14 16:42:48 +01:00
Niels 236b7afff5 updated and fixed online version 2016-02-07 15:07:17 +01:00
Niels fdfb39d949 improved documentation 2016-02-07 14:55:29 +01:00
Niels ae5bd307a2 improved documentation 2016-02-05 22:30:25 +01:00
Niels 2c720b26ab added a constructor from an input stream 2016-02-05 19:24:42 +01:00
Niels 6aa881988d improved documentation 2016-01-31 13:05:39 +01:00
Niels 22127a4b85 moved documentation to index markdown file 2016-01-30 22:05:01 +01:00
Niels 9d063d90e3 removed "using namespace" from examples 2016-01-30 20:23:14 +01:00
Niels 89b07bd3af added (generated) changelog 2016-01-26 22:59:57 +01:00
Niels 2468631dc9 overworked examples 2016-01-26 20:07:03 +01:00
Niels 2b13711009 updated online version 2016-01-24 23:02:28 +01:00
Niels c09d03fba7 fixed documentation 2016-01-24 22:43:00 +01:00
Niels a04bd4f851 cleanup after #184 2016-01-20 21:14:58 +01:00
dariomt e1645a09e9 Merge branch 'master' of https://github.com/nlohmann/json 2016-01-18 10:08:58 +01:00
Niels aca6a3b373 version number 2015-12-28 15:04:15 +01:00
Niels cb5581392a preparing 1.0.0 release 2015-12-28 14:51:57 +01:00