From d83fe99cfcface4736a372287cf8b979fca1fdfa Mon Sep 17 00:00:00 2001
From: Hans Dembinski <hans.dembinski@gmail.com>
Date: Sat, 14 Jul 2018 18:10:44 +0200
Subject: [PATCH] renamed axis.hpp to types.hpp

---
 include/boost/histogram.hpp                          | 3 ++-
 include/boost/histogram/axis/ostream_operators.hpp   | 2 +-
 include/boost/histogram/axis/{axis.hpp => types.hpp} | 0
 include/boost/histogram/dynamic_histogram.hpp        | 2 +-
 include/boost/histogram/static_histogram.hpp         | 2 +-
 src/python/axis.cpp                                  | 2 +-
 test/axis_test.cpp                                   | 2 +-
 7 files changed, 7 insertions(+), 6 deletions(-)
 rename include/boost/histogram/axis/{axis.hpp => types.hpp} (100%)

diff --git a/include/boost/histogram.hpp b/include/boost/histogram.hpp
index 11841a85..bac93b30 100644
--- a/include/boost/histogram.hpp
+++ b/include/boost/histogram.hpp
@@ -7,7 +7,8 @@
 #ifndef BOOST_HISTOGRAM_HPP_
 #define BOOST_HISTOGRAM_HPP_
 
-#include <boost/histogram/axis/axis.hpp>
+#include <boost/histogram/axis/types.hpp>
+#include <boost/histogram/axis/any.hpp>
 #include <boost/histogram/dynamic_histogram.hpp>
 #include <boost/histogram/literals.hpp>
 #include <boost/histogram/static_histogram.hpp>
diff --git a/include/boost/histogram/axis/ostream_operators.hpp b/include/boost/histogram/axis/ostream_operators.hpp
index c714b71f..b66c1032 100644
--- a/include/boost/histogram/axis/ostream_operators.hpp
+++ b/include/boost/histogram/axis/ostream_operators.hpp
@@ -9,7 +9,7 @@
 #ifndef _BOOST_HISTOGRAM_AXIS_OSTREAM_OPERATORS_HPP_
 #define _BOOST_HISTOGRAM_AXIS_OSTREAM_OPERATORS_HPP_
 
-#include <boost/histogram/axis/axis.hpp>
+#include <boost/histogram/axis/types.hpp>
 #include <boost/histogram/axis/interval_view.hpp>
 #include <boost/histogram/axis/value_view.hpp>
 #include <boost/histogram/detail/utility.hpp>
diff --git a/include/boost/histogram/axis/axis.hpp b/include/boost/histogram/axis/types.hpp
similarity index 100%
rename from include/boost/histogram/axis/axis.hpp
rename to include/boost/histogram/axis/types.hpp
diff --git a/include/boost/histogram/dynamic_histogram.hpp b/include/boost/histogram/dynamic_histogram.hpp
index ebbdf91d..8473a0cd 100644
--- a/include/boost/histogram/dynamic_histogram.hpp
+++ b/include/boost/histogram/dynamic_histogram.hpp
@@ -12,7 +12,7 @@
 #include <boost/config.hpp>
 #include <boost/histogram/arithmetic_operators.hpp>
 #include <boost/histogram/axis/any.hpp>
-#include <boost/histogram/axis/axis.hpp>
+#include <boost/histogram/axis/types.hpp>
 #include <boost/histogram/detail/axis_visitor.hpp>
 #include <boost/histogram/detail/cat.hpp>
 #include <boost/histogram/detail/meta.hpp>
diff --git a/include/boost/histogram/static_histogram.hpp b/include/boost/histogram/static_histogram.hpp
index 1f973c31..c1b02cbd 100644
--- a/include/boost/histogram/static_histogram.hpp
+++ b/include/boost/histogram/static_histogram.hpp
@@ -9,7 +9,7 @@
 
 #include <boost/assert.hpp>
 #include <boost/histogram/arithmetic_operators.hpp>
-#include <boost/histogram/axis/axis.hpp>
+#include <boost/histogram/axis/types.hpp>
 #include <boost/histogram/detail/axis_visitor.hpp>
 #include <boost/histogram/detail/meta.hpp>
 #include <boost/histogram/detail/utility.hpp>
diff --git a/src/python/axis.cpp b/src/python/axis.cpp
index 164124bd..1a426b05 100644
--- a/src/python/axis.cpp
+++ b/src/python/axis.cpp
@@ -6,7 +6,7 @@
 
 #include "utility.hpp"
 #include <boost/histogram/histogram_fwd.hpp>
-#include <boost/histogram/axis/axis.hpp>
+#include <boost/histogram/axis/types.hpp>
 #include <boost/histogram/axis/any.hpp>
 #include <boost/histogram/axis/ostream_operators.hpp>
 #include <boost/histogram/detail/utility.hpp>
diff --git a/test/axis_test.cpp b/test/axis_test.cpp
index e805d614..cef85601 100644
--- a/test/axis_test.cpp
+++ b/test/axis_test.cpp
@@ -6,7 +6,7 @@
 
 #include <boost/core/lightweight_test.hpp>
 #include <boost/histogram/axis/any.hpp>
-#include <boost/histogram/axis/axis.hpp>
+#include <boost/histogram/axis/types.hpp>
 #include <boost/histogram/axis/ostream_operators.hpp>
 #include <boost/histogram/detail/axis_visitor.hpp>
 #include <boost/histogram/detail/utility.hpp>