1
0
mirror of https://github.com/nlohmann/json.git synced 2025-07-28 12:02:00 +03:00
Commit Graph

2620 Commits

Author SHA1 Message Date
6965ff00c8 Merge branch 'develop' into feature/ubjson 2018-01-14 13:58:06 +01:00
411c16cbb2 📝 overworked documentation wrt. amalgamation #906 2018-01-14 13:08:28 +01:00
fea5f3792b 📝 it's 2018 2018-01-14 10:41:59 +01:00
541b46132d ♻️ adjusted code to split headers 2018-01-14 10:34:43 +01:00
0e8f01a963 Merge branch 'develop' into feature/rfc7396 2018-01-14 10:28:09 +01:00
c772c01a48 ♻️ refactored code to split headers 2018-01-14 10:27:30 +01:00
1b54d4a5aa Merge branch 'develop' into feature/ubjson 2018-01-14 10:10:56 +01:00
420dcf1f25 🚧 added check whether code is amalgamated 2018-01-14 10:10:23 +01:00
5775084ffc cmake: add option to use/install the non-amalgamated version 2018-01-13 13:07:03 +01:00
84bffd5d36 move amalgamate tool to third_party folder 2018-01-13 13:05:42 +01:00
922b56e492 cmake: add back trailing slash to NLOHMANN_JSON_SOURCE_DIR 2018-01-13 12:27:33 +01:00
a66b2d20c6 🚨 removed linter warnings for Python code 2018-01-13 11:15:23 +01:00
f4a55f26b0 added amalgamate Python script 2018-01-13 10:59:49 +01:00
241eea0c0e 📝 documentation 2018-01-12 09:23:33 +01:00
10bad9381d 🚧 added size benchmark for binary formats 2018-01-10 23:13:48 +01:00
3a7585e738 added more tests 2018-01-10 22:47:07 +01:00
31bfabc4c0 🔨 optimized input format 2018-01-10 16:14:43 +01:00
965a70e38d 🔨 optimized output format 2018-01-10 11:22:19 +01:00
85173f5627 🔨 some clean up 2018-01-10 10:18:31 +01:00
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
0a2920e0fd ♻️ reorganized code 2018-01-09 18:30:02 +01:00
b67e00b9b5 Merge pull request #700 from theodelrieu/refactor/split_it
Refactor/split it
2018-01-09 07:57:01 +01:00
fd04967676 🐛 fixed copy-paste error 2018-01-08 21:37:51 +01:00
fb1154c237 🚧 debug 2018-01-08 21:26:41 +01:00
97e0d20ce9 🚧 debug 2018-01-08 21:16:20 +01:00
ebf28a26ee 🚧 another try 2018-01-08 20:49:02 +01:00
7e4ee23f40 add single_header CMake target 2018-01-08 20:09:43 +01:00
57d822b6e2 add missing includes, put back include comments 2018-01-08 20:09:41 +01:00
9cab30cfce add adl_serializer.hpp 2018-01-08 20:09:38 +01:00
8e9714fe3d add detail/json_ref.hpp 2018-01-08 20:09:35 +01:00
a3473fda6a add detail/serializer.hpp 2018-01-08 20:09:33 +01:00
c117515e31 add detail/parsing/binary_writer.hpp 2018-01-08 20:09:29 +01:00
d620f76f0d add detail/parsing/binary_reader.hpp 2018-01-08 20:09:27 +01:00
4dbb433a79 add detail/parsing/output_adapters.hpp 2018-01-08 20:09:24 +01:00
ae6f66048c add detail/iterators/json_reverse_iterator.hpp 2018-01-08 20:09:21 +01:00
5fc9ef2b90 add detail/iterators/iteration_proxy.hpp 2018-01-08 20:09:18 +01:00
bf06cf6c22 add detail/iterators/iter_impl.hpp 2018-01-08 20:09:15 +01:00
3e65a65290 add detail/iterators/internal_iterator.hpp 2018-01-08 20:09:13 +01:00
51ecc31db7 add detail/iterators/primitive_iterator.hpp 2018-01-08 20:09:10 +01:00
9ea25685a8 add detail/parsing/parser.hpp 2018-01-08 20:09:06 +01:00
3a0743db97 add detail/parsing/lexer.hpp 2018-01-08 20:09:04 +01:00
7ab3e8d7b3 add detail/parsing/input_adapters.hpp 2018-01-08 20:09:01 +01:00
21881606f2 add detail/conversions/to_json.hpp 2018-01-08 20:08:58 +01:00
e0c02c14f0 add detail/conversions/from_json.hpp 2018-01-08 20:08:55 +01:00
7056b375c4 add detail/value_t.hpp 2018-01-08 20:08:52 +01:00
8c555db970 add detail/exceptions.hpp 2018-01-08 20:08:50 +01:00
f364f5ac5a add detail/meta.hpp 2018-01-08 20:08:47 +01:00
d686713f91 add detail/macro_{un}scope.hpp 2018-01-08 20:08:44 +01:00
5bffc95773 add json_fwd.hpp 2018-01-08 20:08:38 +01:00
3d7658da89 🚧 working on AppVeyor's errors 2018-01-08 19:48:18 +01:00