Merge pull request #28 from Romain-Geissler-1A/deprecated-copy-warning

Fix gcc 9 deprecated copy warning.
boostorg · Aug 24, 2023 · 5425a29 · 5425a29
2 parents bf4b6a3 + 1d2c324
commit 5425a29
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 6 deletions.
diff --git a/include/boost/accumulators/framework/accumulator_set.hpp b/include/boost/accumulators/framework/accumulator_set.hpp
@@ -61,7 +61,7 @@ namespace detail
         }
 
     private:
-        accumulator_visitor &operator =(accumulator_visitor const &);
+        BOOST_DELETED_FUNCTION(accumulator_visitor &operator =(accumulator_visitor const &))
         Args const &args;
     };
 

diff --git a/include/boost/accumulators/framework/accumulators/droppable_accumulator.hpp b/include/boost/accumulators/framework/accumulators/droppable_accumulator.hpp
@@ -49,7 +49,7 @@ namespace boost { namespace accumulators
             }
 
         private:
-            add_ref_visitor &operator =(add_ref_visitor const &);
+            BOOST_DELETED_FUNCTION(add_ref_visitor &operator =(add_ref_visitor const &))
             Args const &args_;
         };
 
@@ -87,7 +87,7 @@ namespace boost { namespace accumulators
             }
 
         private:
-            drop_visitor &operator =(drop_visitor const &);
+            BOOST_DELETED_FUNCTION(drop_visitor &operator =(drop_visitor const &))
             Args const &args_;
         };
 
@@ -227,7 +227,7 @@ namespace boost { namespace accumulators
         }
 
     private:
-        with_cached_result &operator =(with_cached_result const &);
+        BOOST_DELETED_FUNCTION(with_cached_result &operator =(with_cached_result const &))
 
         void set(result_type const &r)
         {

diff --git a/include/boost/accumulators/framework/depends_on.hpp b/include/boost/accumulators/framework/depends_on.hpp
@@ -321,6 +321,12 @@ namespace boost { namespace accumulators
             {
             }
 
+            accumulator_wrapper& operator=(accumulator_wrapper const &that)
+            {
+                *static_cast<Accumulator *>(this) = *static_cast<Accumulator const *>(&that);
+                return *this;
+            }
+
             template<typename Args>
             accumulator_wrapper(Args const &args)
               : Accumulator(args)

diff --git a/include/boost/accumulators/statistics/tail.hpp b/include/boost/accumulators/statistics/tail.hpp
@@ -88,7 +88,7 @@ namespace detail
         }
 
     private:
-        stat_assign_visitor &operator =(stat_assign_visitor const &);
+        BOOST_DELETED_FUNCTION(stat_assign_visitor &operator =(stat_assign_visitor const &))
         Args const &args;
         std::size_t index;
     };
@@ -264,7 +264,7 @@ namespace impl
             }
 
         private:
-            indirect_cmp &operator =(indirect_cmp const &);
+            BOOST_DELETED_FUNCTION(indirect_cmp &operator =(indirect_cmp const &))
             std::vector<Sample> const &samples;
         };