Sven Fink
095aae19fe
Supress -Wfloat-equal on intended float comparisions
2021-08-03 08:58:38 +02:00
Niels Lohmann
9a459e1bd5
🚨 fix useless-cast warnings
2021-07-30 15:20:22 +02:00
Niels Lohmann
7feb2c20cf
🚨 fix useless-cast warnings
2021-07-30 14:48:25 +02:00
Niels Lohmann
a563338039
Merge pull request #2825 from ldionne/ldionne-lazy
...
Properly constrain the basic_json conversion operator
2021-07-22 12:24:56 +02:00
Louis Dionne
b0e5965d71
Properly constrain the basic_json conversion operator
...
Fixes #2491
2021-07-19 11:16:27 -04:00
Niels Lohmann
7066ab128f
🎨 reindent code
2021-07-19 16:56:28 +02:00
Niels Lohmann
b7cc47089f
⚡ avoid string in case of empty objects
2021-07-16 09:27:18 +02:00
Niels Lohmann
c89e23c69b
Merge pull request #2874 from nlohmann/issue2572
...
Fix truncation warning
2021-07-16 07:54:48 +02:00
Niels Lohmann
953dcfb611
🚨 fix warning #2572
2021-07-15 22:00:16 +02:00
Niels Lohmann
3e4723a49f
🔨 remove noexcept annotation
2021-07-15 21:49:09 +02:00
Niels Lohmann
ecaac22656
💡 add comment to describe j.m_value.destroy(j.m_type) calls
2021-07-15 20:34:50 +02:00
Niels Lohmann
f6863e062c
🐛 fix leak for all types
2021-07-15 20:32:37 +02:00
Niels Lohmann
0011cd1b72
🐛 fix leak for strings
2021-07-15 13:12:21 +02:00
Niels Lohmann
0f8666ecdc
🐛 fix leak for strings
2021-07-15 13:03:20 +02:00
Niels Lohmann
6cbdc83994
🐛 fix leak for strings
2021-07-15 12:47:15 +02:00
Niels Lohmann
149ded856f
♻️ simplify destroy() function for primitive types
2021-07-15 12:46:48 +02:00
Niels Lohmann
a711e1f5a7
🚨 fix warnings
2021-07-13 15:37:57 +02:00
Niels Lohmann
3bb9467073
♻️ move capacity check to set_parent function
2021-07-13 15:27:27 +02:00
Niels Lohmann
bc7e8faa4f
🔥 remove duplicated line
2021-07-12 19:21:07 +02:00
Niels Lohmann
b0730f29cf
🐛 fix logics
2021-07-12 15:24:06 +02:00
Niels Lohmann
d40e98ecef
🐛 fix assertion failure #2838
2021-07-12 13:38:28 +02:00
David Pfahler
aa849a2275
Merge branch 'nlohmann:develop' into without-io
2021-06-14 08:22:49 +02:00
David Pfahler
e939b59683
fixed amalgation file for #2728
2021-05-31 14:27:23 +02:00
Niels Lohmann
b08139ea4b
♻️ replace EOF with std::char_traits<char>::eof()
2021-05-04 10:22:34 +02:00
Niels Lohmann
d0ab2b86c3
📝 update documentation
2021-04-29 17:19:57 +02:00
Niels Lohmann
8a29a6ecf4
Merge pull request #2731 from theShmoo/custom-cpp-version
...
Fixes #2730
2021-04-29 09:55:16 +02:00
Niels Lohmann
cdfe865486
📝 add documentation for numbers
2021-04-28 20:33:05 +02:00
David Pfahler
d140a1c777
fixed amalgamation file
2021-04-26 08:39:24 +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
0a2de2f5b9
fixed amalgation file for #2728
2021-04-21 12:54:55 +02:00
David Pfahler
6b267e3cb1
fixed amalgation file for #2730
2021-04-21 12:53:58 +02:00
David Pfahler
38952643c5
generate amalgation to fix CI for #2730
2021-04-21 12:46:37 +02:00
raduteo
e8dbd7be86
Update json.hpp
...
Proposed fix for #2706
2021-04-09 09:35:58 -04:00
Anthony VH
2b865131d8
Fixing CI errors.
2021-03-24 23:33:21 +01:00
Niels Lohmann
41dbd50313
📄 use code from Google Abseil
2021-03-24 13:27:00 +01:00
Anthony VH
322bc99d8e
Reran amalgamate.
2021-03-24 13:03:36 +01: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
Remy Jette
0a9ec38f44
Remove HEDLEY annotation from exception::what()
...
The latest MSVC compiler throws the following warning on
nlohmann::detail::exception::what() if /analyze is enabled:
```
vcruntime_exception.h(93) : warning C28204: 'what' has an override at
`nlohmann\json\develop\single_include\nlohmann\json.hpp(2644)`
and only the override is annotated for return: when an override is
annotated, the base (this function) should be similarly annotated.
```
See https://godbolt.org/z/r331h4
2021-03-15 17:45:40 -07:00
Niels Lohmann
176d8e261a
Merge pull request #2562 from nlohmann/diagnostics
...
Better diagnostics
2021-02-10 07:20:54 +01:00
Niels Lohmann
bb90e34d22
⬆️ Hedley v15
2021-02-07 17:47:08 +01:00
Niels Lohmann
56a6dec0de
🔀 merge develop branch
2021-02-07 17:46:11 +01:00
Niels Lohmann
6d4eed5aeb
🚨 fix warning
2021-01-30 12:51:54 +01:00
Niels Lohmann
ffdeb77468
🚨 fix warnings #2615
2021-01-27 12:54:46 +01:00
Anthony VH
130382f2a9
Remove comment about GCC commit which didn't really relate to the code.
2021-01-24 20:02:24 +01:00
Anthony VH
848927ae90
Updated comments as requested.
2021-01-23 18:24:47 +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
d7c0f157c5
Merged from_json for pair and tuple to try to fix C2995 error in old MSVC versions.
2021-01-13 20:47:03 +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
fc8c584288
Regenerated single include.
2021-01-12 18:29:05 +01:00
