mirror/json
1
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2024-11-24 14:59:00 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
2,916 Commits 13 Branches 56 Tags 232 MiB
6a5db00951
Commit Graph

2916 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Isaac Nickaein
6a5db00951 Implement contains() to check existence of a key 2019-02-13 13:21:54 +03:30
Niels Lohmann
68ec3eb8d6
Merge pull request #1451 from Afforix/Afforix-fix-extra-semicolon 
remove extra semicolon from readme
 2019-01-25 13:36:18 +01:00
Niels Lohmann
de14b5ee2f
Merge pull request #1455 from wythe/patch-2 
docs: README typo
 2019-01-25 13:36:07 +01:00
Mark Beckwith
cca6d0dbae
docs: README type 
Just another small typo I found in the README.
 2019-01-24 10:49:45 -06:00
Matěj Plch
dc21cbb751
remove extra semicolon 
in example of NLOHMANN_JSON_SERIALIZE_ENUM
 2019-01-22 10:13:12 +01:00
Niels Lohmann
e89c946451
Merge branch 'feature/nodiscard' into develop 2019-01-20 15:41:30 +01:00
Niels Lohmann
6de4df23e4
🐛 fixed integer overflow in dump function #1447 
Closes #1447.
 2019-01-20 12:26:01 +01:00
Niels Lohmann
e17e0d031f
Merge pull request #1446 from scinart/develop 
attempt to fix #1445, flush buffer in serializer::dump_escaped in UTF8_REJECT case.
 2019-01-20 12:18:02 +01:00
Niels Lohmann
e36593e960
🔨 trying code from https://godbolt.org/z/-tLO1K 2019-01-20 11:12:20 +01:00
scinart
20db020c1f move newly-added tests in unit-regression.cpp 2019-01-19 11:36:50 -05:00
Niels Lohmann
d359fd3a8d
🚧 trying nodiscard attribute #1433 2019-01-19 17:32:23 +01:00
Niels Lohmann
b9a39b38bf
Merge pull request #1434 from pboettch/develop 
allow push_back() and pop_back() calls on json_pointer
 2019-01-19 17:07:36 +01:00
scinart
83e84446d6
fix typo 2019-01-18 20:55:01 -05:00
scinart
899bd94b43 flush buffer in serializer::dump_escaped case UTF8_REJECT 
serializer use fixed buffer. Whenever it is nearly full, it is flushed to `output_adapter_t<char> o`
But the code forgets to flush when there is a invalid utf8 code point
So there will be buffer overflow.
 2019-01-18 20:35:48 -05:00
Niels Lohmann
dffae1082f
Merge pull request #1435 from pboettch/warning-fix 
🚨 fixed unused variable warning
 2019-01-15 22:18:13 +01:00
Niels Lohmann
851fe8a5ef
Merge pull request #1430 from nicoddemus/conda-docs 
Add instructions about using nlohmann/json with the conda package manager
 2019-01-15 22:16:49 +01:00
Patrick Boettcher
d0c0d16110 🚨 fixed unused variable warning 
Since 6503e83e74 "Improve dump_integer performance by implementing a more efficient int2ascii"
an unused variable and thus a warning existed.
 2019-01-15 15:21:02 +01:00
Patrick Boettcher
9225cf2f57 allow push_back() and pop_back() calls on json_pointer 
Putting pop_back() to public and creating a trivial push_back()
method allows users of nlohmann::json_pointer to manipulate an
existing json-pointer by adding or removing keys at the end.

This is useful for traversing a JSON-instance and keeping track
of its "absolute path" at any moment.

In my case for a schema-validator error-handler.
 2019-01-15 14:43:46 +01:00
Bruno Oliveira
b025d66eb5 Add instructions about using nlohmann/json with the conda package manager 2019-01-15 11:06:26 -02:00
Niels Lohmann
e5753b14a8
🚨 fixed another linter warning #1400 
Closes #1400.
 2019-01-13 15:40:49 +01:00
Niels Lohmann
5c04cc1009
🔨 fixed includes 2019-01-13 15:31:22 +01:00
Niels Lohmann
8e9ad346d9
🚨 fixed another linter warning 2019-01-13 13:00:54 +01:00
Niels Lohmann
ad01736d55
💡 improved documentation for parsing without exceptions #1405 
Closes #1405
 2019-01-13 11:46:05 +01:00
Niels Lohmann
06731b14d7
⬆️ upgraded Catch and Google Benchmark 
- Catch 1.12.0 -> 1.12.2
- Google Benchmark 1.3.0 -> 1.4.1
 2019-01-13 11:29:39 +01:00
