haraldwolff/json
1
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2024-08-22 13:02:28 +02:00
Code Issues Packages Projects Releases Wiki Activity
3394 commits 13 branches 56 tags 227 MiB
Commit graph

326 commits

Author SHA1 Message Date
Niels Lohmann d7b032f565
✅ add tests to improve coverage 2020-05-13 21:28:43 +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 f0c6ab4d3b
🐛 fix bug in SAX callback parser 2020-05-08 14:21:11 +02:00
Niels Lohmann c10bc7efdd
🔥 remove pretty-print code for binary values 2020-05-06 22:13:08 +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
Rimas Misevičius 6815968a42 Fix error message about invalid surrogate pairs 
I tested following strings with invalid surrogate pair and unpaired surrogate in files:

1. `"a\uD800\uD800x"`
2. `"a\uD800x"`

The error messge was: "... invalid string: surrogate U+DC00..U+DFFF must be followed by U+DC00..U+DFFF; ..."

I think it must be: "... invalid string: surrogate U+D800..U+DBFF must be followed by U+DC00..U+DFFF; ..."
 2020-05-01 00:23:04 +03:00
Niels Lohmann 2e5727d778
🐛 properly pass serialize_binary to dump function #2067 2020-04-27 15:10:23 +02:00
chenguoping 8bfc692602 update condition 2020-04-20 16:00:55 +08:00
Niels Lohmann 3607687a14
Merge pull request #2053 from nlohmann/gcc10warnings 
Fix GCC compiler warnings
 2020-04-20 08:05:42 +02: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 3bc9e053c9
Merge pull request #1969 from dota17/dota17-warning 
fix warnings in serializer.hpp for VS2019
 2020-04-17 10:10:38 +02:00
Niels Lohmann 69ac336042
Merge pull request #1967 from dota17/dota17-disable 
Fix C26451 warnnings in to_chars.hpp
 2020-04-17 10:08:21 +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
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 84f19d6333
Merge pull request #2034 from ArtemSarmini/gh-1920-gcc-10-incomplete-types 
Templatize basic_json constructor from json_ref
 2020-04-13 13:19:28 +02:00
Artöm Bakri Al-Sarmini 70be9751cd typo fix 2020-04-12 23:42:26 +03:00
Artöm Bakri Al-Sarmini ec955f08b4 Templatize basic_json ctor from json_ref 2020-04-12 22:32:39 +03:00
Niels Lohmann 9154e991b8
Merge branch 'develop' into feature/issue1913 2020-04-11 11:33:46 +02:00
chenguoping 34cf7b7a48 just restart ci 2020-04-07 10:00:21 +08:00
chenguoping e07686f0c7 update array_index() and add testcases 2020-03-25 15:57:20 +08:00
chenguoping dcd3a6c62b move the catch of std::invalid_argument into array_index() 2020-03-23 17:24:47 +08:00
chenguoping 59cb4c93be fix C26451 warnning in serializer.hpp for VS2019 2020-03-23 16:08:47 +08:00
chenguoping 0a8216890d fix C26451 warnnings in to_chars.hpp 2020-03-23 15:27:35 +08:00
Sergey Linev 78e911b8c3
Use array_idx as methods args 
Avoid mix-up with array_index member

Co-Authored-By: Niels Lohmann <niels.lohmann@gmail.com>
 2020-03-19 11:52:40 +01:00
chenguoping bfc003cadf catch exceptions for json_point : /xx/+99 2020-03-17 20:49:28 +08:00
Sergey Linev 00049c20d0 Rename argument array_index to array_indx in json_pointer methods 
Fixes gcc48 warning:

declaration of ‘array_index’ shadows a member of 'this' [-Wshadow]
 2020-03-11 07:41:53 +01:00
Niels Lohmann 61b46a56fb
🏗️ replace is_pod by is_trivial 2020-02-15 10:12:27 +01:00
Antoine Cœur 8d92ca865f Some typos 2020-02-02 17:29:37 +08:00
Niels Lohmann 7acf6218b6
📝 fix typo #1903 2020-01-15 17:40:03 +01:00
Niels Lohmann 0feea6168d
📝 fix scanner documentation 2020-01-12 10:22:11 +01:00
Michael Balszun 5c045f7d0a Use correct accumulator type in binary_writer if size_t != ul 
- Also fixes warning in msvc about possible loss of data in
  that size computation.
 2019-11-19 11:06:45 +01:00
Niels Lohmann 62dada05ca
🐛 fix conversion to std::valarray 
closes #1824
 2019-11-05 19:28:00 +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
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 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 ddda67a096 Don't capture json input by value (fixed #1822). 2019-10-30 16:16:34 +01: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
Julien Hamaide 4615f5a980 Provide default implementation for int_to_string, but allow for overloaded function 2019-10-01 10:34:21 +02:00
christian 7476f5ee0c Make json_pointer::back const (resolves #1764) 2019-10-01 00:57:27 +02:00
Julien Hamaide 0f073e26eb Allow items() to be used with custom string 2019-09-26 13:20:57 +02:00
Xav83 13a7c60257 Correct a warning from cppcheck: 
binary_writer.hpp:869: (style) Consider using std::accumulate algorithm instead of a raw loop.

910a7d2b87/checks (step):5:107

Signed-off-by: Xav83 <x.jouvenot@gmail.com>
 2019-09-20 11:45:38 +02:00
Xav83 b9dfdbe6be Correct a warning from cppcheck: 
binary_reader.hpp:650: (style) Unsigned expression 'mant' can't be negative so it is unnecessary to test it

910a7d2b87/checks (step):5:84

Signed-off-by: Xav83 <x.jouvenot@gmail.com>
 2019-09-19 19:25:55 +02:00