--- a/boost/accumulators/framework/accumulator_set.hpp	2008-06-20 09:01:50.000000000 -0700
+++ b/boost/accumulators/framework/accumulator_set.hpp	2009-05-14 13:27:51.000000000 -0700
@@ -42,8 +42,8 @@
     template<typename Args>
     struct accumulator_visitor
     {
-        explicit accumulator_visitor(Args const &args)
-          : args(args)
+        explicit accumulator_visitor(Args const &in_args)
+          : args(in_args)
         {
         }
 
--- a/boost/accumulators/framework/accumulators/droppable_accumulator.hpp	2008-06-19 20:47:42.000000000 -0700
+++ b/boost/accumulators/framework/accumulators/droppable_accumulator.hpp	2009-05-14 13:23:19.000000000 -0700
@@ -218,9 +218,9 @@
     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
--- a/boost/accumulators/statistics/rolling_mean.hpp	2008-12-30 11:30:45.000000000 -0800
+++ b/boost/accumulators/statistics/rolling_mean.hpp	2009-05-14 13:33:12.000000000 -0700
@@ -69,7 +69,7 @@
 //
 namespace extract
 {
-    extractor<tag::rolling_mean> const rolling_mean = {};
+    extern extractor<tag::rolling_mean> const rolling_mean = {};
 }
 
 using extract::rolling_mean;
--- a/boost/accumulators/statistics/rolling_window.hpp	2008-12-30 11:30:45.000000000 -0800
+++ b/boost/accumulators/statistics/rolling_window.hpp	2009-05-14 13:32:57.000000000 -0700
@@ -153,8 +153,8 @@
 //
 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;
--- a/boost/accumulators/statistics_fwd.hpp	2008-12-30 11:30:45.000000000 -0800
+++ b/boost/accumulators/statistics_fwd.hpp	2009-05-14 13:31:22.000000000 -0700
@@ -30,7 +30,7 @@
 }
 namespace extract
 {
-    extractor<tag::quantile> const quantile = {};
+    extern extractor<tag::quantile> const quantile = {};
 }
 using extract::quantile;
 
@@ -46,7 +46,7 @@
 }
 namespace extract
 {
-    extractor<tag::tail_mean> const tail_mean = {};
+    extern extractor<tag::tail_mean> const tail_mean = {};
 }
 using extract::tail_mean;