Niels Lohmann
daeb48b01a
Merge pull request #1411 from nickaein/develop 
Improve dump_integer performance
 2019-01-13 11:11:51 +01:00
Niels Lohmann
29a03f465e
Merge pull request #1414 from nickaein/mydevel-appveyor-x64 
Fix x64 target platform for appveyor
 2019-01-12 23:09:19 +01:00
Isaac Nickaein
c9dd260a4c Add unit tests for dump_integer 
Add some unit tests for formatting integers
to keep code coverage as before.
 2019-01-12 08:58:30 -08:00
Isaac Nickaein
be9b4cbd60 Add benchmark for small integers 
This benchmark is a sample of 1 million "small" integers
in range [-1000000 1000000) sampled from uniform distribution.
 2019-01-12 08:58:30 -08:00
Isaac Nickaein
6503e83e74 Improve dump_integer performance by implementing a more efficient int2ascii 
This commits implements a faster int2ascii inspired by "Fastware" talk given
by Andrei Alexandrescu.
See: https://www.youtube.com/watch?v=o4-CwDo2zpg
 2019-01-12 08:58:30 -08:00
Isaac Nickaein
f16432832c
Increase stack size for VS2017 Win x64 on Appveyor 2019-01-12 19:27:26 +03:30
Niels Lohmann
b39f34e046
Merge pull request #1425 from hijxf/patch-1 
Updated year in README.md
 2019-01-12 10:23:31 +01:00
Jef LeCompte
7f73915d4f
Updated year in README.md 2019-01-11 08:54:03 -05:00
Niels Lohmann
df460c96cf
Merge pull request #1423 from skypjack/patch-1 
Fixed broken links in the README file
 2019-01-10 13:52:52 +01:00
Michele Caini
6546cad7bf
Fixed broken links in the README file 2019-01-10 08:54:53 +01:00
Niels Lohmann
847dd2a954
Merge pull request #1420 from skypjack/patch-1 
Fixed broken links in the README file
 2019-01-09 22:33:40 +01:00
Niels Lohmann
937b642e0e
📝 added description on how to use NuGet package #1132 
Closes #1132.
 2019-01-09 21:08:06 +01:00
Niels Lohmann
975dc970d1
Merge pull request #1417 from wythe/patch-1 
docs: typo in README
 2019-01-09 20:35:49 +01:00
Michele Caini
b8be0f64ae
Fixed broken links to operator[]() and at() 2019-01-09 15:11:54 +01:00
Michele Caini
619bf9c20d
Fixed broke links to RFC7159 2019-01-09 15:05:09 +01:00
Mark Beckwith
a559ff8fc6
typo in README 
inintended -> unintended
 2019-01-08 13:24:07 -06:00
Isaac Nickaein
2c0c2ca698 Specify target platform in generator name 2019-01-05 14:15:33 -08:00
Niels Lohmann
676c847c55
Merge pull request #1409 from yann-morin-1998/yem/cmake-version 
buildsystem: relax requirement on cmake version
 2019-01-01 17:17:38 +01:00
Yann E. MORIN
e8b6b7adc1 buildsystem: relax requirement on cmake version 
Commit 73cc5089 (Using target_compile_features to specify C++ 11
standard) bumped the required cmake version, from 3.0 to 3.8, so
as to get the definition of target_compile_features().

However, target_compile_features() was introduced in cmake-3.1:
    https://cmake.org/cmake/help/v3.1/command/target_compile_features.html

And using cmake-3.1 is indeed sufficient to properly build.

As such, relax the minimum required version down to cmake-3.1,
so we can build on oldish, entreprise-grade distributions that
only have cmake-3.1 (or at least, don't have up to cmake-3.8).

Reported-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
 2018-12-31 18:52:04 +01:00
Niels Lohmann
c682b9879b
🚨 fixed PVS V567 warning 
"V567 The modification of the 'position.chars_read_current_line' variable is unsequenced relative to another operation on the same variable. This may lead to undefined behavior."
 2018-12-30 23:00:15 +01:00
Niels Lohmann
6f89613acd
🚨 fixed some warnings 2018-12-23 13:56:18 +01:00
Niels Lohmann
db53bdac19
Merge branch 'release/3.5.0' into develop 2018-12-22 00:01:28 +01:00
Niels Lohmann
78348afeb6
🔖 set version to 3.5.0 2018-12-21 23:52:29 +01:00
Niels Lohmann
1107f8cd82
📝 updated documentation for items() function 2018-12-21 22:51:12 +01:00
Niels Lohmann
98f4e31c3e
📝 formatted picture 2018-12-21 18:33:46 +01:00
Niels Lohmann
58c269b039
📝 updated documentation 2018-12-21 18:27:56 +01:00