Niels Lohmann
f86090aafc
Merge pull request #1345 from mpoquet/feature/meson-install-pkgconfig
...
Allow installation via Meson
2018-11-08 18:39:26 +01:00
Niels Lohmann
30e1cbb0df
Merge pull request #1346 from ax3l/fix-mergePatchShadowParam
...
Fix merge_patch shadow warning
2018-11-08 18:38:40 +01:00
mefyl
aa10382629
Set eofbit on exhausted input stream.
...
Fix issue #1340 .
The eofbit is set manually since we don't go through the
stream interface. We could maybe use the stream interface
instead, but there are some assumptions regarding which
exception go through, so this seems to be the most prudent
approach for now.
2018-11-08 11:41:17 +01:00
Axel Huebl
798754dfb6
Amalgamate Headers
2018-11-08 10:35:45 +01:00
Axel Huebl
97b81da840
merge_patch: rename parameter
...
Avoid shadowing a member of `this` by choosing the same name as
parameter (`-Wshadow`). Instead, make name of parameter more
expressive.
2018-11-08 10:31:47 +01:00
Millian Poquet
ffe08983dd
:meson: install headers + pkg-config
2018-11-08 00:25:42 +01:00
David Avedissian
f665a92330
Implement SFINAE friendly iterator_traits and use that instead.
2018-11-07 18:39:25 +00:00
Niels Lohmann
d2e6e1bf58
Merge pull request #1329 from ax3l/fix-typosWhitespaces
...
Fix EOL Whitespaces & CMake Spelling
2018-11-02 18:23:42 +01:00
Axel Huebl
a7567bc596
Remove EOL whitespaces in natvis
2018-11-02 10:42:48 +01:00
Axel Huebl
f049836d68
CMake: Optional Install if Embedded
...
When adding this library as embedded library with private
"target link", e.g. only used inside private source files, the
library does not need to be installed when the main project gets
installed.
This adds an additional option `JSON_Install` similar to the
test-build control switch in order to skip installing headers and
CMake config files if requested.
Avoids using
```cmake
add_subdirectory(path/to/nlohmann_json EXCLUDE_FROM_ALL)
```
which has further side-effects:
https://cmake.org/cmake/help/v3.0/command/add_subdirectory.html
2018-11-02 10:18:00 +01:00
Axel Huebl
689382a722
Fix EOL Whitespaces & CMake Spelling
...
Fix little leftover EOL whitespaces in `CMakeLists.txt` and
a spelling of CMake in README.md
2018-11-02 09:35:17 +01:00
Niels Lohmann
2f73a4d1f3
🚨 fixed a linter warning
2018-10-31 20:30:24 +01:00
Niels Lohmann
e3c28afb61
Merge branch 'release/3.4.0' into develop
2018-10-30 22:20:29 +01:00
Niels Lohmann
0f3c74d821
🔖 set version to 3.4.0
2018-10-30 22:18:45 +01:00
Niels Lohmann
7b2f8cce03
🔖 set version to 3.4.0
2018-10-30 21:30:20 +01:00
Niels Lohmann
8cee0e38d9
🚑 fixed #1319
2018-10-30 17:29:05 +01:00
Niels Lohmann
856fc31d0a
💄 fixed indentation
2018-10-29 19:44:19 +01:00
Niels Lohmann
39419cd5c4
🚨 fixed another linter warning
2018-10-29 18:51:30 +01:00
Niels Lohmann
86b5ce953a
📝 added examples for BSON functions
2018-10-28 15:09:26 +01:00
Niels Lohmann
d2e4f0b0d9
✏️ fixed some typos
2018-10-28 14:20:20 +01:00
Niels Lohmann
f0c1459554
🐛 fixed a bug parsing BSON strings #1320
2018-10-28 09:16:40 +01:00
Niels Lohmann
24946f67f1
🚨 fixed some more linter warnings
2018-10-28 09:15:41 +01:00
Niels Lohmann
7d0dc10169
🚨 fixed a linter warning
2018-10-27 18:34:35 +02:00
Niels Lohmann
45a761bd60
Merge branch 'develop' of https://github.com/nlohmann/json into develop
2018-10-27 18:31:06 +02:00
Niels Lohmann
4e765596f7
🔨 small improvements
2018-10-27 18:31:03 +02:00
Niels Lohmann
1308ea055d
Merge pull request #1315 from nlohmann/feature/convert_char
...
Properly convert constants to CharType
2018-10-27 16:56:00 +02:00
Niels Lohmann
0e7be06bef
Merge pull request #1323 from nlohmann/feature/enum_json_mapping
...
Add macro to define enum/JSON mapping
2018-10-27 16:55:39 +02:00
Niels Lohmann
85aaf91b85
Merge branch 'develop' into feature/enum_json_mapping
2018-10-27 16:52:59 +02:00
Niels Lohmann
5a6bdf5934
Merge branch 'develop' into feature/convert_char
2018-10-27 16:48:48 +02:00
Niels Lohmann
037e93f5c0
Merge pull request #1320 from nlohmann/julian-becker-feature/bson
...
Add BSON support
2018-10-27 16:37:54 +02:00
Niels Lohmann
9f48bb6937
⚡ replaced vector by array #1323
2018-10-27 09:58:23 +02:00
Niels Lohmann
6384fe28db
🚨 fixed another linter warning
2018-10-26 23:12:41 +02:00
Niels Lohmann
ad639ad5e6
✨ added NLOHMANN_JSON_SERIALIZE_ENUM marco #1208
2018-10-26 14:48:20 +02:00
Niels Lohmann
544150d5a5
🚨 fixed another linter warning
2018-10-26 11:10:49 +02:00
Niels Lohmann
c2e175763c
👌 added another conversion function #1315
2018-10-25 22:47:08 +02:00
Niels Lohmann
d97fa30795
👌 fixed comment #1320
2018-10-25 22:29:27 +02:00
Niels Lohmann
7ce720b700
🚨 fixed coverage
2018-10-25 18:21:50 +02:00
Niels Lohmann
19647e083c
🚨 fixed compiler warnings
2018-10-25 14:27:55 +02:00
Niels Lohmann
62126278a6
🔨 added fix for arrays
2018-10-25 13:01:18 +02:00
Niels Lohmann
1968e5c793
🎨 clean up binary formats
2018-10-24 23:39:30 +02:00
Niels Lohmann
4d1eaace8c
🔨 fixed fuzz code to avoid false positives in case of discarded values
2018-10-24 18:55:08 +02:00
Niels Lohmann
e2c5913a50
🚧 some changes to the BSON code
...
- added fuzz testers
- added some reference files
- made an exception text more clear
2018-10-24 15:43:37 +02:00
Niels Lohmann
bba159121f
Merge branch 'feature/bson' of https://github.com/julian-becker/json into julian-becker-feature/bson
2018-10-24 15:03:15 +02:00
Niels Lohmann
f102df3cba
📝 updated documentation #1314
2018-10-24 09:28:57 +02:00
Niels Lohmann
7b501de054
Merge pull request #1314 from nlohmann/feature/codec_errors
...
Allow to set error handler for decoding errors
2018-10-24 08:40:58 +02:00
Niels Lohmann
20038e2703
📝 added a note to the discussion #1286
2018-10-23 23:00:43 +02:00
Niels Lohmann
87ef3f25f2
✏️ fixed a typo #1314
2018-10-23 22:56:10 +02:00
Niels Lohmann
b49f76931f
👌 replaced static_cast to CharType by conversion function #1286
2018-10-23 17:49:04 +02:00
Niels Lohmann
2343d9caeb
💚 additional tests from the Unicode spec #1198
...
Thanks @abolz!
2018-10-23 17:22:13 +02:00
Niels Lohmann
951a7a6455
🚧 fixed test cases #1198
2018-10-22 18:20:45 +02:00
