mirror/json
1
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2024-12-05 06:59:02 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
2,620 Commits 14 Branches 56 Tags 248 MiB
86a96b059d
Commit Graph

2620 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Niels Lohmann
a49644ab74
🚑 adjusted Fuzzer to new parser 
out_of_range exceptions where unexpected before - the parser used to crash in these situations...
 2018-05-28 17:57:22 +02:00
Niels Lohmann
0efaf891e5
Merge pull request #1089 from theodelrieu/feature/map_conversion 
Provide a from_json overload for std::map
 2018-05-28 14:53:23 +02:00
Théo DELRIEU
c5e63fd684
Provide a from_json overload for std::map 
This overload is chosen only when BasicJsonType::string_t
is not constructible from std::map::key_type.

Currently, converting a map to json treats it as an array of pairs.

fixes #1079
 2018-05-28 11:06:24 +02:00
Niels Lohmann
db03d09312
Merge branch 'feature/key_ref' into develop (fixes #1098) 2018-05-27 22:26:00 +02:00
Niels Lohmann
cf9299d222
Merge branch 'feature/sax2' into develop #971 2018-05-27 18:12:59 +02:00
Niels Lohmann
3cdc4d784b
📝 added documentation 2018-05-27 18:07:53 +02:00
Niels Lohmann
adf09726b0
Merge branch 'develop' into feature/sax2 2018-05-27 14:26:13 +02:00
Niels Lohmann
481ace65c4
🔨 only calculate array index string when needed #1098 2018-05-27 12:04:22 +02:00
Niels Lohmann
1c6b332dcd
👌 mitigating cppcheck bug #1101 2018-05-26 14:10:13 +02:00
Niels Lohmann
90eb0a91e0
⚡ keys are now returned as const reference #1098 2018-05-26 13:26:40 +02:00
Niels Lohmann
1f84cc2c88
✅ adjusted test cases 2018-05-17 16:50:37 +02:00
Niels Lohmann
717301d1bc
Merge branch 'testsuite' into feature/sax2 2018-05-17 16:36:43 +02:00
Niels Lohmann
4639bb2c8f
✅ added more tests from recent nst's JSONTestSuite 2018-05-17 10:10:01 +02:00
Niels Lohmann
e94862a649
🚑 fixed error in callback logic 2018-05-06 19:00:49 +02:00
Niels Lohmann
ae213721b1
🔨 removed unget function for wstring parsers 2018-05-06 14:05:29 +02:00
Niels Lohmann
5ff2abb90d
Merge branch 'develop' into feature/sax2 2018-05-06 13:29:23 +02:00
Niels Lohmann
567fe9b7a0
Merge pull request #1078 from martin-mfg/patch-1 
fix typo in README
 2018-05-04 17:04:35 +02:00
martin-mfg
377e956655
fix typo in readme 
The README says:
> "The library itself contains of a single header file ..."

I guess "consists of a" is the wording that was intended here. Alternatively, "contains a" might also be what was intended. Either way, I think both versions work equally well and thus choose the one that I believe was intended.
 2018-05-03 22:42:52 +02:00
Niels Lohmann
5da596385b Update issue templates 2018-05-03 18:35:56 +02:00
Niels Lohmann
7bbe7bb98f
🔥 removed old issue template 2018-05-03 18:35:21 +02:00
Niels Lohmann
14f01e1981 🔧 update issue templates 2018-05-03 18:32:53 +02:00
Niels Lohmann
86b0732a10
📝 added public key used for commits and releases 2018-05-03 18:11:42 +02:00
Niels Lohmann
ed69e50ad2
📄 added SPDX-License-Identifier 2018-05-03 17:41:45 +02:00
Niels Lohmann
5bc4ff9da3
Merge branch 'feature/wstring' into develop 2018-04-29 17:29:57 +02:00
Niels Lohmann
fa3e42f826
Merge branch 'develop' into feature/wstring 2018-04-29 13:16:12 +02:00
Niels Lohmann
b5d1755dfb
🔥 removed commented-out test cases #1060 2018-04-22 15:41:42 +02:00
Niels Lohmann
0ab8fab338
Merge pull request #1058 from dns13/patch-1 
Fix typo
 2018-04-17 23:26:00 +05:30
Jan Schöppach
65b4d8251b
Fix typo in single_include, too 2018-04-17 13:02:36 +02:00
Jan Schöppach
53fb230098
Fix typo 2018-04-17 12:08:44 +02:00
Niels Lohmann
46ec2fddf8
📝 updated THANKS list 2018-04-10 18:13:37 +02:00
Niels Lohmann
b8bfd1140d
Merge pull request #1048 from chuckatkins/misc-cmake-packaging-enhancements 
Misc cmake packaging enhancements
 2018-04-10 17:57:21 +02:00
Chuck Atkins
33a2154f8d Enable target namespaces and build dir project config 
CMake convention is to use a project namespace, i.e. Foo::, for imported
targets.  When multiple targets are imported from a project, this looks
like Foo::Bar1 Foo::Bar2, etc.  This adds the nlohmann_json:: namespace to
the exported target names.

This also allows the generated project config files to be used from the
build directory instead of just the install directory.
 2018-04-10 09:08:38 -04:00
Niels Lohmann
29362c6ace
Merge pull request #1047 from jammehcow/patch-1 
Fixed incorrect LLVM version number in README
 2018-04-10 08:39:58 +02:00
Niels Lohmann
c02a3155d4
👷 added Xcode 9.3 builder 
See https://blog.travis-ci.com/2018-04-09-say-bonjour-to-xcode-93-and-macos-high-sierra.
 2018-04-10 08:39:28 +02:00
Niels Lohmann
8d8f890771
💩 first try on #1045 2018-04-10 08:29:07 +02:00
James Upjohn
7f20e9ddc7
Fixed incorrect version number in README 
clang-900.0.39.2 is from LLVM 9.0.0, not 8.1.0
 2018-04-10 17:16:44 +12:00
Chuck Atkins
031b88d315 Make the CMake install dir user-configurable 2018-04-09 11:31:25 -04:00
Guillaume Racicot
aaee18ce90 Added test for string conversion with string_view 2018-04-09 11:15:33 -04:00
Niels Lohmann
7c503c64b7
Merge pull request #1043 from coryan/patch-1 
Fix trivial typo in comment.
 2018-04-09 08:19:56 +02:00
Carlos O'Ryan
4286b16b71
Fix trivial typo in comment. 
Not really important, but since I saw it.
 2018-04-08 15:46:25 -04:00
Niels Lohmann
cf91b4f2bb
Merge branch 'develop' into feature/wstring 2018-04-08 11:36:58 +02:00
Niels Lohmann
f924df1835
Merge branch 'develop' into feature/sax2 2018-04-08 11:36:44 +02:00
Niels Lohmann
acf10d9af7
Merge pull request #1041 from ax3l/topic-spack 
Package Manager: Spack
 2018-04-08 11:32:35 +02:00
Niels Lohmann
e1ea8369ad
Merge branch 'develop' into feature/sax2 2018-04-08 09:31:59 +02:00
Niels Lohmann
40f279c59d
Merge branch 'feature/issue1021' into develop 2018-04-08 09:28:37 +02:00
Niels Lohmann
18a0271a95
Merge branch 'develop' into feature/issue1021 2018-04-08 09:21:43 +02:00
Axel Huebl
1ae9896387
Package Manager: Spack 
I contributed a package to the Spack package manager.

Spack is a flexible package manager that supports multiple versions,
configurations, platforms, and compilers. It is popular in
high-performance computing.
 2018-04-08 01:12:49 +02:00
Niels Lohmann
83b143382e
Merge pull request #1040 from ax3l/topic-debugViewMSVCcmakeMin 
CMake: 3.8+ is Sufficient
 2018-04-07 15:14:59 +02:00
Axel Huebl
e439a1a9a7
CMake: 3.8+ is Sufficient 
The current CMake scripts depend on CMake 3.8+.
This allows us to remove previous work-arounds.
 2018-04-07 13:15:44 +02:00
Niels Lohmann
495436a5d5
Merge pull request #1026 from ktonon/develop 
Added public target_compile_features for auto and constexpr
 2018-04-03 17:34:42 +02:00