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 73cc5089https://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
cebb4e052a
Merge branch 'release/3.5.0'
2018-12-22 00:01:18 +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
Niels Lohmann
2182157dc1
📝 update documentation
2018-12-21 09:32:35 +01:00
Niels Lohmann
45f5611d9b
🚨 fixed two warnings
2018-12-20 22:41:48 +01:00
Niels Lohmann
117c1d14fb
📝 added contributors to 3.5.0
2018-12-20 22:20:47 +01:00
Niels Lohmann
d584ab269a
🎨 fixed header
2018-12-20 21:58:16 +01:00
Niels Lohmann
45a8a093d7
🚨 fixed a warning
2018-12-20 21:40:47 +01:00
Niels Lohmann
85849940ba
Merge pull request #1391 from pratikpc/develop
...
Added Support for Structured Bindings
2018-12-20 08:58:08 +01:00
Pratik Chowdhury
ebd3f45808
Added Support for Structured Bindings
...
For further details, read https://github.com/nlohmann/json/issues/1388 and https://blog.tartanllama.xyz/structured-bindings/
2018-12-19 20:17:52 +05:30
Niels Lohmann
4f270e38cc
Merge pull request #1342 from davedissian/bugfix/sfinae-iterator-traits
...
Add a SFINAE friendly iterator_traits and use that instead.
2018-12-19 08:24:18 +01:00
David Avedissian
f1080d7c39
Code review.
2018-12-18 20:44:37 +00:00
Niels Lohmann
5d390e91ff
Merge pull request #1392 from mtalliance/feature/addFileInputAdapter
...
Feature/add file input adapter
2018-12-16 22:10:03 +01:00
Jonathan Dumaresq
c1c85b025c
Forget one std::FILE
2018-12-14 07:33:28 -05:00
Jonathan Dumaresq
635a4fc344
use namespace std when possible. Change the name of private variable.
2018-12-12 16:33:25 -05:00
Jonathan Dumaresq
cf31193de2
create single json.hpp file
2018-12-12 14:46:52 -05:00
Jonathan Dumaresq
a794cfdba3
refactor unit test in case of throw, the fclose will not be called. using unique_ptr with custom destructor will ensure that
2018-12-12 14:46:17 -05:00
Jonathan Dumaresq
91ff96a737
remove the const attribute
2018-12-12 14:16:12 -05:00
Jonathan Dumaresq
b7a2642fba
remove comment
2018-12-12 14:15:49 -05:00
Jonathan Dumaresq
fa7f1a524e
new unified json.hpp generated with make amalgamate
2018-12-12 10:19:22 -05:00
Jonathan Dumaresq
ef283e0cf8
add tests to cover the new input adapter
2018-12-12 10:18:37 -05:00
Jonathan Dumaresq
3335da622a
remove non usefull code.
2018-12-12 09:32:52 -05:00
Jonathan Dumaresq
ae48acbb23
remove non usefull code. Add small description
2018-12-12 09:28:42 -05:00
Jonathan Dumaresq
52f6fd1d91
Add the possibility of using FILE * from cstdio library to read a file. This enable the possibility of using low eand device with this library.
2018-12-11 13:17:13 -05:00
Jonathan Dumaresq
67b0daf27b
Add the possibility of using FILE * from cstdio library to read a file. This enable the possibility of using low eand device with this library.
2018-12-11 09:33:30 -05:00
David Avedissian
2c23f0a346
Changes requested from code review.
2018-12-08 15:46:33 +00:00
Niels Lohmann
e73dfef6e5
Merge pull request #1382 from kjpus/patch-1
...
Link to issue #958 broken
2018-12-04 20:02:38 +01:00
kjpus
767a3a327d
Link to issue #958 broken
2018-12-04 10:03:10 -05:00
Niels Lohmann
d53873a251
Merge pull request #1363 from theodelrieu/doc/implicit_conversions
...
recommend using explicit from JSON conversions
2018-12-02 17:27:46 +01:00
