Niels Lohmann
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
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
zerodefect
95cf1fefaa
Removed compiler warning about unused variable 'kMinExp'.
2018-01-25 12:51:48 +00:00
Niels Lohmann
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
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
Niels Lohmann
f05c3edc21
Merge pull request #930 from Pipeliner/develop
...
Fix a typo in README.md
2018-01-23 07:32:23 +01:00
Niels Lohmann
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
Niels Lohmann
7eabb6ba36
📝 updated documentation for UBJSON functions
2018-01-22 23:23:17 +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
Niels Lohmann
9e5d901f55
Merge branch 'feature/ubjson' into develop
2018-01-21 14:04:29 +01:00
Niels Lohmann
327b8bb09e
Merge branch 'feature/strings' into develop
2018-01-21 13:55:52 +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
b406e3704b
➕ using Google Benchmark #921
2018-01-18 22:00:32 +01:00
Niels Lohmann
a8f711a2f1
➕ using Google Benchmark #921
2018-01-18 21:57:21 +01:00
Niels Lohmann
6402077ac2
Merge pull request #876 from nlohmann/feature/rfc7396
...
JSON Merge Patch (RFC 7396)
2018-01-18 06:49:31 +01:00
Théo DELRIEU
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
Niels Lohmann
7456f1d87b
♻️ re-used existing UTF-8 decoder to simplfy string serialization
2018-01-16 20:42:00 +01:00
Niels Lohmann
afe4571309
🔨 cleanup + some noexcept
2018-01-16 20:41:04 +01:00
Niels Lohmann
b182308eff
🔨 cleanup
2018-01-16 20:40:24 +01:00
abolz
9b9919d460
Use max_digits10 in dump_float for float->text->float round-trip
2018-01-15 21:26:03 +01:00
abolz
810f81bbd9
Regenerate src/json.hpp
2018-01-15 21:24:59 +01:00
abolz
787204f076
Add unit-tests for detail::to_chars
2018-01-15 21:13:17 +01:00
abolz
9f7c2c04c8
Use the Grisu2 algorithm for formatting 'float's and 'double's
2018-01-15 21:07:26 +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
abolz
0695ac4001
Add tests for #360
2018-01-15 21:07:25 +01:00
abolz
68a9736738
Tests: Re-enable some round-trip tests
2018-01-15 21:07:25 +01:00
abolz
6e2e466c27
Tests: Don't rely on the format used for floating-point formatting
2018-01-15 21:07:25 +01:00
abolz
107c21a488
Tests: Exponents are formatted with a leading '+' sign
2018-01-15 21:07:25 +01:00
abolz
3ae82d91a2
Tests: Floating-point formatting uses lower case 'e'
2018-01-15 21:07:24 +01:00
Niels Lohmann
92f7295063
🔨 cleanup
2018-01-15 13:21:33 +01:00
Niels Lohmann
3ac674562f
🔨 clean up
2018-01-14 22:26:20 +01:00
Niels Lohmann
d9446b0e6e
Merge pull request #911 from theodelrieu/fix/cmake_install
...
Fix/cmake install
2018-01-14 20:08:49 +01:00
Niels Lohmann
9d6b3731b9
✅ improved test coverage
2018-01-14 20:07:38 +01:00
Niels Lohmann
06cddd371b
🔨 removed failing amalgamation test
2018-01-14 17:22:42 +01:00
Niels Lohmann
f85f4967fe
✅ improved test coverage
2018-01-14 17:22:06 +01:00
Niels Lohmann
6965ff00c8
Merge branch 'develop' into feature/ubjson
2018-01-14 13:58:06 +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
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
c772c01a48
♻️ refactored code to split headers
2018-01-14 10:27:30 +01:00
Niels Lohmann
1b54d4a5aa
Merge branch 'develop' into feature/ubjson
2018-01-14 10:10:56 +01:00
Niels Lohmann
420dcf1f25
🚧 added check whether code is amalgamated
2018-01-14 10:10:23 +01:00
Théo DELRIEU
5775084ffc
cmake: add option to use/install the non-amalgamated version
2018-01-13 13:07:03 +01:00
Théo DELRIEU
84bffd5d36
move amalgamate tool to third_party folder
2018-01-13 13:05:42 +01:00
Théo DELRIEU
922b56e492
cmake: add back trailing slash to NLOHMANN_JSON_SOURCE_DIR
2018-01-13 12:27:33 +01:00
