From 692f8082c82b53b8997bf15cda7df07104f91019 Mon Sep 17 00:00:00 2001
From: Hans Dembinski <hans.dembinski@gmail.com>
Date: Wed, 14 Nov 2018 00:15:32 +0100
Subject: [PATCH] fix win

---
 include/boost/histogram/storage_adaptor.hpp | 2 ++
 test/histogram_test.cpp                     | 5 +++--
 test/storage_adaptor_test.cpp               | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/include/boost/histogram/storage_adaptor.hpp b/include/boost/histogram/storage_adaptor.hpp
index c3874d76..983aa032 100644
--- a/include/boost/histogram/storage_adaptor.hpp
+++ b/include/boost/histogram/storage_adaptor.hpp
@@ -83,6 +83,8 @@ struct element_adaptor_generic {
 template <typename T>
 using element_adaptor =
     mp11::mp_if<is_accumulator_set<T>, element_adaptor_accumulator_set,
+                // is_incrementable is used instead of std::is_arithmetic, which also
+                // works with wrapped integers like copyable_atomic<int>
                 mp11::mp_if<detail::is_incrementable<T>, element_adaptor_incrementable,
                             element_adaptor_generic>>;
 
diff --git a/test/histogram_test.cpp b/test/histogram_test.cpp
index 1d0cf58e..19746c7c 100644
--- a/test/histogram_test.cpp
+++ b/test/histogram_test.cpp
@@ -291,7 +291,8 @@ void run_tests() {
 
   // d1 mean
   {
-    auto h = make_s(Tag(), std::vector<accumulators::mean<>>(), axis::integer<>(0, 2));
+    auto h =
+        make_s(Tag(), std::vector<accumulators::mean<double>>(), axis::integer<>(0, 2));
 
     h(0, sample(1));
     h(0, sample(2));
@@ -310,7 +311,7 @@ void run_tests() {
 
   // d1 weighted mean
   {
-    auto h = make_s(Tag(), std::vector<accumulators::weighted_mean<>>(),
+    auto h = make_s(Tag(), std::vector<accumulators::weighted_mean<double>>(),
                     axis::integer<>(0, 2));
 
     h(0, sample(1));
diff --git a/test/storage_adaptor_test.cpp b/test/storage_adaptor_test.cpp
index 55ad169b..1df51d88 100644
--- a/test/storage_adaptor_test.cpp
+++ b/test/storage_adaptor_test.cpp
@@ -214,7 +214,7 @@ int main() {
 
   // with accumulators::weighted_mean
   {
-    auto a = storage_adaptor<std::vector<accumulators::weighted_mean<>>>();
+    auto a = storage_adaptor<std::vector<accumulators::weighted_mean<double>>>();
     a.reset(1);
     a(0, /* sample */ 1);
     a(0, /* weight */ 2, /* sample */ 2);