From 371323a65e25d6c6491f45b0448fb88812189e08 Mon Sep 17 00:00:00 2001
From: Hans Dembinski <HDembinski@users.noreply.github.com>
Date: Mon, 9 Mar 2020 16:27:21 +0100
Subject: [PATCH] remove the warnings workaround for variant2

---
 include/boost/histogram/axis/traits.hpp       |  2 +-
 include/boost/histogram/axis/variant.hpp      |  2 +-
 include/boost/histogram/detail/fill_n.hpp     |  2 +-
 .../variant2_with_warnings_disabled.hpp       | 20 -------------------
 test/histogram_fill_test.cpp                  |  2 +-
 5 files changed, 4 insertions(+), 24 deletions(-)
 delete mode 100644 include/boost/histogram/detail/variant2_with_warnings_disabled.hpp

diff --git a/include/boost/histogram/axis/traits.hpp b/include/boost/histogram/axis/traits.hpp
index f9361ca6..b4f8486e 100644
--- a/include/boost/histogram/axis/traits.hpp
+++ b/include/boost/histogram/axis/traits.hpp
@@ -15,7 +15,7 @@
 #include <boost/histogram/detail/static_if.hpp>
 #include <boost/histogram/detail/try_cast.hpp>
 #include <boost/histogram/detail/type_name.hpp>
-#include <boost/histogram/detail/variant2_with_warnings_disabled.hpp>
+#include <boost/variant2/variant.hpp>
 #include <boost/histogram/fwd.hpp>
 #include <boost/mp11/algorithm.hpp>
 #include <boost/mp11/list.hpp>
diff --git a/include/boost/histogram/axis/variant.hpp b/include/boost/histogram/axis/variant.hpp
index 45e64c8d..35d7f5b6 100644
--- a/include/boost/histogram/axis/variant.hpp
+++ b/include/boost/histogram/axis/variant.hpp
@@ -14,7 +14,7 @@
 #include <boost/histogram/detail/relaxed_equal.hpp>
 #include <boost/histogram/detail/static_if.hpp>
 #include <boost/histogram/detail/type_name.hpp>
-#include <boost/histogram/detail/variant2_with_warnings_disabled.hpp>
+#include <boost/variant2/variant.hpp>
 #include <boost/histogram/detail/variant_proxy.hpp>
 #include <boost/mp11/algorithm.hpp> // mp_contains
 #include <boost/mp11/list.hpp>      // mp_first
diff --git a/include/boost/histogram/detail/fill_n.hpp b/include/boost/histogram/detail/fill_n.hpp
index 799000db..224a788c 100644
--- a/include/boost/histogram/detail/fill_n.hpp
+++ b/include/boost/histogram/detail/fill_n.hpp
@@ -19,7 +19,7 @@
 #include <boost/histogram/detail/optional_index.hpp>
 #include <boost/histogram/detail/span.hpp>
 #include <boost/histogram/detail/static_if.hpp>
-#include <boost/histogram/detail/variant2_with_warnings_disabled.hpp>
+#include <boost/variant2/variant.hpp>
 #include <boost/histogram/fwd.hpp>
 #include <boost/mp11/algorithm.hpp>
 #include <boost/mp11/bind.hpp>
diff --git a/include/boost/histogram/detail/variant2_with_warnings_disabled.hpp b/include/boost/histogram/detail/variant2_with_warnings_disabled.hpp
deleted file mode 100644
index 60227273..00000000
--- a/include/boost/histogram/detail/variant2_with_warnings_disabled.hpp
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2019 Hans Dembinski
-//
-// Distributed under the Boost Software License, Version 1.0.
-// (See accompanying file LICENSE_1_0.txt
-// or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-#ifndef BOOST_HISTOGRAM_DETAIL_VARIANT2_WITH_WARNINGS_DISABLED_HPP
-#define BOOST_HISTOGRAM_DETAIL_VARIANT2_WITH_WARNINGS_DISABLED_HPP
-
-#include <boost/config/workaround.hpp>
-#if BOOST_WORKAROUND(BOOST_GCC, >= 5)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wextra"
-#endif
-#include <boost/variant2/variant.hpp>
-#if BOOST_WORKAROUND(BOOST_GCC, >= 5)
-#pragma GCC diagnostic pop
-#endif
-
-#endif
diff --git a/test/histogram_fill_test.cpp b/test/histogram_fill_test.cpp
index 03187f4e..b91ff74b 100644
--- a/test/histogram_fill_test.cpp
+++ b/test/histogram_fill_test.cpp
@@ -14,7 +14,7 @@
 #include <boost/histogram/axis/category.hpp>
 #include <boost/histogram/axis/integer.hpp>
 #include <boost/histogram/axis/ostream.hpp>
-#include <boost/histogram/detail/variant2_with_warnings_disabled.hpp>
+#include <boost/variant2/variant.hpp>
 #include <boost/histogram/histogram.hpp>
 #include <boost/histogram/literals.hpp>
 #include <boost/histogram/make_histogram.hpp>