1
0
mirror of https://github.com/nlohmann/json.git synced 2025-07-31 10:24:23 +03:00
Commit Graph

2832 Commits

Author SHA1 Message Date
9958dde3da Merge pull request #950 from kaidokert/develop
Templatize std::string in binary_reader #941
2018-02-01 09:29:53 +01:00
aed4a080bf Templatize std::string in binary_reader #941 2018-01-31 23:01:01 -08:00
e8bf1f62f7 added define for library version #948 #943 2018-01-31 22:36:18 +01:00
552d153842 📝 added more statistics on binary formats 2018-01-31 21:54:38 +01:00
60e2d28eb7 🐛 fix for #947 2018-01-31 20:53:13 +01:00
51c774f208 📝 added documentation for binary formats 2018-01-31 17:23:11 +01:00
57e6fddd90 🚨 fixed warnings 2018-01-30 23:57:49 +01:00
f7131715b1 Merge branch 'develop' of https://github.com/nlohmann/json into develop 2018-01-30 23:20:39 +01:00
ce273af9b6 📝 added documentation for binary formats 2018-01-30 23:20:36 +01:00
ae235139b9 Merge pull request #940 from kaidokert/develop
Allow overriding THROW/CATCH/TRY macros with no-exceptions #938
2018-01-29 22:04:26 +01:00
8049442c2a 🔨 rename yytext to token_buffer (fixes #933) 2018-01-29 21:56:13 +01:00
d0c9e5fffc Allow overriding THROW/CATCH/TRY macros with no-exceptions (redo) #938 2018-01-28 14:42:13 -08:00
b3bd3b726b 📝 added link to OSS-Fuzz project repository 2018-01-28 21:02:02 +01:00
52e9449563 📝 added more functions to overview 2018-01-28 20:44:45 +01:00
cb4a9c85cb 🔨 excluded code from coverage 2018-01-28 17:55:40 +01:00
1483d39c91 🔨 moved class json_pointer into separate file #920 2018-01-28 15:36:56 +01:00
e95578f884 📝 documented JSON Merge Patch (RFC 7386) 2018-01-28 14:36:17 +01:00
102c474397 🔨 clean up 2018-01-28 14:13:02 +01:00
6855bbb902 🔨 split "parsing" directory to "input" and "output" 2018-01-28 13:15:03 +01:00
05f49fa401 added roundtrip tests for UBJSON 2018-01-27 18:47:32 +01:00
f0b26c8f38 added fuzzer for UBJSON input 2018-01-27 18:38:11 +01:00
b0a68f540f added roundtrip tests for UBJSON 2018-01-27 18:37:55 +01:00
1be3935e9d 📝 cleanup after #936 2018-01-27 17:43:44 +01:00
7aace7c976 Merge pull request #936 from zerodefect/improvement/fix_kmin_compiler_warning
Removed compiler warning about unused variable 'kMinExp'
2018-01-27 16:51:52 +01:00
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
95cf1fefaa Removed compiler warning about unused variable 'kMinExp'. 2018-01-25 12:51:48 +00:00
355c1e946b 👷 added task to check amalgamation #906
- Builds and runs test cases from individual sources rather than from amalgamation.
- Checks whether amalgamation would create the same single-header file as checked in.
2018-01-23 18:00:12 +01:00
dbfd7e532b Merge branch 'develop' of https://github.com/nlohmann/json into develop 2018-01-23 16:33:10 +01:00
3c68a796df 🔥 deprecated iterator_wrapper #874
Also fixed some warnings from GCC.
2018-01-23 16:33:08 +01:00
f05c3edc21 Merge pull request #930 from Pipeliner/develop
Fix a typo in README.md
2018-01-23 07:32:23 +01:00
f5c4e9f3a1 Merge pull request #919 from theodelrieu/fix/sfinae_for_incomplete_types
fix sfinae on basic_json UDT constructor
2018-01-23 07:32:06 +01:00
7eabb6ba36 📝 updated documentation for UBJSON functions 2018-01-22 23:23:17 +01:00
fc32b8a9bc Fix a typo in README.md 2018-01-22 13:14:39 +03:00
3cca630836 🔨 cleanup after #915 2018-01-21 15:55:35 +01:00
010e596001 Merge pull request #915 from abolz/dtoa
Floating-point formatting
2018-01-21 15:02:57 +01:00
3d776b0582 📝 updated README 2018-01-21 14:13:42 +01:00
9e5d901f55 Merge branch 'feature/ubjson' into develop 2018-01-21 14:04:29 +01:00
327b8bb09e Merge branch 'feature/strings' into develop 2018-01-21 13:55:52 +01:00
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
b406e3704b using Google Benchmark #921 2018-01-18 22:00:32 +01:00
a8f711a2f1 using Google Benchmark #921 2018-01-18 21:57:21 +01:00
6402077ac2 Merge pull request #876 from nlohmann/feature/rfc7396
JSON Merge Patch (RFC 7396)
2018-01-18 06:49:31 +01:00
dcee778c1e fix sfinae on basic_json UDT constructor
Avoid compiler errors when performing SFINAE checks on basic_json
and incomplete types.
2018-01-17 12:17:38 +01:00
7456f1d87b ♻️ re-used existing UTF-8 decoder to simplfy string serialization 2018-01-16 20:42:00 +01:00
afe4571309 🔨 cleanup + some noexcept 2018-01-16 20:41:04 +01:00
b182308eff 🔨 cleanup 2018-01-16 20:40:24 +01:00
9b9919d460 Use max_digits10 in dump_float for float->text->float round-trip 2018-01-15 21:26:03 +01:00
810f81bbd9 Regenerate src/json.hpp 2018-01-15 21:24:59 +01:00
787204f076 Add unit-tests for detail::to_chars 2018-01-15 21:13:17 +01:00
9f7c2c04c8 Use the Grisu2 algorithm for formatting 'float's and 'double's 2018-01-15 21:07:26 +01:00