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
Niels Lohmann
b0a3883081
🎨 fix format
2020-04-13 13:11:26 +02:00
Niels Lohmann
3483d923d4
Merge pull request #2033 from nlohmann/feature/issue1913
...
Replace deprecated std::is_pod
2020-04-13 12:32:37 +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
4396a68d2d
Merge pull request #1984 from dota17/document-fix
...
Modify the document about operator==
2020-04-11 18:55:18 +02:00
Niels Lohmann
9154e991b8
Merge branch 'develop' into feature/issue1913
2020-04-11 11:33:46 +02:00
Niels Lohmann
ea0a7c7b4f
Merge pull request #2025 from ArtemSarmini/issue-1971-basic_json-push_back
...
Fixes #1971 (memory leak in basic_json::push_back)
2020-04-10 13:19:14 +02:00
chenguoping
34cf7b7a48
just restart ci
2020-04-07 10:00:21 +08:00
Niels Lohmann
6a53a95c32
⬆️ Hedley 13
2020-04-06 11:56:33 +02:00
Niels Lohmann
3884d33c60
Merge pull request #1980 from linev/fix_warning
...
Rename argument array_index to array_indx in json_pointer methods
2020-04-05 22:00:41 +02: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
chenguoping
2e7d340dad
docs:modify the document about operator==
2020-03-25 10:18:04 +08:00
garethsb-sony
7fe16f9400
PR for #2006 to test in AppVeyor.
2020-03-24 12:53:59 +00:00
chenguoping
dcd3a6c62b
move the catch of std::invalid_argument into array_index()
2020-03-23 17:24:47 +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
c5eafe74e8
🔖 set version to 3.7.3
2019-11-17 12:09:12 +01:00
Isaac Nickaein
efa13c663d
Reserve stack only for top-level items
2019-11-13 15:23:08 +03:30
Isaac Nickaein
948f98cf4a
Cleanups
...
Make our intent more clear in destruction
2019-11-12 22:24:11 +03:30
Isaac Nickaein
0f3ec003bb
Remove harmful vector::reserve during destruction ( #1837 )
2019-11-12 22:22:55 +03:30
Niels Lohmann
be61ad1470
🎨 fix inconsistent operator style
2019-11-11 21:37:32 +01:00
Niels Lohmann
56109eacd7
🔖 set version to 3.7.2
2019-11-10 21:23:39 +01:00
Isaac Nickaein
eec1974218
Merge remote-tracking branch 'nlohmann/develop' into iterate-on-destruction
2019-11-09 14:50:48 +03:30
Niels Lohmann
aacdc6bbe3
🔖 set version to 3.7.1
2019-11-06 18:37:26 +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
Anthony Van Herrewege
27d0dfc17a
Fix #1647 : non-member operator== breaks enum (de)serialization.
2019-10-30 14:54:52 +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
Niels Lohmann
0245ae5157
Merge pull request #1797 from t-b/fix-integer-truncation
...
iteration_proxy: Fix integer truncation from std::size_t to int
2019-10-17 21:02:48 +02:00
Evan Nemerson
fbcbc76d10
Update Hedley to v11.
2019-10-16 13:39:40 -07:00
Thomas Braun
35b47c2793
iteration_proxy: Fix integer truncation from std::size_t to int
...
Bug introduced in 0f073e26
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)
2019-09-20 11:45:38 +02:00
