From 36768287a58cf3e3d00affbf34b6fc36a96f1fcc Mon Sep 17 00:00:00 2001
From: badair <badair@harding.edu>
Date: Mon, 28 Mar 2016 04:21:21 -0500
Subject: [PATCH] adding config.hpp, code cleanup

---
 include/callable_traits/bind_expression.hpp   |   1 -
 include/callable_traits/callable_traits.hpp   | 317 +----------------
 .../callable_traits/categorize_bind_arg.hpp   |   1 -
 .../callable_traits/{tags.hpp => config.hpp}  |  16 +-
 include/callable_traits/function.hpp          |   6 +-
 include/callable_traits/function_object.hpp   |   1 -
 include/callable_traits/interface.hpp         | 320 ++++++++++++++++++
 .../member_pointer_utilities.hpp              |   2 -
 include/callable_traits/pmf.hpp               |   7 +-
 .../set_function_qualifiers.hpp               |   2 +-
 10 files changed, 343 insertions(+), 330 deletions(-)
 rename include/callable_traits/{tags.hpp => config.hpp} (71%)
 create mode 100644 include/callable_traits/interface.hpp

diff --git a/include/callable_traits/bind_expression.hpp b/include/callable_traits/bind_expression.hpp
index a1f3057..90306e6 100644
--- a/include/callable_traits/bind_expression.hpp
+++ b/include/callable_traits/bind_expression.hpp
@@ -13,7 +13,6 @@ Distributed under the Boost Software License, Version 1.0.
 
 #include <callable_traits/traits.hpp>
 #include <callable_traits/categorize_bind_arg.hpp>
-#include <callable_traits/tags.hpp>
 #include <callable_traits/placeholder.hpp>
 #include <callable_traits/fwd/bind_expression_fwd.hpp>
 #include <callable_traits/prepend.hpp>
diff --git a/include/callable_traits/callable_traits.hpp b/include/callable_traits/callable_traits.hpp
index cd8d434..96631a4 100644
--- a/include/callable_traits/callable_traits.hpp
+++ b/include/callable_traits/callable_traits.hpp
@@ -7,8 +7,8 @@ Distributed under the Boost Software License, Version 1.0.
 
 */
 
-#ifndef CALLABLE_TRAITS_HPP
-#define CALLABLE_TRAITS_HPP
+#ifndef CALLABLE_TRAITS_CALLABLE_TRAITS_HPP
+#define CALLABLE_TRAITS_CALLABLE_TRAITS_HPP
 
 #ifdef _MSVC_VER
 #pragma warning(push)
@@ -17,318 +17,7 @@ Distributed under the Boost Software License, Version 1.0.
 #pragma warning(disable : 4503)
 #endif //ifdef _MSVC_VER
 
