Ticket #3031: boost-00.patch

boost/accumulators/framework/accumulator_set.hpp

@@ -42 +42 @@
     template<typename Args>
     struct accumulator_visitor
     {
-        explicit accumulator_visitor(Args const &args)
-          : args(args)
+        explicit accumulator_visitor(Args const &in_args)
+          : args(in_args)
         {
         }
 

boost/accumulators/framework/accumulators/droppable_accumulator.hpp

@@ -218 +218 @@
     private:
         with_cached_result &operator =(with_cached_result const &);
 
-        void set(result_type const &result)
+        void set(result_type const &in_result)
         {
-            ::new(this->cache.address()) result_type(result);
+            ::new(this->cache.address()) result_type(in_result);
         }
 
         result_type const &get() const

boost/accumulators/statistics/rolling_mean.hpp

@@ -69 +69 @@
 //
 namespace extract
 {
-    extractor<tag::rolling_mean> const rolling_mean = {};
+    extern extractor<tag::rolling_mean> const rolling_mean = {};
 }
 
 using extract::rolling_mean;

boost/accumulators/statistics/rolling_window.hpp

@@ -153 +153 @@
 //
 namespace extract
 {
-    extractor<tag::rolling_window_plus1> const rolling_window_plus1 = {};
-    extractor<tag::rolling_window> const rolling_window = {};
+    extern extractor<tag::rolling_window_plus1> const rolling_window_plus1 = {};
+    extern extractor<tag::rolling_window> const rolling_window = {};
 }
 
 using extract::rolling_window_plus1;

boost/accumulators/statistics_fwd.hpp

@@ -30 +30 @@
 }
 namespace extract
 {
-    extractor<tag::quantile> const quantile = {};
+    extern extractor<tag::quantile> const quantile = {};
 }
 using extract::quantile;
 
@@ -46 +46 @@
 }
 namespace extract
 {
-    extractor<tag::tail_mean> const tail_mean = {};
+    extern extractor<tag::tail_mean> const tail_mean = {};
 }
 using extract::tail_mean;