Niels Lohmann
a8f711a2f1
➕ using Google Benchmark #921
2018-01-18 21:57:21 +01:00
Niels Lohmann
541b46132d
♻️ adjusted code to split headers
2018-01-14 10:34:43 +01:00
Niels Lohmann
0e8f01a963
Merge branch 'develop' into feature/rfc7396
2018-01-14 10:28:09 +01:00
Niels Lohmann
85173f5627
🔨 some clean up
2018-01-10 10:18:31 +01:00
Niels Lohmann
ce53537ba2
➖ ➕ replaces amalgamation tool
...
The tool used before created a lot of duplicates inside the generated amalgamation. The new tool is a single Python file which seems to do the same job.
2018-01-09 23:15:06 +01:00
Niels Lohmann
0a2920e0fd
♻️ reorganized code
2018-01-09 18:30:02 +01:00
Théo DELRIEU
57d822b6e2
add missing includes, put back include comments
2018-01-08 20:09:41 +01:00
Théo DELRIEU
9cab30cfce
add adl_serializer.hpp
2018-01-08 20:09:38 +01:00
Théo DELRIEU
8e9714fe3d
add detail/json_ref.hpp
2018-01-08 20:09:35 +01:00
Théo DELRIEU
a3473fda6a
add detail/serializer.hpp
2018-01-08 20:09:33 +01:00
Théo DELRIEU
c117515e31
add detail/parsing/binary_writer.hpp
2018-01-08 20:09:29 +01:00
Théo DELRIEU
d620f76f0d
add detail/parsing/binary_reader.hpp
2018-01-08 20:09:27 +01:00
Théo DELRIEU
4dbb433a79
add detail/parsing/output_adapters.hpp
2018-01-08 20:09:24 +01:00
Théo DELRIEU
ae6f66048c
add detail/iterators/json_reverse_iterator.hpp
2018-01-08 20:09:21 +01:00
Théo DELRIEU
5fc9ef2b90
add detail/iterators/iteration_proxy.hpp
2018-01-08 20:09:18 +01:00
Théo DELRIEU
bf06cf6c22
add detail/iterators/iter_impl.hpp
2018-01-08 20:09:15 +01:00
Théo DELRIEU
3e65a65290
add detail/iterators/internal_iterator.hpp
2018-01-08 20:09:13 +01:00
Théo DELRIEU
51ecc31db7
add detail/iterators/primitive_iterator.hpp
2018-01-08 20:09:10 +01:00
Théo DELRIEU
9ea25685a8
add detail/parsing/parser.hpp
2018-01-08 20:09:06 +01:00
Théo DELRIEU
3a0743db97
add detail/parsing/lexer.hpp
2018-01-08 20:09:04 +01:00
Théo DELRIEU
7ab3e8d7b3
add detail/parsing/input_adapters.hpp
2018-01-08 20:09:01 +01:00
Théo DELRIEU
21881606f2
add detail/conversions/to_json.hpp
2018-01-08 20:08:58 +01:00
Théo DELRIEU
e0c02c14f0
add detail/conversions/from_json.hpp
2018-01-08 20:08:55 +01:00
Théo DELRIEU
7056b375c4
add detail/value_t.hpp
2018-01-08 20:08:52 +01:00
Théo DELRIEU
8c555db970
add detail/exceptions.hpp
2018-01-08 20:08:50 +01:00
Théo DELRIEU
f364f5ac5a
add detail/meta.hpp
2018-01-08 20:08:47 +01:00
Théo DELRIEU
d686713f91
add detail/macro_{un}scope.hpp
2018-01-08 20:08:44 +01:00
Théo DELRIEU
5bffc95773
add json_fwd.hpp
2018-01-08 20:08:38 +01:00
Niels Lohmann
78f8f837e6
added items() function #874
2018-01-05 18:34:10 +01:00
Niels Lohmann
92484f0caf
🔖 set version to 3.0.1
2017-12-29 18:31:13 +01:00
Niels Lohmann
d45183d426
Merge branch 'develop' of https://github.com/nlohmann/json into develop
2017-12-28 13:52:26 +01:00
Niels Lohmann
3b3b6e8e69
🚑 fix for #894
...
- Implemented "copy" in terms of "add".
- Added check for JSON Pointer array indices to make sure the complete reference token was processed.
- Added test suite from https://github.com/json-patch/json-patch-tests
2017-12-28 13:52:23 +01:00
Matthew K. Gumbel
72bff90ed9
🔧 Fix up a few more effc++ items
2017-12-24 10:03:36 -08: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
Eren Okka
ab0e8b2f3a
Fix MSVC warning C4819
...
Replaces a U+00A0 character with regular space, and fixes a typo.
2017-12-17 18:02:55 +03: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
9a51fb4da2
🚨 fixed some warnings
2017-12-16 22:19:30 +01:00
Niels Lohmann
980795b644
✏️ fixed typos
2017-12-16 12:37:44 +01:00
Niels Lohmann
2e1b1061cd
Merge pull request #875 from nlohmann/feature/spelling
...
Overworked library toward 3.0.0 release
2017-12-14 22:31:19 +01:00
Niels Lohmann
fb8482db76
👌 fixed some issues from the last commit #875
2017-12-13 23:44:53 +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
e8d9963abe
👌 cosmetic changes and overworked spelling
...
- All hex literals use upper case letters after the x.
- Fixed sime typos.
- Documented some more functions.
2017-12-13 22:15:53 +01:00
Niels Lohmann
a9a4ff61c6
🚨 remove C4996 warnings #872
...
These were the remaining direct calls to alloc.
2017-12-13 17:01:39 +01:00
Niels Lohmann
8419bfbbd2
✅ improved test coverage
...
As we guarantee proper UTF-8 before, we do not need to cope with it later.
2017-12-12 20:44:57 +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
7de009edd1
✏️ fixing typos #869
2017-12-10 13:07:47 +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
Mike Bogdanov
64d6daa76e
iter_impl template conformance with C++17
2017-12-07 11:30:17 +03:00
Niels Lohmann
9e2f185ac6
💄 reformatted code after PRs
2017-12-06 22:21:11 +01:00