-#include <callable_traits/traits.hpp>
-#include <callable_traits/pmd.hpp>
-#include <callable_traits/pmf.hpp>
-#include <callable_traits/function.hpp>
-#include <callable_traits/function_object.hpp>
-#include <callable_traits/substitution.hpp>
-#include <callable_traits/arity.hpp>
-#include <callable_traits/bind_expression.hpp>
-#include <callable_traits/bind_expression_parser.hpp>
-#include <callable_traits/shallow_decay.hpp>
-#include <callable_traits/disjunction.hpp>
-
-#include <type_traits>
-#include <utility>
-
-namespace callable_traits {
-
-    namespace detail {
-
-        template<bool Value, typename T> 
-        struct value_type_pair {
-            using type = T;
-            static constexpr const bool value = Value;
-        };
-    }
-
-    namespace no_sfinae {
-
-        template<typename T>
-        using args = typename detail::traits<T>::arg_types;
-
-        template<size_t I, typename T>
-        using arg_at = typename detail::disjunction<
-            detail::value_type_pair<std::tuple_size<args<T>>::value <= I, invalid_type>,
-            detail::value_type_pair<true, typename std::tuple_element<I, no_sfinae::args<T>>::type>
-        >::type;
-
-        template<typename T>
-        using signature = typename detail::traits<T>::function_type;
-
-        template<typename T>
-        using qualified_signature = typename detail::traits<T>::abominable_type;
-
-        template<typename T>
-        using result_of = typename detail::traits<T>::return_type;
-
-        template<typename T>
-        using remove_const_qualifier =
-            typename detail::traits<T>::remove_const;
-
-        template<typename T>
-        using remove_volatile_qualifier =
-            typename detail::traits<T>::remove_volatile;
-
-        template<typename T>
-        using remove_cv_qualifiers =
-            typename detail::traits<T>::remove_cv;
-
-        template<typename T>
-        using remove_reference_qualifier =
-            typename detail::traits<T>::remove_reference;
-
-        template<typename T>
-        using remove_varargs =
-            typename detail::traits<T>::remove_varargs;
-
-        template<typename T>
-        using add_const_qualifier =
-            typename detail::traits<T>::add_const;
-
-        template<typename T>
-        using add_volatile_qualifier =
-            typename detail::traits<T>::add_volatile;
-
-        template<typename T>
-        using add_cv_qualifiers =
-            typename detail::traits<T>::add_cv;
-
-        template<typename T>
-        using add_lvalue_qualifier =
-            typename detail::traits<T>::add_lvalue_reference;
-
-        template<typename T>
-        using add_rvalue_qualifier =
-            typename detail::traits<T>::add_rvalue_reference;
-
-        template<typename T>
-        using add_varargs =
-            typename detail::traits<T>::add_varargs;
-    }
-
-    namespace detail {
-
-        template<typename T>
-        using if_valid = typename std::enable_if<
-            !std::is_same<T, unknown>::value
-                && !std::is_same<T, invalid_type>::value,
-            T
-        >::type;
-    }
-
-    template<typename T>
-    using args = detail::if_valid<no_sfinae::args<T>>;
-
-    template<size_t I, typename T>
-    using arg_at = detail::if_valid<typename std::tuple_element<I, no_sfinae::args<T>>::type>;
-
-    template<typename T>
-    using signature = detail::if_valid<no_sfinae::signature<T>>;
-
-    template<typename T>
-    using qualified_signature = detail::if_valid<no_sfinae::qualified_signature<T>>;
-
-    template<typename T>
-    using result_of = detail::if_valid<no_sfinae::result_of<T>>;
-
-    template<typename T>
-    using remove_const_qualifier = detail::if_valid<no_sfinae::remove_const_qualifier<T>>;
-
-    template<typename T>
-    using remove_volatile_qualifier = detail::if_valid<no_sfinae::remove_volatile_qualifier<T>>;
-
-    template<typename T>
-    using remove_cv_qualifiers = detail::if_valid<no_sfinae::remove_cv_qualifiers<T>>;
-
-    template<typename T>
-    using remove_reference_qualifier = detail::if_valid<no_sfinae::remove_reference_qualifier<T>>;
-
-    template<typename T>
-    using add_const_qualifier = detail::if_valid<no_sfinae::add_const_qualifier<T>>;
-
-    template<typename T>
-    using add_volatile_qualifier = detail::if_valid<no_sfinae::add_volatile_qualifier<T>>;
-
-    template<typename T>
-    using add_cv_qualifiers = detail::if_valid<no_sfinae::add_cv_qualifiers<T>>;
-
-    template<typename T>
-    using add_lvalue_qualifier = detail::if_valid<no_sfinae::add_lvalue_qualifier<T>>;
-
-    template<typename T>
-    using add_rvalue_qualifier = detail::if_valid<no_sfinae::add_rvalue_qualifier<T>>;
-
-    template<typename T>
-    using add_varargs = detail::if_valid<no_sfinae::add_varargs<T>>;
-
-    template<typename T>
-    using remove_varargs = detail::if_valid<no_sfinae::remove_varargs<T>>;
-
-    template<typename T, typename... Args>
-    inline constexpr auto
-    can_invoke(T&& t, Args&&... args) {
-        using traits = detail::traits<T&&>;
-        using test = detail::test_invoke<traits, Args&&...>;
-        using result = decltype(test{}(::std::forward<T>(t), ::std::forward<Args>(args)...));
-        using failure = detail::substitution_failure;
-        using is_invalid_invoke = std::is_same<result, failure>;
-        return std::integral_constant<bool, !is_invalid_invoke::value>{};
-    }
-
-    template<typename T>
-    inline constexpr auto
-    is_overloaded(T&&) {
-        return typename detail::traits<T&&>::is_ambiguous{};
-    }
-
-    template<typename T>
-    inline constexpr auto
-    is_overloaded() {
-        return typename detail::traits<T>::is_ambiguous{};
-    }
-
-    template<typename T>
-    inline constexpr auto
-    has_varargs(T&&) {
-        return typename detail::traits<T&&>::has_varargs{};
-    }
-
-    template<typename T>
-    inline constexpr auto
-    has_varargs() {
-        return typename detail::traits<T>::has_varargs{};
-    }
-
-    template< std::size_t SearchLimit = constants::arity_search_limit, typename T>
-    inline constexpr auto
-    min_arity(T&&) {
-        using traits = detail::traits<T&&>;
-        return detail::min_arity_t<traits, SearchLimit>{};
-    }
-
-    template<typename T, std::size_t SearchLimit = constants::arity_search_limit>
-    inline constexpr auto
-    min_arity() {
-        using traits = detail::traits<T>;
-        return detail::min_arity_t<traits, SearchLimit>{};
-    }
-
-    template<std::size_t SearchLimit = constants::arity_search_limit, typename T>
-    inline constexpr auto
-    max_arity(T&&) {
-        return detail::max_arity_t<detail::traits<T&&>, SearchLimit>{};
-    }
-
-    template<typename T, std::size_t SearchLimit = constants::arity_search_limit>
-    inline constexpr auto
-    max_arity() {
-        return detail::max_arity_t<detail::traits<T>, SearchLimit>{};
-    }
-
-    template<typename T>
-    inline constexpr auto
-    arity(T&&) {
-        return detail::arity_t<detail::traits<T&&>>{};
-    }
-
-    template<typename T>
-    inline constexpr auto
-    arity() {
-        return detail::arity_t<detail::traits<T>>{};
-    }
-
-    template<typename T, typename... Args>
-    inline constexpr auto
-    bind_expr(T, Args...) -> detail::bind_expression<T, Args...> {
-        return{};
-    }
-
-    template<typename T>
-    inline constexpr auto
-    is_unqualified() {
-        return typename detail::traits<T>::is_unqualified{};
-    }
-
-    template<typename T>
-    inline constexpr auto
-    is_unqualified(T&&) {
-        return typename detail::traits<T&&>::is_unqualified{};
-    }
-
-    template<typename T>
-    inline constexpr auto
-    is_const_qualified() {
-        return typename detail::traits<T>::is_const_qualified{};
-    }
-
-    template<typename T>
-    inline constexpr auto
-    is_const_qualified(T&&) {
-        return typename detail::traits<T&&>::is_const_qualified{};
-    }
-
-    template<typename T>
-    inline constexpr auto
-    is_cv_qualified() {
-        return typename detail::traits<T>::is_cv_qualified{};
-    }
-
-    template<typename T>
-    inline constexpr auto
-    is_cv_qualified(T&&) {
-        return typename detail::traits<T&&>::is_cv_qualified{};
-    }
-
-    template<typename T>
-    inline constexpr auto
-    is_volatile_qualified() {
-        return typename detail::traits<T>::is_volatile_qualified{};
-    }
-
-    template<typename T>
-    inline constexpr auto
-    is_volatile_qualified(T&&) {
-        return typename detail::traits<T&&>::is_volatile_qualified{};
-    }
-
-    template<typename T>
-    inline constexpr auto
-    is_reference_qualified() {
-        return typename detail::traits<T>::is_reference_qualified{};
-    }
-
-    template<typename T>
-    inline constexpr auto
-    is_reference_qualified(T&&) {
-        return typename detail::traits<T&&>::is_reference_qualified{};
-    }
-
-    template<typename T>
-    inline constexpr auto
-    is_lvalue_reference_qualified() {
-        return typename detail::traits<T>::is_lvalue_reference_qualified{};
-    }
-
-    template<typename T>
-    inline constexpr auto
-    is_lvalue_reference_qualified(T&&) {
-        return typename detail::traits<T&&>::is_lvalue_reference_qualified{};
-    }
-
-    template<typename T>
-    inline constexpr auto
-    is_rvalue_reference_qualified() {
-        return typename detail::traits<T>::is_rvalue_reference_qualified{};
-    }
-
-    template<typename T>
-    inline constexpr auto
-    is_rvalue_reference_qualified(T&&) {
-        return typename detail::traits<T&&>::is_rvalue_reference_qualified{};
-    }
-}
+#include <callable_traits/interface.hpp>
 
 #ifdef _MSVC_VER
 #pragma warning(pop)
