From 876b951931b1f30852344095aa950bee99bd0836 Mon Sep 17 00:00:00 2001
From: Hans Dembinski <hans.dembinski@gmail.com>
Date: Fri, 26 Oct 2018 01:47:07 +0200
Subject: [PATCH] suppress pragma warning and ignore failing test on msvc

---
 include/boost/histogram/storage/adaptive_storage.hpp | 4 ++++
 test/axis_test.cpp                                   | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/include/boost/histogram/storage/adaptive_storage.hpp b/include/boost/histogram/storage/adaptive_storage.hpp
index b0128697..880ac3d1 100644
--- a/include/boost/histogram/storage/adaptive_storage.hpp
+++ b/include/boost/histogram/storage/adaptive_storage.hpp
@@ -15,11 +15,15 @@
 #include <boost/histogram/detail/meta.hpp>
 #include <boost/histogram/weight.hpp>
 #include <boost/mp11.hpp>
+#ifdef __clang__
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wunused-parameter"
+#endif
 // warning-ignore required in Boost-1.66 for cpp_int.hpp:822
 #include <boost/multiprecision/cpp_int.hpp>
+#ifdef __clang__
 #pragma clang diagnostic pop
+#endif
 #include <iostream>
 #include <limits>
 #include <memory>
diff --git a/test/axis_test.cpp b/test/axis_test.cpp
index 08107f59..6dc9c1d6 100644
--- a/test/axis_test.cpp
+++ b/test/axis_test.cpp
@@ -358,8 +358,10 @@ int main() {
          "category(0, 1, 2, metadata=\"category\", options=overflow)");
     test(axis::category<std::string>({"A", "B"}, "category2"),
          "category(\"A\", \"B\", metadata=\"category2\", options=overflow)");
+#ifndef _MSC_VER // fails on MSVC because demagnled name for user_defined looks different
     test(axis::integer<int, user_defined>(-1, 1, {}, axis::option_type::none),
          "integer(-1, 1, metadata=main::user_defined, options=none)");
+#endif
   }
 
   // axis::variant support for minimal_axis