From c232ac39c02af0a75db2e8d80bbf2d27fd523838 Mon Sep 17 00:00:00 2001 From: Niels Lohmann Date: Tue, 17 Aug 2021 12:03:35 +0200 Subject: [PATCH] :alembic: update warning flags --- cmake/ci.cmake | 14 +++++++------- doc/mkdocs/docs/api/basic_json/binary_t.md | 2 +- .../docs/api/basic_json/cbor_tag_handler_t.md | 2 +- include/nlohmann/byte_container_with_subtype.hpp | 4 ++-- single_include/nlohmann/json.hpp | 4 ++-- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/cmake/ci.cmake b/cmake/ci.cmake index f45f9b4f3e..3ae527b355 100644 --- a/cmake/ci.cmake +++ b/cmake/ci.cmake @@ -110,13 +110,13 @@ set(CLANG_CXXFLAGS "-std=c++11 \ ") # Ignored GCC warnings: -# -Wno-abi-tag We do not care about ABI tags. -# -Wno-aggregate-return The library uses aggregate returns. -# -Wno-long-long The library uses the long long type to interface with system functions. -# -Wno-namespaces The library uses namespaces. -# -Wno-padded We do not care about padding warnings. -# -Wno-system-headers We do not care about warnings in system headers. -# -Wno-templates The library uses templates. +# -Wno-abi-tag We do not care about ABI tags. +# -Wno-aggregate-return The library uses aggregate returns. +# -Wno-long-long The library uses the long long type to interface with system functions. +# -Wno-namespaces The library uses namespaces. +# -Wno-padded We do not care about padding warnings. +# -Wno-system-headers We do not care about warnings in system headers. +# -Wno-templates The library uses templates. set(GCC_CXXFLAGS "-std=c++11 \ -pedantic \ diff --git a/doc/mkdocs/docs/api/basic_json/binary_t.md b/doc/mkdocs/docs/api/basic_json/binary_t.md index 0dd859dccd..f7da1ece08 100644 --- a/doc/mkdocs/docs/api/basic_json/binary_t.md +++ b/doc/mkdocs/docs/api/basic_json/binary_t.md @@ -64,4 +64,4 @@ type `#!cpp binary_t*` must be dereferenced. ## Version history -- Added in version 3.8.0. Changed type of subtype to `std::uint64_t` in version 3.9.2. +- Added in version 3.8.0. Changed type of subtype to `std::uint64_t` in version 3.10.0. diff --git a/doc/mkdocs/docs/api/basic_json/cbor_tag_handler_t.md b/doc/mkdocs/docs/api/basic_json/cbor_tag_handler_t.md index 9281157187..7073b9d7da 100644 --- a/doc/mkdocs/docs/api/basic_json/cbor_tag_handler_t.md +++ b/doc/mkdocs/docs/api/basic_json/cbor_tag_handler_t.md @@ -22,4 +22,4 @@ store ## Version history -- Added in version 3.9.0. Added value `store` in 3.9.2. +- Added in version 3.9.0. Added value `store` in 3.10.0. diff --git a/include/nlohmann/byte_container_with_subtype.hpp b/include/nlohmann/byte_container_with_subtype.hpp index 0c117bff5f..4086e0834d 100644 --- a/include/nlohmann/byte_container_with_subtype.hpp +++ b/include/nlohmann/byte_container_with_subtype.hpp @@ -18,7 +18,7 @@ order to override the binary type. @tparam BinaryType container to store bytes (`std::vector` by default) -@since version 3.8.0; changed type of subtypes to std::uint64_t in 3.9.2. +@since version 3.8.0; changed type of subtypes to std::uint64_t in 3.10.0. */ template class byte_container_with_subtype : public BinaryType @@ -108,7 +108,7 @@ class byte_container_with_subtype : public BinaryType subtype @since version 3.8.0; fixed return value to properly return - subtype_type(-1) as documented in version 3.9.2 + subtype_type(-1) as documented in version 3.10.0 */ constexpr subtype_type subtype() const noexcept { diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp index 89c0d1ca4e..7a65b5fb62 100644 --- a/single_include/nlohmann/json.hpp +++ b/single_include/nlohmann/json.hpp @@ -5004,7 +5004,7 @@ order to override the binary type. @tparam BinaryType container to store bytes (`std::vector` by default) -@since version 3.8.0; changed type of subtypes to std::uint64_t in 3.9.2. +@since version 3.8.0; changed type of subtypes to std::uint64_t in 3.10.0. */ template class byte_container_with_subtype : public BinaryType @@ -5094,7 +5094,7 @@ class byte_container_with_subtype : public BinaryType subtype @since version 3.8.0; fixed return value to properly return - subtype_type(-1) as documented in version 3.9.2 + subtype_type(-1) as documented in version 3.10.0 */ constexpr subtype_type subtype() const noexcept {