From f993635f4d2ad02f7870bb6933fc17ebbf601d05 Mon Sep 17 00:00:00 2001 From: Dmitry Arkhipov Date: Wed, 16 Nov 2022 22:05:16 +0300 Subject: [PATCH] fix pedantic warnings --- include/boost/json/impl/conversion.hpp | 4 ++-- test/conversion.cpp | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/boost/json/impl/conversion.hpp b/include/boost/json/impl/conversion.hpp index 24e97bc8..8e0b6abc 100644 --- a/include/boost/json/impl/conversion.hpp +++ b/include/boost/json/impl/conversion.hpp @@ -85,14 +85,14 @@ template using has_size_member_helper = std::is_convertible().size()), std::size_t>; template -using has_size_member = mp11::mp_valid_and_true;; +using has_size_member = mp11::mp_valid_and_true; template using has_free_size_helper = std::is_convertible< decltype(size(std::declval())), std::size_t>; template -using has_free_size = mp11::mp_valid_and_true;; +using has_free_size = mp11::mp_valid_and_true; template using size_implementation = mp11::mp_cond< has_size_member, mp11::mp_int<3>, diff --git a/test/conversion.cpp b/test/conversion.cpp index 9f2d1493..cd3fd1e5 100644 --- a/test/conversion.cpp +++ b/test/conversion.cpp @@ -74,10 +74,10 @@ struct pseudo_multimap1 struct my_null { }; struct described1 { }; -BOOST_DESCRIBE_STRUCT(described1, (), ()); +BOOST_DESCRIBE_STRUCT(described1, (), ()) struct described2 : described1 { }; -BOOST_DESCRIBE_STRUCT(described2, (described1), ()); +BOOST_DESCRIBE_STRUCT(described2, (described1), ()) struct described3 { @@ -86,7 +86,7 @@ struct described3 private: int m; }; -BOOST_DESCRIBE_STRUCT(described3, (), (n)); +BOOST_DESCRIBE_STRUCT(described3, (), (n)) struct described4 { @@ -110,10 +110,10 @@ union described6 { int n; }; -BOOST_DESCRIBE_STRUCT(described6, (), (n)); +BOOST_DESCRIBE_STRUCT(described6, (), (n)) enum class described_enum { e }; -BOOST_DESCRIBE_ENUM(described_enum, e); +BOOST_DESCRIBE_ENUM(described_enum, e) enum class undescribed_enum { };