diff --git a/include/callable_traits/categorize_bind_arg.hpp b/include/callable_traits/categorize_bind_arg.hpp
index d47ba67..164d129 100644
--- a/include/callable_traits/categorize_bind_arg.hpp
+++ b/include/callable_traits/categorize_bind_arg.hpp
@@ -11,7 +11,6 @@ Distributed under the Boost Software License, Version 1.0.
 #include <callable_traits/placeholder.hpp>
 #include <callable_traits/fwd/bind_expression_fwd.hpp>
 #include <callable_traits/any_arg.hpp>
-#include <callable_traits/tags.hpp>
 #include <functional>
 
 namespace callable_traits {
diff --git a/include/callable_traits/tags.hpp b/include/callable_traits/config.hpp
similarity index 71%
rename from include/callable_traits/tags.hpp
rename to include/callable_traits/config.hpp
index bbaff95..1d3c3dc 100644
--- a/include/callable_traits/tags.hpp
+++ b/include/callable_traits/config.hpp
@@ -7,8 +7,8 @@ Distributed under the Boost Software License, Version 1.0.
 
 */
 
-#ifndef CALLABLE_TRAITS_TAGS_HPP
-#define CALLABLE_TRAITS_TAGS_HPP
+#ifndef CALLABLE_TRAITS_CONFIG_HPP
+#define CALLABLE_TRAITS_CONFIG_HPP
 
 #define CALLABLE_TRAITS_EMPTY_
 #define CALLABLE_TRAITS_EMPTY CALLABLE_TRAITS_EMPTY_
@@ -19,10 +19,19 @@ Distributed under the Boost Software License, Version 1.0.
 #define CALLABLE_TRAITS_VARARGS_CC
 #endif //_MSC_VER
 
+#include <utility>
+
 namespace callable_traits {
 
     namespace detail {
+
         struct dummy {};
+
+        template<bool Value, typename T> 
+        struct value_type_pair {
+            using type = T;
+            static constexpr const bool value = Value;
+        };
     }
     
     struct constants {
@@ -33,5 +42,4 @@ namespace callable_traits {
     struct unknown { unknown() = delete; };
 }
 
-
-#endif
\ No newline at end of file
+#endif
diff --git a/include/callable_traits/function.hpp b/include/callable_traits/function.hpp
index 386eaa0..b0ccbac 100644
--- a/include/callable_traits/function.hpp
+++ b/include/callable_traits/function.hpp
@@ -11,11 +11,11 @@ Distributed under the Boost Software License, Version 1.0.
 #define CALLABLE_TRAITS_FUNCTION_HPP
 
 #include <callable_traits/set_function_qualifiers.hpp>
-#include <callable_traits/tags.hpp>
 #include <callable_traits/qualifiers.hpp>
 #include <callable_traits/member_pointer_utilities.hpp>
 #include <callable_traits/function_object.hpp>
 #include <callable_traits/generalized_class.hpp>
+#include <callable_traits/config.hpp>
 
 #include <tuple>
 
@@ -162,6 +162,8 @@ namespace callable_traits {
         CALLABLE_TRAITS_SPECIALIZE_FUNCTION(const &&);
         CALLABLE_TRAITS_SPECIALIZE_FUNCTION(volatile &&);
         CALLABLE_TRAITS_SPECIALIZE_FUNCTION(const volatile &&);
+        
+#undef CLBL_SPECIALIZE_FUNCTION
 
         template<typename T>
         struct function<T*> : function<T> {
@@ -211,6 +213,4 @@ namespace callable_traits {
     }
 }
 
-#undef CLBL_SPECIALIZE_FUNCTION
-
 #endif
\ No newline at end of file
diff --git a/include/callable_traits/function_object.hpp b/include/callable_traits/function_object.hpp
index e08bdb7..1ae5f3c 100644
--- a/include/callable_traits/function_object.hpp
+++ b/include/callable_traits/function_object.hpp
@@ -12,7 +12,6 @@ Distributed under the Boost Software License, Version 1.0.
 
 #include <callable_traits/generalized_class.hpp>
 #include <callable_traits/pmf.hpp>
-#include <callable_traits/tags.hpp>
 
 #include <tuple>
 
diff --git a/include/callable_traits/interface.hpp b/include/callable_traits/interface.hpp
new file mode 100644
index 0000000..89daa4a
--- /dev/null
+++ b/include/callable_traits/interface.hpp
@@ -0,0 +1,320 @@
+/*!
+@file
+
+@copyright Barrett Adair 2015
+Distributed under the Boost Software License, Version 1.0.
+(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
+
+*/
+
+#ifndef CALLABLE_TRAITS_INTERFACE_HPP
+#define CALLABLE_TRAITS_INTERFACE_HPP
+
+#include <callable_traits/traits.hpp>
+#include <callable_traits/pmd.hpp>
+#include <callable_traits/pmf.hpp>
+#include <callable_traits/function.hpp>
+#include <callable_traits/function_object.hpp>
+#include <callable_traits/substitution.hpp>
+#include <callable_traits/arity.hpp>
+#include <callable_traits/bind_expression.hpp>
+#include <callable_traits/bind_expression_parser.hpp>
+#include <callable_traits/shallow_decay.hpp>
+#include <callable_traits/disjunction.hpp>
+#include <type_traits>
+#include <utility>
+
+namespace callable_traits {
+
+    namespace no_sfinae {
+
+        template<typename T>
+        using args = typename detail::traits<T>::arg_types;
+
+        template<size_t I, typename T>
+        using arg_at = typename detail::disjunction<
+            detail::value_type_pair<std::tuple_size<args<T>>::value <= I, invalid_type>,
+            detail::value_type_pair<true, typename std::tuple_element<I, no_sfinae::args<T>>::type>
+        >::type;
+
+        template<typename T>
+        using signature = typename detail::traits<T>::function_type;
+
+        template<typename T>
+        using qualified_signature = typename detail::traits<T>::abominable_type;
+
+        template<typename T>
+        using result_of = typename detail::traits<T>::return_type;
+
+        template<typename T>
+        using remove_const_qualifier =
+            typename detail::traits<T>::remove_const;
+
+        template<typename T>
+        using remove_volatile_qualifier =
+            typename detail::traits<T>::remove_volatile;
+
+        template<typename T>
+        using remove_cv_qualifiers =
+            typename detail::traits<T>::remove_cv;
+
+        template<typename T>
+        using remove_reference_qualifier =
+            typename detail::traits<T>::remove_reference;
+
+        template<typename T>
+        using remove_varargs =
+            typename detail::traits<T>::remove_varargs;
+
+        template<typename T>
+        using add_const_qualifier =
+            typename detail::traits<T>::add_const;
+
+        template<typename T>
+        using add_volatile_qualifier =
+            typename detail::traits<T>::add_volatile;
+
+        template<typename T>
+        using add_cv_qualifiers =
+            typename detail::traits<T>::add_cv;
+
+        template<typename T>
+        using add_lvalue_qualifier =
+            typename detail::traits<T>::add_lvalue_reference;
+
+        template<typename T>
+        using add_rvalue_qualifier =
+            typename detail::traits<T>::add_rvalue_reference;
+
+        template<typename T>
+        using add_varargs =
+            typename detail::traits<T>::add_varargs;
+    }
+
+    namespace detail {
+
+        template<typename T>
+        using if_valid = typename std::enable_if<
+            !std::is_same<T, unknown>::value
+                && !std::is_same<T, invalid_type>::value,
+            T
+        >::type;
+    }
+
+    template<typename T>
+    using args = detail::if_valid<no_sfinae::args<T>>;
+
+    template<size_t I, typename T>
+    using arg_at = detail::if_valid<typename std::tuple_element<I, no_sfinae::args<T>>::type>;
+
+    template<typename T>
+    using signature = detail::if_valid<no_sfinae::signature<T>>;
+
+    template<typename T>
+    using qualified_signature = detail::if_valid<no_sfinae::qualified_signature<T>>;
+
+    template<typename T>
+    using result_of = detail::if_valid<no_sfinae::result_of<T>>;
+
+    template<typename T>
+    using remove_const_qualifier = detail::if_valid<no_sfinae::remove_const_qualifier<T>>;
+
+    template<typename T>
+    using remove_volatile_qualifier = detail::if_valid<no_sfinae::remove_volatile_qualifier<T>>;
+
+    template<typename T>
+    using remove_cv_qualifiers = detail::if_valid<no_sfinae::remove_cv_qualifiers<T>>;
+
+    template<typename T>
+    using remove_reference_qualifier = detail::if_valid<no_sfinae::remove_reference_qualifier<T>>;
+
+    template<typename T>
+    using add_const_qualifier = detail::if_valid<no_sfinae::add_const_qualifier<T>>;
+
+    template<typename T>
+    using add_volatile_qualifier = detail::if_valid<no_sfinae::add_volatile_qualifier<T>>;
+
+    template<typename T>
+    using add_cv_qualifiers = detail::if_valid<no_sfinae::add_cv_qualifiers<T>>;
+
+    template<typename T>
+    using add_lvalue_qualifier = detail::if_valid<no_sfinae::add_lvalue_qualifier<T>>;
+
+    template<typename T>
+    using add_rvalue_qualifier = detail::if_valid<no_sfinae::add_rvalue_qualifier<T>>;
+
+    template<typename T>
+    using add_varargs = detail::if_valid<no_sfinae::add_varargs<T>>;
+
+    template<typename T>
+    using remove_varargs = detail::if_valid<no_sfinae::remove_varargs<T>>;
+
+    template<typename T, typename... Args>
+    inline constexpr auto
+    can_invoke(T&& t, Args&&... args) {
+        using traits = detail::traits<T&&>;
+        using test = detail::test_invoke<traits, Args&&...>;
+        using result = decltype(test{}(::std::forward<T>(t), ::std::forward<Args>(args)...));
+        using failure = detail::substitution_failure;
+        using is_invalid_invoke = std::is_same<result, failure>;
+        return std::integral_constant<bool, !is_invalid_invoke::value>{};
+    }
+
+    template<typename T>
+    inline constexpr auto
+    is_overloaded(T&&) {
+        return typename detail::traits<T&&>::is_ambiguous{};
+    }
+
+    template<typename T>
+    inline constexpr auto
+    is_overloaded() {
+        return typename detail::traits<T>::is_ambiguous{};
+    }
+
+    template<typename T>
+    inline constexpr auto
+    has_varargs(T&&) {
+        return typename detail::traits<T&&>::has_varargs{};
+    }
+
+    template<typename T>
+    inline constexpr auto
+    has_varargs() {
+        return typename detail::traits<T>::has_varargs{};
+    }
+
+    template< std::size_t SearchLimit = constants::arity_search_limit, typename T>
+    inline constexpr auto
+    min_arity(T&&) {
+        using traits = detail::traits<T&&>;
+        return detail::min_arity_t<traits, SearchLimit>{};
+    }
+
+    template<typename T, std::size_t SearchLimit = constants::arity_search_limit>
+    inline constexpr auto
+    min_arity() {
+        using traits = detail::traits<T>;
+        return detail::min_arity_t<traits, SearchLimit>{};
+    }
+
+    template<std::size_t SearchLimit = constants::arity_search_limit, typename T>
+    inline constexpr auto
+    max_arity(T&&) {
+        return detail::max_arity_t<detail::traits<T&&>, SearchLimit>{};
+    }
+
+    template<typename T, std::size_t SearchLimit = constants::arity_search_limit>
+    inline constexpr auto
+    max_arity() {
+        return detail::max_arity_t<detail::traits<T>, SearchLimit>{};
+    }
+
+    template<typename T>
+    inline constexpr auto
+    arity(T&&) {
+        return detail::arity_t<detail::traits<T&&>>{};
+    }
+
+    template<typename T>
+    inline constexpr auto
+    arity() {
+        return detail::arity_t<detail::traits<T>>{};
+    }
+
+    template<typename T, typename... Args>
+    inline constexpr auto
+    bind_expr(T, Args...) -> detail::bind_expression<T, Args...> {
+        return{};
+    }
+
+    template<typename T>
+    inline constexpr auto
+    is_unqualified() {
+        return typename detail::traits<T>::is_unqualified{};
+    }
+
+    template<typename T>
+    inline constexpr auto
+    is_unqualified(T&&) {
+        return typename detail::traits<T&&>::is_unqualified{};
+    }
+
+    template<typename T>
+    inline constexpr auto
+    is_const_qualified() {
+        return typename detail::traits<T>::is_const_qualified{};
+    }
+
+    template<typename T>
+    inline constexpr auto
+    is_const_qualified(T&&) {
+        return typename detail::traits<T&&>::is_const_qualified{};
+    }
+
+    template<typename T>
+    inline constexpr auto
+    is_cv_qualified() {
+        return typename detail::traits<T>::is_cv_qualified{};
+    }
+
+    template<typename T>
+    inline constexpr auto
+    is_cv_qualified(T&&) {
+        return typename detail::traits<T&&>::is_cv_qualified{};
+    }
+
+    template<typename T>
+    inline constexpr auto
+    is_volatile_qualified() {
+        return typename detail::traits<T>::is_volatile_qualified{};
+    }
+
+    template<typename T>
+    inline constexpr auto
+    is_volatile_qualified(T&&) {
+        return typename detail::traits<T&&>::is_volatile_qualified{};
+    }
+
+    template<typename T>
+    inline constexpr auto
+    is_reference_qualified() {
+        return typename detail::traits<T>::is_reference_qualified{};
+    }
+
+    template<typename T>
+    inline constexpr auto
+    is_reference_qualified(T&&) {
+        return typename detail::traits<T&&>::is_reference_qualified{};
+    }
+
+    template<typename T>
+    inline constexpr auto
+    is_lvalue_reference_qualified() {
+        return typename detail::traits<T>::is_lvalue_reference_qualified{};
+    }
+
+    template<typename T>
+    inline constexpr auto
+    is_lvalue_reference_qualified(T&&) {
+        return typename detail::traits<T&&>::is_lvalue_reference_qualified{};
+    }
+
+    template<typename T>
+    inline constexpr auto
+    is_rvalue_reference_qualified() {
+        return typename detail::traits<T>::is_rvalue_reference_qualified{};
+    }
+
+    template<typename T>
+    inline constexpr auto
+    is_rvalue_reference_qualified(T&&) {
+        return typename detail::traits<T&&>::is_rvalue_reference_qualified{};
+    }
+}
+
+#ifdef _MSVC_VER
+#pragma warning(pop)
+#endif //ifdef _MSVC_VER
+
+#endif
diff --git a/include/callable_traits/member_pointer_utilities.hpp b/include/callable_traits/member_pointer_utilities.hpp
index f09cda4..d84a9a3 100644
--- a/include/callable_traits/member_pointer_utilities.hpp
+++ b/include/callable_traits/member_pointer_utilities.hpp
@@ -10,8 +10,6 @@ Distributed under the Boost Software License, Version 1.0.
 #ifndef MEMBER_POINTER_UTILITIES_HPP
 #define MEMBER_POINTER_UTILITIES_HPP
 
-#include <callable_traits/tags.hpp>
-
 namespace callable_traits {
 
     namespace detail {
diff --git a/include/callable_traits/pmf.hpp b/include/callable_traits/pmf.hpp
index 70f3ff6..0f6b364 100644
--- a/include/callable_traits/pmf.hpp
+++ b/include/callable_traits/pmf.hpp
@@ -11,8 +11,8 @@ Distributed under the Boost Software License, Version 1.0.
 #define CALLABLE_TRAITS_PMF_HPP
 
 #include <callable_traits/set_function_qualifiers.hpp>
-#include <callable_traits/tags.hpp>
 #include <callable_traits/qualifiers.hpp>
+#include <callable_traits/config.hpp>
 #include <tuple>
 
 #define CALLABLE_TRAITS_SPECIALIZE_PMF(QUAL)                                         \
@@ -160,9 +160,10 @@ namespace callable_traits {
         CALLABLE_TRAITS_SPECIALIZE_PMF(const &&);
         CALLABLE_TRAITS_SPECIALIZE_PMF(volatile &&);
         CALLABLE_TRAITS_SPECIALIZE_PMF(const volatile &&);
+
+#undef CALLABLE_TRAITS_SPECIALIZE_PMF
+        
     }
 }
 
-#undef CALLABLE_TRAITS_SPECIALIZE_PMF
-
 #endif
\ No newline at end of file
diff --git a/include/callable_traits/set_function_qualifiers.hpp b/include/callable_traits/set_function_qualifiers.hpp
index f83aae8..932d6af 100644
--- a/include/callable_traits/set_function_qualifiers.hpp
+++ b/include/callable_traits/set_function_qualifiers.hpp
@@ -11,7 +11,7 @@ Distributed under the Boost Software License, Version 1.0.
 #define CALLABLE_TRAITS_SET_FUNCTION_QUALIFIERS_HPP
 
 #include <callable_traits/qualifiers.hpp>
-#include <callable_traits/tags.hpp>
+#include <callable_traits/config.hpp>
 
 #define CALLABLE_TRAITS_SET_FUNCTION_QUALIFIERS(QUAL)              \
 template<typename Return, typename... Args>                        \