From 497994569041c0624f10803b2bfbc6e65f62cd92 Mon Sep 17 00:00:00 2001 From: Nikita Kniazev Date: Thu, 30 Apr 2020 02:19:07 +0300 Subject: [PATCH] Fix -Wdeprecated-copy --- .../fusion/adapted/boost_array/array_iterator.hpp | 4 +--- .../fusion/adapted/std_array/std_array_iterator.hpp | 4 +--- .../fusion/adapted/struct/detail/proxy_type.hpp | 3 +-- include/boost/fusion/support/unused.hpp | 13 ------------- .../view/single_view/single_view_iterator.hpp | 12 +----------- 5 files changed, 4 insertions(+), 32 deletions(-) diff --git a/include/boost/fusion/adapted/boost_array/array_iterator.hpp b/include/boost/fusion/adapted/boost_array/array_iterator.hpp index ca8da0a2..540cbfed 100644 --- a/include/boost/fusion/adapted/boost_array/array_iterator.hpp +++ b/include/boost/fusion/adapted/boost_array/array_iterator.hpp @@ -103,9 +103,7 @@ namespace boost { namespace fusion } }; - private: - - array_iterator& operator=(array_iterator const&); + BOOST_DELETED_FUNCTION(array_iterator& operator=(array_iterator const&)) }; }} diff --git a/include/boost/fusion/adapted/std_array/std_array_iterator.hpp b/include/boost/fusion/adapted/std_array/std_array_iterator.hpp index 29584512..4fac5707 100644 --- a/include/boost/fusion/adapted/std_array/std_array_iterator.hpp +++ b/include/boost/fusion/adapted/std_array/std_array_iterator.hpp @@ -100,9 +100,7 @@ namespace boost { namespace fusion } }; - private: - - std_array_iterator& operator=(std_array_iterator const&); + BOOST_DELETED_FUNCTION(std_array_iterator& operator=(std_array_iterator const&)) }; }} diff --git a/include/boost/fusion/adapted/struct/detail/proxy_type.hpp b/include/boost/fusion/adapted/struct/detail/proxy_type.hpp index b4cb55bb..1679561b 100644 --- a/include/boost/fusion/adapted/struct/detail/proxy_type.hpp +++ b/include/boost/fusion/adapted/struct/detail/proxy_type.hpp @@ -28,8 +28,7 @@ \ WRAPPED_TYPE& obj; \ \ - private: \ - NAME& operator= (NAME const&); \ + BOOST_DELETED_FUNCTION(NAME& operator= (NAME const&)) \ }; \ \ BOOST_FUSION_ADAPT_STRUCT_NAMESPACE_DEFINITION_END(NAMESPACE_SEQ) diff --git a/include/boost/fusion/support/unused.hpp b/include/boost/fusion/support/unused.hpp index c376d07f..8947adea 100644 --- a/include/boost/fusion/support/unused.hpp +++ b/include/boost/fusion/support/unused.hpp @@ -28,24 +28,11 @@ namespace boost { namespace fusion { }) - BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED - BOOST_DEFAULTED_FUNCTION( - unused_type(unused_type const&) BOOST_FUSION_NOEXCEPT_ON_DEFAULTED, - { - }) - template BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED unused_type(T const&) BOOST_NOEXCEPT { } - - BOOST_FUSION_CONSTEXPR_THIS BOOST_FUSION_GPU_ENABLED - unused_type const& - operator=(unused_type const&) const BOOST_NOEXCEPT - { - return *this; - } }; BOOST_CONSTEXPR_OR_CONST unused_type unused = unused_type(); diff --git a/include/boost/fusion/view/single_view/single_view_iterator.hpp b/include/boost/fusion/view/single_view/single_view_iterator.hpp index 0f3e2744..0de6c842 100644 --- a/include/boost/fusion/view/single_view/single_view_iterator.hpp +++ b/include/boost/fusion/view/single_view/single_view_iterator.hpp @@ -20,11 +20,6 @@ #include #include -#if defined (BOOST_MSVC) -# pragma warning(push) -# pragma warning (disable: 4512) // assignment operator could not be generated. -#endif - namespace boost { namespace fusion { struct single_view_iterator_tag; @@ -46,8 +41,7 @@ namespace boost { namespace fusion SingleView& view; - private: - single_view_iterator& operator=(single_view_iterator const&); + BOOST_DELETED_FUNCTION(single_view_iterator& operator=(single_view_iterator const&)) }; }} @@ -60,10 +54,6 @@ namespace std } #endif -#if defined (BOOST_MSVC) -# pragma warning(pop) -#endif - #endif