From 7529e9bb915ea8e662049f6df740b9fccad49d11 Mon Sep 17 00:00:00 2001
From: Hans Dembinski <hans.dembinski@gmail.com>
Date: Mon, 13 Aug 2018 16:17:22 +0200
Subject: [PATCH] fix for msvc 2nd try

---
 include/boost/histogram/histogram.hpp     | 16 ++++++++--------
 include/boost/histogram/histogram_fwd.hpp | 18 +++++++++++-------
 src/python/histogram.cpp                  |  2 +-
 3 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/include/boost/histogram/histogram.hpp b/include/boost/histogram/histogram.hpp
index 0c1c65dc..956de1e5 100644
--- a/include/boost/histogram/histogram.hpp
+++ b/include/boost/histogram/histogram.hpp
@@ -276,11 +276,11 @@ make_static_histogram_with(Storage&& s, Ts&&... axis) {
 
 /// dynamic type factory
 template <typename... Ts>
-histogram<mp11::mp_rename<mp11::mp_set_push_back<axis::types, detail::rm_cv_ref<Ts>...>,
+histogram<mp11::mp_rename<mp11::mp_set_push_back<axis::any_std, detail::rm_cv_ref<Ts>...>,
                           dynamic_axes>>
 make_dynamic_histogram(Ts&&... axis) {
   using histogram_type = histogram<mp11::mp_rename<
-      mp11::mp_set_push_back<axis::types, detail::rm_cv_ref<Ts>...>, dynamic_axes>>;
+      mp11::mp_set_push_back<axis::any_std, detail::rm_cv_ref<Ts>...>, dynamic_axes>>;
   using value_type = typename histogram_type::axes_type::value_type;
   auto axes = typename histogram_type::axes_type({value_type(std::forward<Ts>(axis))...});
   return histogram_type(std::move(axes));
@@ -288,12 +288,12 @@ make_dynamic_histogram(Ts&&... axis) {
 
 /// dynamic type factory with custom storage type
 template <typename Storage, typename... Ts>
-histogram<mp11::mp_rename<mp11::mp_set_push_back<axis::types, detail::rm_cv_ref<Ts>...>,
+histogram<mp11::mp_rename<mp11::mp_set_push_back<axis::any_std, detail::rm_cv_ref<Ts>...>,
                           dynamic_axes>,
           detail::rm_cv_ref<Storage>>
 make_dynamic_histogram_with(Storage&& s, Ts&&... axis) {
   using histogram_type = histogram<
-      mp11::mp_rename<mp11::mp_set_push_back<axis::types, detail::rm_cv_ref<Ts>...>,
+      mp11::mp_rename<mp11::mp_set_push_back<axis::any_std, detail::rm_cv_ref<Ts>...>,
                       dynamic_axes>,
       detail::rm_cv_ref<Storage>>;
   using value_type = typename histogram_type::axes_type::value_type;
@@ -304,11 +304,11 @@ make_dynamic_histogram_with(Storage&& s, Ts&&... axis) {
 /// dynamic type factory from axis iterators
 template <typename Iterator, typename = detail::requires_iterator<Iterator>>
 histogram<mp11::mp_rename<
-    detail::mp_set_union<axis::types, typename Iterator::value_type::types>,
+    detail::mp_set_union<axis::any_std, typename Iterator::value_type::types>,
     dynamic_axes>>
 make_dynamic_histogram(Iterator begin, Iterator end) {
   using histogram_type = histogram<mp11::mp_rename<
-      detail::mp_set_union<axis::types, typename Iterator::value_type::types>,
+      detail::mp_set_union<axis::any_std, typename Iterator::value_type::types>,
       dynamic_axes>>;
   auto axes = typename histogram_type::axes_type(begin, end);
   return histogram_type(std::move(axes));
@@ -317,13 +317,13 @@ make_dynamic_histogram(Iterator begin, Iterator end) {
 template <typename Storage, typename Iterator,
           typename = detail::requires_iterator<Iterator>>
 histogram<mp11::mp_rename<
-              detail::mp_set_union<axis::types, typename Iterator::value_type::types>,
+              detail::mp_set_union<axis::any_std, typename Iterator::value_type::types>,
               dynamic_axes>,
           Storage>
 make_dynamic_histogram_with(Storage&& s, Iterator begin, Iterator end) {
   using histogram_type =
       histogram<mp11::mp_rename<detail::mp_set_union<
-                                    axis::types, typename Iterator::value_type::types>,
+                                    axis::any_std, typename Iterator::value_type::types>,
                                 dynamic_axes>,
                 Storage>;
   auto axes = typename histogram_type::axes_type(begin, end);
diff --git a/include/boost/histogram/histogram_fwd.hpp b/include/boost/histogram/histogram_fwd.hpp
index 094578bd..d9f02a57 100644
--- a/include/boost/histogram/histogram_fwd.hpp
+++ b/include/boost/histogram/histogram_fwd.hpp
@@ -37,15 +37,19 @@ class integer;
 template <typename T = int, typename Allocator = std::allocator<char>>
 class category;
 
-using types = mp11::mp_list<
-    regular<transform::identity>,
-    regular<transform::log>, regular<transform::sqrt>,
-    regular<transform::pow>, circular<>, variable<>,
-    integer<>, category<>, category<std::string>>;
-
 template <typename... Ts>
 class any;
-using any_std = mp11::mp_rename<types, any>;
+using any_std = any<
+    regular<transform::identity, double, std::allocator<char>>,
+    regular<transform::log, double, std::allocator<char>>,
+    regular<transform::sqrt, double, std::allocator<char>>,
+    regular<transform::pow, double, std::allocator<char>>,
+    circular<double, std::allocator<char>>,
+    variable<double, std::allocator<char>>,
+    integer<int, std::allocator<char>>,
+    category<int, std::allocator<char>>,
+    category<std::string, std::allocator<char>>
+>;
 
 } // namespace axis
 
diff --git a/src/python/histogram.cpp b/src/python/histogram.cpp
index 814339a5..573588f7 100644
--- a/src/python/histogram.cpp
+++ b/src/python/histogram.cpp
@@ -156,7 +156,7 @@ bp::object histogram_init(bp::tuple args, bp::dict kwargs) {
   for (unsigned i = 0; i < dim; ++i) {
     bp::object pa = args[i + 1];
     bool success = false;
-    boost::mp11::mp_for_each<bh::axis::types>(axes_appender(pa, axes, success));
+    boost::mp11::mp_for_each<bh::axis::any_std>(axes_appender(pa, axes, success));
     if (!success) {
       std::string msg = "require an axis object, got ";
       msg += bp::extract<std::string>(bp::str(pa));