Niels Lohmann
|
5fe6b83c26
|
Merge pull request #2158 from dota17/output_adapter
Fix PR#1006
|
2020-06-05 08:25:19 +02:00 |
|
Niels Lohmann
|
65c4b07451
|
🎨 replace alternative operators (and, not, or)
|
2020-06-03 21:22:07 +02:00 |
|
chenguoping
|
eca4b8785c
|
fix test case in PR#1006
|
2020-06-02 15:44:26 +08:00 |
|
chenguoping
|
8cd39578e3
|
add test case
|
2020-06-01 11:34:03 +08:00 |
|
Francois Chabot
|
897061c434
|
amalgamate
|
2020-05-28 10:11:19 -04:00 |
|
Francois Chabot
|
d3caf93ab0
|
Merge branch 'develop' into 1813-user-input
|
2020-05-28 03:40:34 -04:00 |
|
Francois Chabot
|
3a91a05db6
|
added custom input to readme
|
2020-05-28 03:13:39 -04:00 |
|
Francois Chabot
|
f1969e60a3
|
reamalgamate
|
2020-05-27 12:56:26 -04:00 |
|
Francois Chabot
|
5684d9a498
|
unified input API
|
2020-05-27 12:40:04 -04:00 |
|
Niels Lohmann
|
225fa58f16
|
🚧 add fix from #1715
|
2020-05-20 22:20:40 +02:00 |
|
Niels Lohmann
|
a82c80e9af
|
Merge pull request #2125 from nlohmann/binary_type
Clean up implementation of binary type
|
2020-05-20 18:58:29 +02:00 |
|
Niels Lohmann
|
4d39644bd0
|
💚 fix build
|
2020-05-19 13:45:52 +02:00 |
|
Niels Lohmann
|
21b1680ea1
|
🚚 rename binary_array() to binary()
|
2020-05-19 13:30:22 +02:00 |
|
Niels Lohmann
|
79347b484b
|
✅ improve test coverage
|
2020-05-19 12:40:32 +02:00 |
|
Niels Lohmann
|
b7ff40029a
|
💥 change serialization of binary values
|
2020-05-18 13:53:20 +02:00 |
|
Niels Lohmann
|
9eb19bcc27
|
✅ add more tests for binary type
|
2020-05-18 12:33:26 +02:00 |
|
gistrec
|
9e765f5aed
|
Fixed std::numeric_limit::max() call
|
2020-05-18 10:25:55 +00:00 |
|
Niels Lohmann
|
904642f261
|
♻️ rename internal_binary_t with binary_t
|
2020-05-17 22:50:27 +02:00 |
|
Niels Lohmann
|
dead99eb0e
|
🔨 overwork binary subtypes
|
2020-05-17 13:51:59 +02:00 |
|
Niels Lohmann
|
ab6e76dd05
|
Merge branches 'binary_type' and 'develop' of https://github.com/nlohmann/json into binary_type
|
2020-05-17 12:27:58 +02:00 |
|
Niels Lohmann
|
28e20bd9e4
|
🚨 fix warnings #2113
|
2020-05-16 14:26:17 +02:00 |
|
Niels Lohmann
|
c0cf67ead3
|
Merge branch 'develop' of https://github.com/nlohmann/json into binary_type
|
2020-05-16 12:58:13 +02:00 |
|
Niels Lohmann
|
f40a9f876a
|
Merge pull request #2044 from dota17/issue#1719
Fix issue#1719
|
2020-05-16 12:57:00 +02:00 |
|
chenguoping
|
ed9c205b5d
|
add somes test cases
|
2020-05-15 21:48:29 +08:00 |
|
Niels Lohmann
|
daf2d296dd
|
♻️ move wrapped binary type to separate file
|
2020-05-15 14:12:32 +02:00 |
|
chenguoping
|
779a0ec7df
|
update
|
2020-05-15 17:35:43 +08:00 |
|
chenguoping
|
47c6570470
|
Add some test cases about to_cbor()
|
2020-05-14 15:11:38 +08:00 |
|
Niels Lohmann
|
0857140839
|
Merge pull request #1950 from FrancoisChabot/issues/1457
templated input adapters
|
2020-05-14 07:52:02 +02:00 |
|
Niels Lohmann
|
d7b032f565
|
✅ add tests to improve coverage
|
2020-05-13 21:28:43 +02:00 |
|
Niels Lohmann
|
a4266bbb7d
|
Merge branch 'develop' into issues/1457
|
2020-05-13 12:48:46 +02:00 |
|
Niels Lohmann
|
a414e35971
|
🚨 add newline to end of file
|
2020-05-13 12:35:11 +02:00 |
|
Niels Lohmann
|
6014419818
|
Merge branches 'develop' and 'issue2082' of https://github.com/nlohmann/json into issue2082
|
2020-05-12 12:28:34 +02:00 |
|
Niels Lohmann
|
5c42847011
|
✅ add tests for binary type
|
2020-05-10 13:23:18 +02:00 |
|
Niels Lohmann
|
fff46ea98c
|
✅ add tests for binary type
|
2020-05-09 23:18:12 +02:00 |
|
Niels Lohmann
|
34430994bf
|
✅ add tests for binary type
|
2020-05-09 14:16:57 +02:00 |
|
Niels Lohmann
|
3fa94f0755
|
✅ add tests for binary type
|
2020-05-09 13:46:24 +02:00 |
|
Niels Lohmann
|
f0c6ab4d3b
|
🐛 fix bug in SAX callback parser
|
2020-05-08 14:21:11 +02:00 |
|
Niels Lohmann
|
5bfb27c865
|
🚨 fix some warnings
|
2020-05-08 12:32:28 +02:00 |
|
Niels Lohmann
|
cf4a6552f3
|
✅ add tests for binary serialization
|
2020-05-06 22:24:48 +02:00 |
|
Niels Lohmann
|
3cd2a977ae
|
✅ add test for get_ptr<binary_t*>
|
2020-05-06 22:13:55 +02:00 |
|
Niels Lohmann
|
1d6f7b0d4e
|
✅ add tests for binary serialization
|
2020-05-06 22:13:31 +02:00 |
|
Niels Lohmann
|
ddff459fa3
|
✅ add test for BSON binary subtype
|
2020-05-06 21:24:00 +02:00 |
|
Niels Lohmann
|
2b39efd545
|
✅ add tests for binary type
|
2020-05-05 12:59:57 +02:00 |
|
Niels Lohmann
|
908941b87d
|
✅ fix test cases
|
2020-05-05 07:47:20 +02:00 |
|
Niels Lohmann
|
2a34f4cd63
|
✅ add tests for binary type
|
2020-05-04 22:07:50 +02:00 |
|
Niels Lohmann
|
a50a14088c
|
Merge pull request #2081 from nlohmann/external_test_data
Use external test data
|
2020-05-04 20:58:02 +02:00 |
|
Niels Lohmann
|
24237af983
|
🎨 fix format
|
2020-05-03 13:40:23 +02:00 |
|
Niels Lohmann
|
f0050c9ba0
|
Merge pull request #2019 from dota17/contains_v2
fix #1982:json_pointer.contains() exception is incorrectly raised
|
2020-05-02 11:04:57 +02:00 |
|
Niels Lohmann
|
cfb2f34ebb
|
🔨 fix benchmarks
|
2020-05-01 20:59:47 +02:00 |
|
Niels Lohmann
|
7ade3a0efb
|
➖ remove dependency to FetchContent
|
2020-05-01 15:14:37 +02:00 |
|
Niels Lohmann
|
dbf1a1f413
|
♻️ download test data from external repository
|
2020-05-01 14:32:37 +02:00 |
|
Rimas Misevičius
|
6f1800889a
|
Fix tests
|
2020-05-01 00:59:12 +03:00 |
|
Rimas Misevičius
|
4c053e3ec9
|
Fix tests
|
2020-05-01 00:48:24 +03:00 |
|
Niels Lohmann
|
2e5727d778
|
🐛 properly pass serialize_binary to dump function #2067
|
2020-04-27 15:10:23 +02:00 |
|
Niels Lohmann
|
63afc8e3f8
|
Merge pull request #2043 from dota17/unit-constructor1
Add missing testcase about NaN in unit-constructor1.cpp
|
2020-04-21 07:35:44 +02:00 |
|
Niels Lohmann
|
a29e3b1318
|
Merge pull request #2054 from nlohmann/feature/issue1983
Fix bug in diff function
|
2020-04-20 19:44:35 +02:00 |
|
Niels Lohmann
|
c0a39b22a6
|
🚨 fix compiler warning
|
2020-04-20 19:42:58 +02:00 |
|
Niels Lohmann
|
3607687a14
|
Merge pull request #2053 from nlohmann/gcc10warnings
Fix GCC compiler warnings
|
2020-04-20 08:05:42 +02:00 |
|
chenguoping
|
c379d02b3e
|
Add missing testcase about NaN in unit-constructor1.cpp
|
2020-04-20 10:25:44 +08:00 |
|
Niels Lohmann
|
e8356928bd
|
🚨 fix compiler warnings #2052
|
2020-04-19 13:25:02 +02:00 |
|
Niels Lohmann
|
4fb0795ec1
|
🚨 fix compiler warnings #2049
|
2020-04-19 13:01:36 +02:00 |
|
Niels Lohmann
|
f2b43a36b2
|
Merge pull request #1662 from OmnipotentEntity/develop
Add binary type support to all binary file formats, as well as an internally represented binary type
|
2020-04-16 11:14:32 +02:00 |
|
Michael Reilly
|
012c9665ac
|
Add binary type support to all binary file formats, as well as an internally represented binary type
|
2020-04-14 10:22:45 -04:00 |
|
Niels Lohmann
|
dd04a32918
|
🐛 fix bug in diff function #1983
|
2020-04-13 14:35:36 +02:00 |
|
chenguoping
|
f5a487d1b4
|
fix issue1982: contains() exceptions are incorrectly raised
|
2020-04-13 19:41:13 +08:00 |
|
Niels Lohmann
|
b7be613b6e
|
Merge pull request #1990 from dota17/json_pointer
catch exceptions for json_pointer : ..../+99
|
2020-04-13 13:29:33 +02:00 |
|
Niels Lohmann
|
6121fc52cf
|
🎨 fix indentation
|
2020-04-10 13:22:58 +02:00 |
|
Artöm Bakri Al-Sarmini
|
8db02bcc55
|
Fix for gcc
|
2020-04-08 15:53:14 +03:00 |
|
Artöm Bakri Al-Sarmini
|
fec0bdd93b
|
still fixing
|
2020-04-08 00:42:03 +03:00 |
|
Artöm Bakri Al-Sarmini
|
4ce31695f1
|
Fixed formatting, trying to fix msvc build error in appveyor
|
2020-04-08 00:26:43 +03:00 |
|
Artöm Bakri Al-Sarmini
|
a74a031bba
|
Fix build error
|
2020-04-02 15:47:08 +03:00 |
|
Artöm Bakri Al-Sarmini
|
e4d8dc02e8
|
Fixes #1971 (memory leak in basic_json::push_back)
|
2020-04-02 15:20:25 +03:00 |
|
chenguoping
|
e07686f0c7
|
update array_index() and add testcases
|
2020-03-25 15:57:20 +08:00 |
|
Francois Chabot
|
7eadd6daef
|
added back forward declaration to address warnings
|
2020-02-28 18:15:11 -05:00 |
|
Francois Chabot
|
2e2cf02cfd
|
duck-typed object input adapters
|
2020-02-19 14:59:31 -05:00 |
|
Francois Chabot
|
617b3cf42e
|
templated input adapters
|
2020-02-19 10:32:49 -05:00 |
|
Antoine Cœur
|
8d92ca865f
|
Some typos
|
2020-02-02 17:29:37 +08:00 |
|
Sonu Lohani
|
4c1ebb4413
|
Fix warning: ignoring return value
|
2019-12-16 14:22:41 +05:30 |
|
Niels Lohmann
|
c5eafe74e8
|
🔖 set version to 3.7.3
|
2019-11-17 12:09:12 +01:00 |
|
Niels Lohmann
|
56109eacd7
|
🔖 set version to 3.7.2
|
2019-11-10 21:23:39 +01:00 |
|
Isaac Nickaein
|
7e2445a0f4
|
Move deep JSON test to a separate unit-test
|
2019-11-09 21:42:39 +03:30 |
|
Isaac Nickaein
|
68d0a7b246
|
Reduce depth in unit-test to avoid choking valgrind
|
2019-11-09 21:19:12 +03:30 |
|
Isaac Nickaein
|
eec1974218
|
Merge remote-tracking branch 'nlohmann/develop' into iterate-on-destruction
|
2019-11-09 14:50:48 +03:30 |
|
Niels Lohmann
|
1a9de88117
|
🚨 fix a linter warning
Coverity detected two "Memory - illegal accesses (OVERRUN)" issues. Resizing the buffer should silence this warning.
|
2019-11-07 08:00:21 +01:00 |
|
Niels Lohmann
|
aacdc6bbe3
|
🔖 set version to 3.7.1
|
2019-11-06 18:37:26 +01:00 |
|
Niels Lohmann
|
1e9f16dff0
|
🚨 fix linter errors
|
2019-11-05 20:25:53 +01:00 |
|
Niels Lohmann
|
c0ae88bf50
|
🚨 fix linter errors
|
2019-11-05 20:23:17 +01:00 |
|
Niels Lohmann
|
7bcaba0ca9
|
Merge pull request #1821 from AnthonyVH/develop
Fix for #1647
|
2019-11-05 19:15:54 +01:00 |
|
Anthony VH
|
c4923e3d05
|
Merge remote-tracking branch 'upstream/develop' into develop
|
2019-11-04 20:50:43 +01:00 |
|
Anthony VH
|
ec9647ae63
|
Moved test for #1647 regression to regressions file.
|
2019-11-04 20:45:24 +01:00 |
|
Camille Bégué
|
8b686b30eb
|
Add restriction for tuple specialization of to_json
This commit fix the issue #1825
Signed-off-by: Camille Bégué <c.begue@samsung.com>
|
2019-11-04 09:57:16 +01:00 |
|
Niels Lohmann
|
dfe53c36da
|
🚨 fix UBSAN warnings
|
2019-11-03 13:48:25 +01:00 |
|
Niels Lohmann
|
a1828bbf57
|
Merge pull request #1806 from cbegue/develop
Fix issue #1805
|
2019-11-01 19:46:19 +01:00 |
|
Camille Bégué
|
794a3d411a
|
Fix issue #1805
* Add some restriction on pair partial specialization of to_json
Signed-off-by: Camille Bégué <camille.begue.pro@gmail.com>
|
2019-10-31 18:04:15 +01:00 |
|
Anthony Van Herrewege
|
fb9a2643c8
|
Add test for #1647.
|
2019-10-30 15:46:31 +01:00 |
|
Niels Lohmann
|
507d5676ad
|
🚨 fix warning
|
2019-10-23 20:57:10 +02:00 |
|
Florian Pigorsch
|
b93d414a35
|
Fix some spelling errors - mostly in comments & documentation.
I did not touch the Changelog file and any third party stuff.
additonal -> additional (1)
apppend -> append (2)
constuctor -> constructor (2)
contect -> context (2)
dobulequote -> doublequote (1)
elemnts -> elements (1)
exakt -> exact (2)
exluded -> exclude (1)
explicitely -> explicitly (2)
narcissic -> narcissistic (1)
ocurred -> occurred (1)
occuring -> occurring (2)
preceeds -> preceded (1)
ot -> to (2)
wehther -> whether (2)
|
2019-10-19 11:59:51 +02:00 |
|
Thomas Braun
|
35b47c2793
|
iteration_proxy: Fix integer truncation from std::size_t to int
Bug introduced in 0f073e26 (Allow items() to be used with custom string,
2019-09-26).
|
2019-10-16 20:00:05 +02:00 |
|
Niels Lohmann
|
d187488e0d
|
Merge pull request #1765 from crazyjul/fix/items-with-alt-string
Allow items() to be used with custom string
|
2019-10-05 22:11:14 +02:00 |
|
christian
|
7476f5ee0c
|
Make json_pointer::back const (resolves #1764)
|
2019-10-01 00:57:27 +02:00 |
|