David Pfahler
|
aa849a2275
|
Merge branch 'nlohmann:develop' into without-io
|
2021-06-14 08:22:49 +02:00 |
|
David Pfahler
|
ae9bbbc941
|
include io only if JSON_NO_IO is not set for #2728
|
2021-05-31 14:26:45 +02:00 |
|
Niels Lohmann
|
cdfe865486
|
📝 add documentation for numbers
|
2021-04-28 20:33:05 +02:00 |
|
Niels Lohmann
|
a34e011e24
|
Merge pull request #2576 from AnthonyVH/non_default_constructable_stl_containers
Add support for deserialization of STL containers of non-default constructable types (fixes #2574).
|
2021-04-25 15:22:37 +02:00 |
|
David Pfahler
|
1a1381f071
|
Fixes #2728
includes some macros to be defined for using without file io.
|
2021-04-21 10:24:01 +02:00 |
|
raduteo
|
35d79203ec
|
Update json.hpp
|
2021-04-12 19:47:02 -04:00 |
|
Anthony VH
|
333612ce35
|
Merge remote-tracking branch 'upstream/develop' into non_default_constructable_stl_containers
|
2021-03-24 12:33:57 +01:00 |
|
Niels Lohmann
|
6f551930e5
|
🚨 add new CI and fix warnings (#2561)
* ⚗️ move CI targets to CMake
* ♻️ add target for cpplint
* ♻️ add target for self-contained binaries
* ♻️ add targets for iwyu and infer
* 🔊 add version output
* ♻️ add target for oclint
* 🚨 fix warnings
* ♻️ rename targets
* ♻️ use iwyu properly
* 🚨 fix warnings
* ♻️ use iwyu properly
* ♻️ add target for benchmarks
* ♻️ add target for CMake flags
* 👷 use GitHub Actions
* ⚗️ try to install Clang 11
* ⚗️ try to install GCC 11
* ⚗️ try to install Clang 11
* ⚗️ try to install GCC 11
* ⚗️ add clang analyze target
* 🔥 remove Google Benchmark
* ⬆️ Google Benchmark 1.5.2
* 🔥 use fetchcontent
* 🐧 add target to download a Linux version of CMake
* 🔨 fix dependency
* 🚨 fix includes
* 🚨 fix comment
* 🔧 adjust flags for GCC 11.0.0 20210110 (experimental)
* 🐳 user Docker image to run CI
* 🔧 add target for Valgrind
* 👷 add target for Valgrind tests
* ⚗️ add Dart
* ⏪ remove Dart
* ⚗️ do not call ctest in test subdirectory
* ⚗️ download test data explicitly
* ⚗️ only execute Valgrind tests
* ⚗️ fix labels
* 🔥 remove unneeded jobs
* 🔨 cleanup
* 🐛 fix OCLint call
* ✅ add targets for offline and git-independent tests
* ✅ add targets for C++ language versions and reproducible tests
* 🔨 clean up
* 👷 add CI steps for cppcheck and cpplint
* 🚨 fix warnings from Clang-Tidy
* 👷 add CI steps for Clang-Tidy
* 🚨 fix warnings
* 🔧 select proper binary
* 🚨 fix warnings
* 🚨 suppress some unhelpful warnings
* 🚨 fix warnings
* 🎨 fix format
* 🚨 fix warnings
* 👷 add CI steps for Sanitizers
* 🚨 fix warnings
* ⚡ add optimization to sanitizer build
* 🚨 fix warnings
* 🚨 add missing header
* 🚨 fix warnings
* 👷 add CI step for coverage
* 👷 add CI steps for disabled exceptions and implicit conversions
* 🚨 fix warnings
* 👷 add CI steps for checking indentation
* 🐛 fix variable use
* 💚 fix build
* ➖ remove CircleCI
* 👷 add CI step for diagnostics
* 🚨 fix warning
* 🔥 clean Travis
|
2021-03-24 07:15:18 +01:00 |
|
Niels Lohmann
|
74cc0ab470
|
♻️ remove diagnostics_t class
|
2021-01-25 13:47:50 +01:00 |
|
Niels Lohmann
|
e23af7434d
|
🚨 fix warnings
|
2021-01-17 13:32:26 +01:00 |
|
Niels Lohmann
|
e9d641130d
|
🐛 proper JSON Pointer escape in diagnostic messages
|
2021-01-16 15:33:05 +01:00 |
|
Niels Lohmann
|
7633a21e6c
|
💚 fix build
|
2021-01-15 16:58:05 +01:00 |
|
Niels Lohmann
|
b0d8628c49
|
👌 address comments
|
2021-01-15 16:54:00 +01:00 |
|
Niels Lohmann
|
f8037660d0
|
♻️ add iterator set_parent function
|
2021-01-14 22:43:52 +01:00 |
|
Niels Lohmann
|
a77621687a
|
📝 fix comment
|
2021-01-14 21:56:19 +01:00 |
|
Niels Lohmann
|
b9d3aa4067
|
♻️ split set_parent function
|
2021-01-14 21:55:49 +01:00 |
|
Anthony VH
|
6eb37e9b78
|
Only add conditional constexpr to get() for >= C++14 to work around errors on older compilers.
|
2021-01-14 12:41:30 +01:00 |
|
Anthony VH
|
fbf6df63d9
|
Enable member function calls in trailing return decltype expressions for older compilers.
|
2021-01-13 00:12:51 +01:00 |
|
Anthony VH
|
6ef1614fa9
|
Refactor json::get() to use priority_tag.
|
2021-01-12 18:28:47 +01:00 |
|
Niels Lohmann
|
ff57bdcc8b
|
🐛 fix invariants
|
2021-01-10 22:40:50 +01:00 |
|
Niels Lohmann
|
9d0150c234
|
♻️ simplify code
|
2021-01-10 15:04:14 +01:00 |
|
Niels Lohmann
|
a83404525e
|
🚨 fix warnings
|
2021-01-10 13:39:36 +01:00 |
|
Niels Lohmann
|
e160749003
|
♻️ move diagnostic code in header
|
2021-01-09 19:21:18 +01:00 |
|
Niels Lohmann
|
43cd5c8a4d
|
👌 fix constructor
|
2021-01-08 18:00:23 +01:00 |
|
Niels Lohmann
|
d4a91b7445
|
👌 clean operator[]
|
2021-01-08 11:29:28 +01:00 |
|
Niels Lohmann
|
e4af1ddb18
|
👌 fix operator[]
|
2021-01-08 11:21:41 +01:00 |
|
Niels Lohmann
|
04a0a07159
|
👌 fix move constructor and move assignment
|
2021-01-08 11:21:03 +01:00 |
|
Niels Lohmann
|
0617bd248d
|
👌 fix operator[]
|
2021-01-08 11:10:24 +01:00 |
|
Niels Lohmann
|
ddc3bb1992
|
👌 remove unnecessary assignment from destructor
|
2021-01-08 11:09:58 +01:00 |
|
Niels Lohmann
|
7cdf34b21e
|
Merge branch 'develop' of https://github.com/nlohmann/json into diagnostics
|
2021-01-08 10:20:34 +01:00 |
|
Niels Lohmann
|
085d497bf7
|
📄 update copyright year
|
2021-01-03 20:28:06 +01:00 |
|
Niels Lohmann
|
294fa343d5
|
🐛 fix bug in move constructor
|
2021-01-03 20:06:32 +01:00 |
|
Niels Lohmann
|
ec0b1798bc
|
🚧 implement more parent relations
|
2021-01-02 21:36:11 +01:00 |
|
Niels Lohmann
|
7323a8eb4e
|
🚧 add tests
|
2021-01-02 16:13:04 +01:00 |
|
Niels Lohmann
|
c6e7fa21ed
|
🚧 fix preprocessor check
|
2021-01-02 13:58:05 +01:00 |
|
Niels Lohmann
|
7b047861b0
|
🚧 add diagnostics to exceptions
|
2021-01-02 13:44:41 +01:00 |
|
Niels Lohmann
|
a4d491e22d
|
🚧 better diagnostics
|
2021-01-01 17:23:10 +01:00 |
|
Alexander Karzhenkov
|
cd7acc1dc5
|
Include <string_view> in "nlohmann/json.hpp" when C++17 is used
|
2020-12-20 19:40:36 +05:00 |
|
Niels Lohmann
|
5cc5285fe8
|
🚨 fix shadowing warning
|
2020-12-15 22:15:36 +01:00 |
|
Niels Lohmann
|
9d726c25d5
|
♻️ remove "#define private public"
|
2020-08-12 13:30:06 +02:00 |
|
Niels Lohmann
|
824d55bf26
|
📝 fix documentation #1668
|
2020-08-10 09:24:11 +02:00 |
|
Niels Lohmann
|
b3e5cb7f20
|
🔖 set version to 3.9.1
|
2020-08-06 13:45:29 +02:00 |
|
Niels Lohmann
|
e110667d21
|
🔖 set version to 3.9.0
|
2020-07-27 15:48:09 +02:00 |
|
Niels Lohmann
|
67ed63b196
|
Merge pull request #2312 from nlohmann/docs
Update documentation
|
2020-07-26 10:06:01 +02:00 |
|
Niels Lohmann
|
fad14aabe7
|
📝 update output of meta function
|
2020-07-25 14:41:06 +02:00 |
|
Niels Lohmann
|
d8d499ce9b
|
📝 add more documentation
|
2020-07-24 14:35:52 +02:00 |
|
Niels Lohmann
|
a33c3fdf25
|
Merge branch 'develop' of https://github.com/nlohmann/json into issue2286
Conflicts:
single_include/nlohmann/json.hpp
|
2020-07-23 12:30:07 +02:00 |
|
Niels Lohmann
|
a048b72fe1
|
Merge pull request #1559 from theodelrieu/feat/explicit_conversion_operator
Feat/explicit conversion operator
|
2020-07-23 08:52:51 +02:00 |
|
Théo DELRIEU
|
74b446f5fd
|
add a switch to enable implicit conversions (defaults to true)
wrap implicit conversions tests around the JSON_USE_IMPLICIT_CONVERSIONS
macro
|
2020-07-22 10:49:01 +02:00 |
|
Niels Lohmann
|
8b14c9b305
|
🚨 fix warnings
|
2020-07-21 23:00:56 +02:00 |
|