Niels Lohmann
0460b90977
📝 fix for #1052 #1139
2018-06-22 22:35:48 +02:00
Niels Lohmann
85f35a1d59
📝 documentation fix
2018-06-22 22:34:42 +02:00
Niels Lohmann
e7c1638d11
💄 cleanup
2018-06-18 22:03:46 +02:00
Niels Lohmann
1c81e9f5ae
Merge pull request #1130 from agrianius/develop
...
test (non)equality for alt_string implementation
2018-06-18 22:01:53 +02:00
Niels Lohmann
d505ed7b31
Merge pull request #1138 from theodelrieu/feature/unordered_map_conversion
...
Feature/unordered map conversion
2018-06-18 21:59:46 +02:00
Théo DELRIEU
2c920a1032
run make amalgamate
2018-06-18 15:14:10 +02:00
Théo DELRIEU
2b37d7ed86
from_json: add overload for std::unordered_map
...
Fixes #1133
2018-06-18 15:14:10 +02:00
Théo DELRIEU
299469cfd5
from_json: add missing template arguments for std::map
2018-06-18 10:52:11 +02:00
Vitaliy
f574d7e084
simplify templates for operators, add more checks
2018-06-14 15:07:06 +03:00
Vitaliy
cd28d872e7
forward declarations to make new compilers happy
2018-06-11 20:50:39 +03:00
Vitaliy
3d3055909c
define global operator< for const char* and alt_string
2018-06-11 19:09:57 +03:00
Vitaliy
4feb8211ca
test (non)equality for alt_string implementation
2018-06-11 18:03:46 +03:00
Niels Lohmann
e830bc502f
Merge pull request #1117 from TinyTinni/develop
...
remove stringstream dependency
2018-06-01 08:05:45 +02:00
Matthias Möller
ecadcdb593
added char cast
...
should fix the GCC unittest
2018-05-31 16:36:16 +02:00
Matthias Möller
48656a49f5
typo
2018-05-31 15:32:21 +02:00
Matthias Möller
64acb42aa7
remove stringstream dependency
2018-05-31 13:45:58 +02:00
Niels Lohmann
8efbf8d7bb
📝 documentation to avoid future issues like #1108
2018-05-28 18:14:44 +02:00
Niels Lohmann
e5a67fc3f8
Merge branch 'develop' of https://github.com/nlohmann/json into develop
2018-05-28 17:57:46 +02:00
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
