diff --git a/doc/html/callable_traits/cpp_17_features.html b/doc/html/callable_traits/cpp_17_features.html index dd5958e..b53716c 100644 --- a/doc/html/callable_traits/cpp_17_features.html +++ b/doc/html/callable_traits/cpp_17_features.html @@ -98,7 +98,7 @@

A static_assert always fails - when instantiatic this template if your compiler doesn't support transaction_safe. At the time of this writing, + when instantiating this template if your compiler doesn't support transaction_safe. At the time of this writing, GCC 6 with the -fgnu-tm is the only compiler that can use this feature.

@@ -894,7 +894,7 @@

A static_assert always fails - when instantiatic this template if your compiler doesn't support noexcept on types (a C++17 feature). At the + when instantiating this template if your compiler doesn't support noexcept on types (a C++17 feature). At the time of this writing, GCC 7.0.0+ and Clang 4.0+ are the only compiler that can use feature.

diff --git a/doc/html/callable_traits/transactional_memory_features.html b/doc/html/callable_traits/transactional_memory_features.html index 2013425..210b972 100644 --- a/doc/html/callable_traits/transactional_memory_features.html +++ b/doc/html/callable_traits/transactional_memory_features.html @@ -96,7 +96,7 @@

A static_assert always fails - when instantiatic this template if your compiler doesn't support transaction_safe. At the time of this writing, + when instantiating this template if your compiler doesn't support transaction_safe. At the time of this writing, GCC 6 with the -fgnu-tm is the only compiler that can use this feature.

diff --git a/example/CMakeLists.txt b/example/CMakeLists.txt index eab5a0d..610eefa 100644 --- a/example/CMakeLists.txt +++ b/example/CMakeLists.txt @@ -11,7 +11,7 @@ include_directories(${callable_traits_SOURCE_DIR}/include) file(GLOB_RECURSE EXAMPLES "*.cpp") file(GLOB_RECURSE EXPERIMENTAL_EXAMPLES "experimental*.cpp") -if (NOT CALLABLE_TRAITS_BUILD_EXPERIMENTAL) +if (NOT BOOST_CLBL_TRTS_BUILD_EXPERIMENTAL) foreach(_experimental IN LISTS EXPERIMENTAL_EXAMPLES) list(REMOVE_ITEM EXAMPLES ${_experimental}) endforeach() diff --git a/example/add_member_const.cpp b/example/add_member_const.cpp index e88ea3d..7972621 100644 --- a/example/add_member_const.cpp +++ b/example/add_member_const.cpp @@ -5,7 +5,7 @@ Distributed under the Boost Software License, Version 1.0. ->*/ #include -#ifdef CALLABLE_TRAITS_DISABLE_REFERENCE_QUALIFIERS +#ifdef BOOST_CLBL_TRTS_DISABLE_REFERENCE_QUALIFIERS int main(){ return 0; } #else @@ -46,4 +46,4 @@ int main() { } } //] -#endif //#ifdef CALLABLE_TRAITS_DISABLE_REFERENCE_QUALIFIERS +#endif //#ifdef BOOST_CLBL_TRTS_DISABLE_REFERENCE_QUALIFIERS diff --git a/example/add_member_cv.cpp b/example/add_member_cv.cpp index 9b53da0..3d6ca56 100644 --- a/example/add_member_cv.cpp +++ b/example/add_member_cv.cpp @@ -5,7 +5,7 @@ Distributed under the Boost Software License, Version 1.0. ->*/ #include -#ifdef CALLABLE_TRAITS_DISABLE_REFERENCE_QUALIFIERS +#ifdef BOOST_CLBL_TRTS_DISABLE_REFERENCE_QUALIFIERS int main(){ return 0; } #else @@ -46,4 +46,4 @@ int main() { } } //] -#endif //#ifdef CALLABLE_TRAITS_DISABLE_REFERENCE_QUALIFIERS +#endif //#ifdef BOOST_CLBL_TRTS_DISABLE_REFERENCE_QUALIFIERS diff --git a/example/add_member_lvalue_reference.cpp b/example/add_member_lvalue_reference.cpp index f68a7ce..ae91ef5 100644 --- a/example/add_member_lvalue_reference.cpp +++ b/example/add_member_lvalue_reference.cpp @@ -5,7 +5,7 @@ Distributed under the Boost Software License, Version 1.0. ->*/ #include -#ifdef CALLABLE_TRAITS_DISABLE_REFERENCE_QUALIFIERS +#ifdef BOOST_CLBL_TRTS_DISABLE_REFERENCE_QUALIFIERS int main(){ return 0; } #else @@ -50,4 +50,4 @@ int main() { } //] -#endif //#ifdef CALLABLE_TRAITS_DISABLE_REFERENCE_QUALIFIERS +#endif //#ifdef BOOST_CLBL_TRTS_DISABLE_REFERENCE_QUALIFIERS diff --git a/example/add_member_rvalue_reference.cpp b/example/add_member_rvalue_reference.cpp index 10dab1d..72fee91 100644 --- a/example/add_member_rvalue_reference.cpp +++ b/example/add_member_rvalue_reference.cpp @@ -5,7 +5,7 @@ Distributed under the Boost Software License, Version 1.0. ->*/ #include -#ifdef CALLABLE_TRAITS_DISABLE_REFERENCE_QUALIFIERS +#ifdef BOOST_CLBL_TRTS_DISABLE_REFERENCE_QUALIFIERS int main(){ return 0; } #else @@ -50,4 +50,4 @@ int main() { } //] -#endif //#ifdef CALLABLE_TRAITS_DISABLE_REFERENCE_QUALIFIERS +#endif //#ifdef BOOST_CLBL_TRTS_DISABLE_REFERENCE_QUALIFIERS diff --git a/example/add_member_volatile.cpp b/example/add_member_volatile.cpp index 453ae04..77f8a65 100644 --- a/example/add_member_volatile.cpp +++ b/example/add_member_volatile.cpp @@ -5,7 +5,7 @@ Distributed under the Boost Software License, Version 1.0. ->*/ #include -#ifdef CALLABLE_TRAITS_DISABLE_REFERENCE_QUALIFIERS +#ifdef BOOST_CLBL_TRTS_DISABLE_REFERENCE_QUALIFIERS int main(){ return 0; } #else @@ -47,4 +47,4 @@ int main() { } //] -#endif //#ifdef CALLABLE_TRAITS_DISABLE_REFERENCE_QUALIFIERS +#endif //#ifdef BOOST_CLBL_TRTS_DISABLE_REFERENCE_QUALIFIERS diff --git a/example/add_noexcept.cpp b/example/add_noexcept.cpp index 5de7d4d..4587828 100644 --- a/example/add_noexcept.cpp +++ b/example/add_noexcept.cpp @@ -7,7 +7,7 @@ Distributed under the Boost Software License, Version 1.0. #include -#ifndef CALLABLE_TRAITS_ENABLE_NOEXCEPT_TYPES +#ifndef BOOST_CLBL_TRTS_ENABLE_NOEXCEPT_TYPES int main(){} #else diff --git a/example/add_transaction_safe.cpp b/example/add_transaction_safe.cpp index dc7d5e5..cc68fde 100644 --- a/example/add_transaction_safe.cpp +++ b/example/add_transaction_safe.cpp @@ -7,7 +7,7 @@ Distributed under the Boost Software License, Version 1.0. #include -#ifndef CALLABLE_TRAITS_ENABLE_TRANSACTION_SAFE +#ifndef BOOST_CLBL_TRTS_ENABLE_TRANSACTION_SAFE int main(){} #else diff --git a/example/args.cpp b/example/args.cpp index 87e68d8..c807484 100644 --- a/example/args.cpp +++ b/example/args.cpp @@ -6,7 +6,7 @@ Distributed under the Boost Software License, Version 1.0. ->*/ #include -#ifdef CALLABLE_TRAITS_DISABLE_ABOMINABLE_FUNCTIONS +#ifdef BOOST_CLBL_TRTS_DISABLE_ABOMINABLE_FUNCTIONS int main(){ return 0; } #else @@ -66,4 +66,4 @@ int main() { } } //] -#endif //#ifdef CALLABLE_TRAITS_DISABLE_ABOMINABLE_FUNCTIONS +#endif //#ifdef BOOST_CLBL_TRTS_DISABLE_ABOMINABLE_FUNCTIONS diff --git a/example/function_type.cpp b/example/function_type.cpp index 11a2f46..257e144 100644 --- a/example/function_type.cpp +++ b/example/function_type.cpp @@ -6,7 +6,7 @@ Distributed under the Boost Software License, Version 1.0. ->*/ #include -#ifdef CALLABLE_TRAITS_DISABLE_ABOMINABLE_FUNCTIONS +#ifdef BOOST_CLBL_TRTS_DISABLE_ABOMINABLE_FUNCTIONS int main(){ return 0; } #else @@ -45,4 +45,4 @@ int main() { test(); } //] -#endif //#ifdef CALLABLE_TRAITS_DISABLE_ABOMINABLE_FUNCTIONS +#endif //#ifdef BOOST_CLBL_TRTS_DISABLE_ABOMINABLE_FUNCTIONS diff --git a/example/has_varargs.cpp b/example/has_varargs.cpp index 45f56da..1dd66fd 100644 --- a/example/has_varargs.cpp +++ b/example/has_varargs.cpp @@ -5,7 +5,7 @@ Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt) ->*/ -#ifdef CALLABLE_TRAITS_MSVC +#ifdef BOOST_CLBL_TRTS_MSVC // MSVC requires __cdecl for varargs, and I don't want to clutter the example int main(){} #else diff --git a/example/intro.cpp b/example/intro.cpp index 1c73eca..a80763d 100644 --- a/example/intro.cpp +++ b/example/intro.cpp @@ -5,7 +5,7 @@ Distributed under the Boost Software License, Version 1.0. ->*/ #include -#ifdef CALLABLE_TRAITS_DISABLE_VARIABLE_TEMPLATES +#ifdef BOOST_CLBL_TRTS_DISABLE_VARIABLE_TEMPLATES int main(){ return 0; } #else diff --git a/example/is_lvalue_reference_member.cpp b/example/is_lvalue_reference_member.cpp index abadfb4..dab0f4c 100644 --- a/example/is_lvalue_reference_member.cpp +++ b/example/is_lvalue_reference_member.cpp @@ -7,7 +7,7 @@ Distributed under the Boost Software License, Version 1.0. #include -#ifdef CALLABLE_TRAITS_DISABLE_REFERENCE_QUALIFIERS +#ifdef BOOST_CLBL_TRTS_DISABLE_REFERENCE_QUALIFIERS int main(){ return 0; } #else diff --git a/example/is_noexcept.cpp b/example/is_noexcept.cpp index 5cbd8fd..4a13bda 100644 --- a/example/is_noexcept.cpp +++ b/example/is_noexcept.cpp @@ -7,7 +7,7 @@ Distributed under the Boost Software License, Version 1.0. #include -#ifndef CALLABLE_TRAITS_ENABLE_NOEXCEPT_TYPES +#ifndef BOOST_CLBL_TRTS_ENABLE_NOEXCEPT_TYPES int main(){} #else diff --git a/example/is_reference_member.cpp b/example/is_reference_member.cpp index 4f67047..0716326 100644 --- a/example/is_reference_member.cpp +++ b/example/is_reference_member.cpp @@ -7,7 +7,7 @@ Distributed under the Boost Software License, Version 1.0. #include -#ifdef CALLABLE_TRAITS_DISABLE_REFERENCE_QUALIFIERS +#ifdef BOOST_CLBL_TRTS_DISABLE_REFERENCE_QUALIFIERS int main(){ return 0; } #else diff --git a/example/is_rvalue_reference_member.cpp b/example/is_rvalue_reference_member.cpp index b57d8ae..35386aa 100644 --- a/example/is_rvalue_reference_member.cpp +++ b/example/is_rvalue_reference_member.cpp @@ -7,7 +7,7 @@ Distributed under the Boost Software License, Version 1.0. #include -#ifdef CALLABLE_TRAITS_DISABLE_REFERENCE_QUALIFIERS +#ifdef BOOST_CLBL_TRTS_DISABLE_REFERENCE_QUALIFIERS int main(){ return 0; } #else diff --git a/example/is_transaction_safe.cpp b/example/is_transaction_safe.cpp index 4e93f15..811da4b 100644 --- a/example/is_transaction_safe.cpp +++ b/example/is_transaction_safe.cpp @@ -7,7 +7,7 @@ Distributed under the Boost Software License, Version 1.0. #include -#ifndef CALLABLE_TRAITS_ENABLE_TRANSACTION_SAFE +#ifndef BOOST_CLBL_TRTS_ENABLE_TRANSACTION_SAFE int main(){} #else diff --git a/example/is_volatile_member.cpp b/example/is_volatile_member.cpp index 6eaa744..6113c1a 100644 --- a/example/is_volatile_member.cpp +++ b/example/is_volatile_member.cpp @@ -7,7 +7,7 @@ Distributed under the Boost Software License, Version 1.0. #include -#ifdef CALLABLE_TRAITS_DISABLE_ABOMINABLE_FUNCTIONS +#ifdef BOOST_CLBL_TRTS_DISABLE_ABOMINABLE_FUNCTIONS int main(){ return 0; } #else diff --git a/example/overview.cpp b/example/overview.cpp index 6261ddd..9fd88dc 100644 --- a/example/overview.cpp +++ b/example/overview.cpp @@ -5,7 +5,7 @@ Distributed under the Boost Software License, Version 1.0. ->*/ #include -#ifdef CALLABLE_TRAITS_DISABLE_ABOMINABLE_FUNCTIONS +#ifdef BOOST_CLBL_TRTS_DISABLE_ABOMINABLE_FUNCTIONS int main(){} #else diff --git a/example/qualified_parent_class_of.cpp b/example/qualified_parent_class_of.cpp index 5652256..bb81519 100644 --- a/example/qualified_parent_class_of.cpp +++ b/example/qualified_parent_class_of.cpp @@ -6,7 +6,7 @@ Distributed under the Boost Software License, Version 1.0. ->*/ #include -#ifdef CALLABLE_TRAITS_DISABLE_REFERENCE_QUALIFIERS +#ifdef BOOST_CLBL_TRTS_DISABLE_REFERENCE_QUALIFIERS int main(){ return 0; } #else diff --git a/example/remove_member_const.cpp b/example/remove_member_const.cpp index eccf8a1..0e57818 100644 --- a/example/remove_member_const.cpp +++ b/example/remove_member_const.cpp @@ -5,7 +5,7 @@ Distributed under the Boost Software License, Version 1.0. ->*/ #include -#ifdef CALLABLE_TRAITS_DISABLE_REFERENCE_QUALIFIERS +#ifdef BOOST_CLBL_TRTS_DISABLE_REFERENCE_QUALIFIERS int main(){ return 0; } #else @@ -42,4 +42,4 @@ int main() { } } //] -#endif //#ifdef CALLABLE_TRAITS_DISABLE_REFERENCE_QUALIFIERS +#endif //#ifdef BOOST_CLBL_TRTS_DISABLE_REFERENCE_QUALIFIERS diff --git a/example/remove_member_cv.cpp b/example/remove_member_cv.cpp index 054e2fa..fa92555 100644 --- a/example/remove_member_cv.cpp +++ b/example/remove_member_cv.cpp @@ -5,7 +5,7 @@ Distributed under the Boost Software License, Version 1.0. ->*/ #include -#ifdef CALLABLE_TRAITS_DISABLE_REFERENCE_QUALIFIERS +#ifdef BOOST_CLBL_TRTS_DISABLE_REFERENCE_QUALIFIERS int main(){ return 0; } #else @@ -42,4 +42,4 @@ int main() { } } //] -#endif //#ifdef CALLABLE_TRAITS_DISABLE_REFERENCE_QUALIFIERS +#endif //#ifdef BOOST_CLBL_TRTS_DISABLE_REFERENCE_QUALIFIERS diff --git a/example/remove_member_reference.cpp b/example/remove_member_reference.cpp index 5da94f3..fe110a9 100644 --- a/example/remove_member_reference.cpp +++ b/example/remove_member_reference.cpp @@ -5,7 +5,7 @@ Distributed under the Boost Software License, Version 1.0. ->*/ #include -#ifdef CALLABLE_TRAITS_DISABLE_REFERENCE_QUALIFIERS +#ifdef BOOST_CLBL_TRTS_DISABLE_REFERENCE_QUALIFIERS int main(){ return 0; } #else @@ -42,4 +42,4 @@ int main() { } } //] -#endif //#ifdef CALLABLE_TRAITS_DISABLE_REFERENCE_QUALIFIERS +#endif //#ifdef BOOST_CLBL_TRTS_DISABLE_REFERENCE_QUALIFIERS diff --git a/example/remove_member_volatile.cpp b/example/remove_member_volatile.cpp index b7c3028..2d3b630 100644 --- a/example/remove_member_volatile.cpp +++ b/example/remove_member_volatile.cpp @@ -5,7 +5,7 @@ Distributed under the Boost Software License, Version 1.0. ->*/ #include -#ifdef CALLABLE_TRAITS_DISABLE_REFERENCE_QUALIFIERS +#ifdef BOOST_CLBL_TRTS_DISABLE_REFERENCE_QUALIFIERS int main(){ return 0; } #else @@ -42,4 +42,4 @@ int main() { } } //] -#endif //#ifdef CALLABLE_TRAITS_DISABLE_REFERENCE_QUALIFIERS +#endif //#ifdef BOOST_CLBL_TRTS_DISABLE_REFERENCE_QUALIFIERS diff --git a/example/remove_noexcept.cpp b/example/remove_noexcept.cpp index 8d4a6f8..d26e682 100644 --- a/example/remove_noexcept.cpp +++ b/example/remove_noexcept.cpp @@ -7,7 +7,7 @@ Distributed under the Boost Software License, Version 1.0. #include -#ifndef CALLABLE_TRAITS_ENABLE_NOEXCEPT_TYPES +#ifndef BOOST_CLBL_TRTS_ENABLE_NOEXCEPT_TYPES int main(){} #else diff --git a/example/remove_transaction_safe.cpp b/example/remove_transaction_safe.cpp index 5ba3362..481a422 100644 --- a/example/remove_transaction_safe.cpp +++ b/example/remove_transaction_safe.cpp @@ -7,7 +7,7 @@ Distributed under the Boost Software License, Version 1.0. #include -#ifndef CALLABLE_TRAITS_ENABLE_TRANSACTION_SAFE +#ifndef BOOST_CLBL_TRTS_ENABLE_TRANSACTION_SAFE int main(){} #else @@ -25,5 +25,5 @@ static_assert(std::is_same{}, ""); int main() {} //] -#endif //#ifndef CALLABLE_TRAITS_ENABLE_TRANSACTION_SAFE +#endif //#ifndef BOOST_CLBL_TRTS_ENABLE_TRANSACTION_SAFE diff --git a/example/return_type.cpp b/example/return_type.cpp index 9927711..05f2abb 100644 --- a/example/return_type.cpp +++ b/example/return_type.cpp @@ -6,7 +6,7 @@ Distributed under the Boost Software License, Version 1.0. ->*/ #include -#ifdef CALLABLE_TRAITS_DISABLE_ABOMINABLE_FUNCTIONS +#ifdef BOOST_CLBL_TRTS_DISABLE_ABOMINABLE_FUNCTIONS int main(){ return 0; } #else @@ -39,4 +39,4 @@ int main() { test(); } //] -#endif //#ifdef CALLABLE_TRAITS_DISABLE_ABOMINABLE_FUNCTIONS +#endif //#ifdef BOOST_CLBL_TRTS_DISABLE_ABOMINABLE_FUNCTIONS diff --git a/include/boost/callable_traits.hpp b/include/boost/callable_traits.hpp index bff3f97..166211f 100644 --- a/include/boost/callable_traits.hpp +++ b/include/boost/callable_traits.hpp @@ -6,8 +6,8 @@ Distributed under the Boost Software License, Version 1.0. */ -#ifndef CALLABLE_TRAITS_CALLABLE_TRAITS_HPP -#define CALLABLE_TRAITS_CALLABLE_TRAITS_HPP +#ifndef BOOST_CLBL_TRTS_BOOST_CLBL_TRTS_HPP +#define BOOST_CLBL_TRTS_BOOST_CLBL_TRTS_HPP #include #include diff --git a/include/boost/callable_traits/add_member_const.hpp b/include/boost/callable_traits/add_member_const.hpp index 161158a..3bc4fba 100644 --- a/include/boost/callable_traits/add_member_const.hpp +++ b/include/boost/callable_traits/add_member_const.hpp @@ -6,12 +6,12 @@ Distributed under the Boost Software License, Version 1.0. */ -#ifndef CALLABLE_TRAITS_ADD_MEMBER_CONST_HPP -#define CALLABLE_TRAITS_ADD_MEMBER_CONST_HPP +#ifndef BOOST_CLBL_TRTS_ADD_MEMBER_CONST_HPP +#define BOOST_CLBL_TRTS_ADD_MEMBER_CONST_HPP #include -CALLABLE_TRAITS_NAMESPACE_BEGIN +BOOST_CLBL_TRTS_NAMESPACE_BEGIN //[ add_member_const_hpp /*` @@ -24,7 +24,7 @@ CALLABLE_TRAITS_NAMESPACE_BEGIN template using add_member_const_t = //implementation-defined //<- -#ifdef CALLABLE_TRAITS_DISABLE_ABOMINABLE_FUNCTIONS +#ifdef BOOST_CLBL_TRTS_DISABLE_ABOMINABLE_FUNCTIONS detail::sfinae_try< typename detail::traits::add_member_const, @@ -41,7 +41,7 @@ using add_member_const_t = //implementation-defined typename detail::traits::add_member_const, member_qualifiers_are_illegal_for_this_type>; -#endif // #ifdef CALLABLE_TRAITS_DISABLE_ABOMINABLE_FUNCTIONS +#endif // #ifdef BOOST_CLBL_TRTS_DISABLE_ABOMINABLE_FUNCTIONS //-> template @@ -50,7 +50,7 @@ struct add_member_const { }; //<- -CALLABLE_TRAITS_NAMESPACE_END +BOOST_CLBL_TRTS_NAMESPACE_END //-> @@ -90,7 +90,7 @@ A substitution failure occurs on GCC builds older than version 4.9.2 with functi */ //] -#endif //#ifndef CALLABLE_TRAITS_ADD_MEMBER_CONST_HPP +#endif //#ifndef BOOST_CLBL_TRTS_ADD_MEMBER_CONST_HPP diff --git a/include/boost/callable_traits/add_member_cv.hpp b/include/boost/callable_traits/add_member_cv.hpp index 19224c6..ce111cf 100644 --- a/include/boost/callable_traits/add_member_cv.hpp +++ b/include/boost/callable_traits/add_member_cv.hpp @@ -6,12 +6,12 @@ Distributed under the Boost Software License, Version 1.0. */ -#ifndef CALLABLE_TRAITS_ADD_MEMBER_CV_HPP -#define CALLABLE_TRAITS_ADD_MEMBER_CV_HPP +#ifndef BOOST_CLBL_TRTS_ADD_MEMBER_CV_HPP +#define BOOST_CLBL_TRTS_ADD_MEMBER_CV_HPP #include -CALLABLE_TRAITS_NAMESPACE_BEGIN +BOOST_CLBL_TRTS_NAMESPACE_BEGIN //[ add_member_cv_hpp /*` @@ -24,7 +24,7 @@ CALLABLE_TRAITS_NAMESPACE_BEGIN template using add_member_cv_t = //implementation-defined //<- -#ifdef CALLABLE_TRAITS_DISABLE_ABOMINABLE_FUNCTIONS +#ifdef BOOST_CLBL_TRTS_DISABLE_ABOMINABLE_FUNCTIONS detail::sfinae_try< typename detail::traits::add_member_cv, @@ -41,7 +41,7 @@ using add_member_cv_t = //implementation-defined typename detail::traits::add_member_cv, member_qualifiers_are_illegal_for_this_type>; -#endif // #ifdef CALLABLE_TRAITS_DISABLE_ABOMINABLE_FUNCTIONS +#endif // #ifdef BOOST_CLBL_TRTS_DISABLE_ABOMINABLE_FUNCTIONS //-> template @@ -50,7 +50,7 @@ struct add_member_cv { }; //<- -CALLABLE_TRAITS_NAMESPACE_END +BOOST_CLBL_TRTS_NAMESPACE_END //-> /*` diff --git a/include/boost/callable_traits/add_member_lvalue_reference.hpp b/include/boost/callable_traits/add_member_lvalue_reference.hpp index 9dd9841..3df7845 100644 --- a/include/boost/callable_traits/add_member_lvalue_reference.hpp +++ b/include/boost/callable_traits/add_member_lvalue_reference.hpp @@ -6,12 +6,12 @@ Distributed under the Boost Software License, Version 1.0. */ -#ifndef CALLABLE_TRAITS_ADD_MEMBER_LVALUE_REFERENCE_HPP -#define CALLABLE_TRAITS_ADD_MEMBER_LVALUE_REFERENCE_HPP +#ifndef BOOST_CLBL_TRTS_ADD_MEMBER_LVALUE_REFERENCE_HPP +#define BOOST_CLBL_TRTS_ADD_MEMBER_LVALUE_REFERENCE_HPP #include -CALLABLE_TRAITS_NAMESPACE_BEGIN +BOOST_CLBL_TRTS_NAMESPACE_BEGIN //[ add_member_lvalue_reference_hpp /*` @@ -21,7 +21,7 @@ CALLABLE_TRAITS_NAMESPACE_BEGIN [heading Definition] */ -#ifdef CALLABLE_TRAITS_DISABLE_REFERENCE_QUALIFIERS +#ifdef BOOST_CLBL_TRTS_DISABLE_REFERENCE_QUALIFIERS template struct add_member_lvalue_reference_t { @@ -34,7 +34,7 @@ struct add_member_lvalue_reference_t { template using add_member_lvalue_reference_t = //implementation-defined //<- -#ifdef CALLABLE_TRAITS_DISABLE_ABOMINABLE_FUNCTIONS +#ifdef BOOST_CLBL_TRTS_DISABLE_ABOMINABLE_FUNCTIONS detail::sfinae_try< typename detail::traits::add_member_lvalue_reference, @@ -52,10 +52,10 @@ using add_member_lvalue_reference_t = //implementation-defined typename detail::traits::add_member_lvalue_reference, member_qualifiers_are_illegal_for_this_type>; -#endif // #ifdef CALLABLE_TRAITS_DISABLE_ABOMINABLE_FUNCTIONS +#endif // #ifdef BOOST_CLBL_TRTS_DISABLE_ABOMINABLE_FUNCTIONS //-> -#endif // #ifdef CALLABLE_TRAITS_DISABLE_REFERENCE_QUALIFIERS +#endif // #ifdef BOOST_CLBL_TRTS_DISABLE_REFERENCE_QUALIFIERS template struct add_member_lvalue_reference { @@ -63,7 +63,7 @@ struct add_member_lvalue_reference { }; //<- -CALLABLE_TRAITS_NAMESPACE_END +BOOST_CLBL_TRTS_NAMESPACE_END //-> /*` diff --git a/include/boost/callable_traits/add_member_rvalue_reference.hpp b/include/boost/callable_traits/add_member_rvalue_reference.hpp index 6298c9e..7099c62 100644 --- a/include/boost/callable_traits/add_member_rvalue_reference.hpp +++ b/include/boost/callable_traits/add_member_rvalue_reference.hpp @@ -6,12 +6,12 @@ Distributed under the Boost Software License, Version 1.0. */ -#ifndef CALLABLE_TRAITS_ADD_MEMBER_RVALUE_REFERENCE_HPP -#define CALLABLE_TRAITS_ADD_MEMBER_RVALUE_REFERENCE_HPP +#ifndef BOOST_CLBL_TRTS_ADD_MEMBER_RVALUE_REFERENCE_HPP +#define BOOST_CLBL_TRTS_ADD_MEMBER_RVALUE_REFERENCE_HPP #include -CALLABLE_TRAITS_NAMESPACE_BEGIN +BOOST_CLBL_TRTS_NAMESPACE_BEGIN //[ add_member_rvalue_reference_hpp /*` @@ -21,7 +21,7 @@ CALLABLE_TRAITS_NAMESPACE_BEGIN [heading Definition] */ -#ifdef CALLABLE_TRAITS_DISABLE_REFERENCE_QUALIFIERS +#ifdef BOOST_CLBL_TRTS_DISABLE_REFERENCE_QUALIFIERS template struct add_member_rvalue_reference_t { @@ -34,7 +34,7 @@ struct add_member_rvalue_reference_t { template using add_member_rvalue_reference_t = //implementation-defined //<- -#ifdef CALLABLE_TRAITS_DISABLE_ABOMINABLE_FUNCTIONS +#ifdef BOOST_CLBL_TRTS_DISABLE_ABOMINABLE_FUNCTIONS detail::sfinae_try< typename detail::traits::add_member_rvalue_reference, @@ -51,10 +51,10 @@ using add_member_rvalue_reference_t = //implementation-defined typename detail::traits::add_member_rvalue_reference, member_qualifiers_are_illegal_for_this_type>; -#endif // #ifdef CALLABLE_TRAITS_DISABLE_ABOMINABLE_FUNCTIONS +#endif // #ifdef BOOST_CLBL_TRTS_DISABLE_ABOMINABLE_FUNCTIONS //-> -#endif // #ifdef CALLABLE_TRAITS_DISABLE_REFERENCE_QUALIFIERS +#endif // #ifdef BOOST_CLBL_TRTS_DISABLE_REFERENCE_QUALIFIERS template struct add_member_rvalue_reference { @@ -62,7 +62,7 @@ struct add_member_rvalue_reference { }; //<- -CALLABLE_TRAITS_NAMESPACE_END +BOOST_CLBL_TRTS_NAMESPACE_END //-> /*` diff --git a/include/boost/callable_traits/add_member_volatile.hpp b/include/boost/callable_traits/add_member_volatile.hpp index 78ef817..be1f95e 100644 --- a/include/boost/callable_traits/add_member_volatile.hpp +++ b/include/boost/callable_traits/add_member_volatile.hpp @@ -6,12 +6,12 @@ Distributed under the Boost Software License, Version 1.0. */ -#ifndef CALLABLE_TRAITS_ADD_MEMBER_VOLATILE_HPP -#define CALLABLE_TRAITS_ADD_MEMBER_VOLATILE_HPP +#ifndef BOOST_CLBL_TRTS_ADD_MEMBER_VOLATILE_HPP +#define BOOST_CLBL_TRTS_ADD_MEMBER_VOLATILE_HPP #include -CALLABLE_TRAITS_NAMESPACE_BEGIN +BOOST_CLBL_TRTS_NAMESPACE_BEGIN //[ add_member_volatile_hpp /*` @@ -24,7 +24,7 @@ CALLABLE_TRAITS_NAMESPACE_BEGIN template using add_member_volatile_t = //implementation-defined //<- -#ifdef CALLABLE_TRAITS_DISABLE_ABOMINABLE_FUNCTIONS +#ifdef BOOST_CLBL_TRTS_DISABLE_ABOMINABLE_FUNCTIONS detail::sfinae_try< typename detail::traits::add_member_volatile, @@ -42,7 +42,7 @@ using add_member_volatile_t = //implementation-defined typename detail::traits::add_member_volatile, member_qualifiers_are_illegal_for_this_type>; -#endif // #ifdef CALLABLE_TRAITS_DISABLE_ABOMINABLE_FUNCTIONS +#endif // #ifdef BOOST_CLBL_TRTS_DISABLE_ABOMINABLE_FUNCTIONS //-> template @@ -51,7 +51,7 @@ struct add_member_volatile { }; //<- -CALLABLE_TRAITS_NAMESPACE_END +BOOST_CLBL_TRTS_NAMESPACE_END //-> /*` diff --git a/include/boost/callable_traits/add_noexcept.hpp b/include/boost/callable_traits/add_noexcept.hpp index a95347f..8fcb86d 100644 --- a/include/boost/callable_traits/add_noexcept.hpp +++ b/include/boost/callable_traits/add_noexcept.hpp @@ -7,17 +7,17 @@ Distributed under the Boost Software License, Version 1.0. */ -#ifndef CALLABLE_TRAITS_ADD_NOEXCEPT_HPP -#define CALLABLE_TRAITS_ADD_NOEXCEPT_HPP +#ifndef BOOST_CLBL_TRTS_ADD_NOEXCEPT_HPP +#define BOOST_CLBL_TRTS_ADD_NOEXCEPT_HPP #include -CALLABLE_TRAITS_NAMESPACE_BEGIN +BOOST_CLBL_TRTS_NAMESPACE_BEGIN -CALLABLE_TRAITS_DEFINE_SFINAE_ERROR_ORIGIN(add_noexcept) -CALLABLE_TRAITS_SFINAE_MSG(add_noexcept, cannot_add_noexcept_to_this_type) +BOOST_CLBL_TRTS_DEFINE_SFINAE_ERROR_ORIGIN(add_noexcept) +BOOST_CLBL_TRTS_SFINAE_MSG(add_noexcept, cannot_add_noexcept_to_this_type) -#ifndef CALLABLE_TRAITS_ENABLE_NOEXCEPT_TYPES +#ifndef BOOST_CLBL_TRTS_ENABLE_NOEXCEPT_TYPES template struct add_noexcept_t { static_assert(sizeof(T) < 1, @@ -54,8 +54,8 @@ struct add_noexcept { }; //<- -#endif // #ifdef CALLABLE_TRAITS_ENABLE_NOEXCEPT_TYPES -CALLABLE_TRAITS_NAMESPACE_END +#endif // #ifdef BOOST_CLBL_TRTS_ENABLE_NOEXCEPT_TYPES +BOOST_CLBL_TRTS_NAMESPACE_END //-> /*` @@ -71,7 +71,7 @@ CALLABLE_TRAITS_NAMESPACE_END * Adds a `noexcept` specifier to `T`, if not already present. [heading Compatibility Notes] -A `static_assert` always fails when instantiatic this template if your compiler doesn't support `noexcept` on types (a C++17 feature). At the time of this writing, GCC 7.0.0+ and Clang 4.0+ are the only compiler that can use feature. +A `static_assert` always fails when instantiating this template if your compiler doesn't support `noexcept` on types (a C++17 feature). At the time of this writing, GCC 7.0.0+ and Clang 4.0+ are the only compiler that can use feature. [heading Input/Output Examples] [table @@ -96,4 +96,4 @@ A `static_assert` always fails when instantiatic this template if your compiler */ //] -#endif //#ifndef CALLABLE_TRAITS_ADD_NOEXCEPT_HPP +#endif //#ifndef BOOST_CLBL_TRTS_ADD_NOEXCEPT_HPP diff --git a/include/boost/callable_traits/add_transaction_safe.hpp b/include/boost/callable_traits/add_transaction_safe.hpp index 5ab1961..b3c634e 100644 --- a/include/boost/callable_traits/add_transaction_safe.hpp +++ b/include/boost/callable_traits/add_transaction_safe.hpp @@ -7,17 +7,17 @@ Distributed under the Boost Software License, Version 1.0. */ -#ifndef CALLABLE_TRAITS_ADD_TRANSACTION_SAFE_HPP -#define CALLABLE_TRAITS_ADD_TRANSACTION_SAFE_HPP +#ifndef BOOST_CLBL_TRTS_ADD_TRANSACTION_SAFE_HPP +#define BOOST_CLBL_TRTS_ADD_TRANSACTION_SAFE_HPP #include -CALLABLE_TRAITS_NAMESPACE_BEGIN +BOOST_CLBL_TRTS_NAMESPACE_BEGIN -CALLABLE_TRAITS_DEFINE_SFINAE_ERROR_ORIGIN(add_transaction_safe) -CALLABLE_TRAITS_SFINAE_MSG(add_transaction_safe, cannot_add_transaction_safe_to_this_type) +BOOST_CLBL_TRTS_DEFINE_SFINAE_ERROR_ORIGIN(add_transaction_safe) +BOOST_CLBL_TRTS_SFINAE_MSG(add_transaction_safe, cannot_add_transaction_safe_to_this_type) -#ifndef CALLABLE_TRAITS_ENABLE_TRANSACTION_SAFE +#ifndef BOOST_CLBL_TRTS_ENABLE_TRANSACTION_SAFE template struct add_transaction_safe_t { static_assert(sizeof(T) < 1, @@ -55,8 +55,8 @@ struct add_transaction_safe { }; //<- -#endif // #ifndef CALLABLE_TRAITS_ENABLE_TRANSACTION_SAFE -CALLABLE_TRAITS_NAMESPACE_END +#endif // #ifndef BOOST_CLBL_TRTS_ENABLE_TRANSACTION_SAFE +BOOST_CLBL_TRTS_NAMESPACE_END //-> /*` @@ -72,7 +72,7 @@ CALLABLE_TRAITS_NAMESPACE_END * Adds the `transaction_safe` specifier to `T`, if not already present. [heading Compatibility Notes] -A `static_assert` always fails when instantiatic this template if your compiler doesn't support `transaction_safe`. At the time of this writing, GCC 6 with the `-fgnu-tm` is the only compiler that can use this feature. +A `static_assert` always fails when instantiating this template if your compiler doesn't support `transaction_safe`. At the time of this writing, GCC 6 with the `-fgnu-tm` is the only compiler that can use this feature. [heading Input/Output Examples] [table @@ -97,4 +97,4 @@ A `static_assert` always fails when instantiatic this template if your compiler */ //] -#endif //#ifndef CALLABLE_TRAITS_ADD_TRANSACTION_SAFE_HPP +#endif //#ifndef BOOST_CLBL_TRTS_ADD_TRANSACTION_SAFE_HPP diff --git a/include/boost/callable_traits/add_varargs.hpp b/include/boost/callable_traits/add_varargs.hpp index 84ffae4..761afd7 100644 --- a/include/boost/callable_traits/add_varargs.hpp +++ b/include/boost/callable_traits/add_varargs.hpp @@ -6,12 +6,12 @@ Distributed under the Boost Software License, Version 1.0. */ -#ifndef CALLABLE_TRAITS_ADD_VARARGS_HPP -#define CALLABLE_TRAITS_ADD_VARARGS_HPP +#ifndef BOOST_CLBL_TRTS_ADD_VARARGS_HPP +#define BOOST_CLBL_TRTS_ADD_VARARGS_HPP #include -CALLABLE_TRAITS_NAMESPACE_BEGIN +BOOST_CLBL_TRTS_NAMESPACE_BEGIN //[ add_varargs_hpp /*` @@ -35,7 +35,7 @@ struct add_varargs { }; //<- -CALLABLE_TRAITS_NAMESPACE_END +BOOST_CLBL_TRTS_NAMESPACE_END //-> /*` diff --git a/include/boost/callable_traits/apply_member_pointer.hpp b/include/boost/callable_traits/apply_member_pointer.hpp index 04ad604..7a214a2 100644 --- a/include/boost/callable_traits/apply_member_pointer.hpp +++ b/include/boost/callable_traits/apply_member_pointer.hpp @@ -6,16 +6,16 @@ Distributed under the Boost Software License, Version 1.0. */ -#ifndef CALLABLE_TRAITS_APPLY_MEMBER_POINTER_HPP -#define CALLABLE_TRAITS_APPLY_MEMBER_POINTER_HPP +#ifndef BOOST_CLBL_TRTS_APPLY_MEMBER_POINTER_HPP +#define BOOST_CLBL_TRTS_APPLY_MEMBER_POINTER_HPP #include -CALLABLE_TRAITS_NAMESPACE_BEGIN +BOOST_CLBL_TRTS_NAMESPACE_BEGIN -CALLABLE_TRAITS_DEFINE_SFINAE_ERROR_ORIGIN(apply_member_pointer) -CALLABLE_TRAITS_SFINAE_MSG(apply_member_pointer, members_cannot_have_a_type_of_void) -CALLABLE_TRAITS_SFINAE_MSG(apply_member_pointer, second_template_argument_must_be_a_class_or_struct) +BOOST_CLBL_TRTS_DEFINE_SFINAE_ERROR_ORIGIN(apply_member_pointer) +BOOST_CLBL_TRTS_SFINAE_MSG(apply_member_pointer, members_cannot_have_a_type_of_void) +BOOST_CLBL_TRTS_SFINAE_MSG(apply_member_pointer, second_template_argument_must_be_a_class_or_struct) namespace detail { @@ -69,7 +69,7 @@ struct apply_member_pointer { }; //<- -CALLABLE_TRAITS_NAMESPACE_END +BOOST_CLBL_TRTS_NAMESPACE_END //-> /*` diff --git a/include/boost/callable_traits/apply_return.hpp b/include/boost/callable_traits/apply_return.hpp index 4a47936..ceb6e05 100644 --- a/include/boost/callable_traits/apply_return.hpp +++ b/include/boost/callable_traits/apply_return.hpp @@ -6,15 +6,15 @@ Distributed under the Boost Software License, Version 1.0. */ -#ifndef CALLABLE_TRAITS_APPLY_RETURN_HPP -#define CALLABLE_TRAITS_APPLY_RETURN_HPP +#ifndef BOOST_CLBL_TRTS_APPLY_RETURN_HPP +#define BOOST_CLBL_TRTS_APPLY_RETURN_HPP #include -CALLABLE_TRAITS_NAMESPACE_BEGIN +BOOST_CLBL_TRTS_NAMESPACE_BEGIN -CALLABLE_TRAITS_DEFINE_SFINAE_ERROR_ORIGIN(apply_return) -CALLABLE_TRAITS_SFINAE_MSG(apply_return, invalid_types_for_apply_return) +BOOST_CLBL_TRTS_DEFINE_SFINAE_ERROR_ORIGIN(apply_return) +BOOST_CLBL_TRTS_SFINAE_MSG(apply_return, invalid_types_for_apply_return) namespace detail { @@ -52,7 +52,7 @@ namespace detail { }; //<- -CALLABLE_TRAITS_NAMESPACE_END +BOOST_CLBL_TRTS_NAMESPACE_END //-> /*` diff --git a/include/boost/callable_traits/arg_at.hpp b/include/boost/callable_traits/arg_at.hpp index 4c22e6f..111abe2 100644 --- a/include/boost/callable_traits/arg_at.hpp +++ b/include/boost/callable_traits/arg_at.hpp @@ -6,8 +6,8 @@ Distributed under the Boost Software License, Version 1.0. */ -#ifndef CALLABLE_TRAITS_ARG_AT_HPP -#define CALLABLE_TRAITS_ARG_AT_HPP +#ifndef BOOST_CLBL_TRTS_ARG_AT_HPP +#define BOOST_CLBL_TRTS_ARG_AT_HPP #include #include @@ -20,7 +20,7 @@ Distributed under the Boost Software License, Version 1.0. [heading Definition] */ -CALLABLE_TRAITS_NAMESPACE_BEGIN +BOOST_CLBL_TRTS_NAMESPACE_BEGIN @@ -55,7 +55,7 @@ struct arg_at { }; //<- -CALLABLE_TRAITS_NAMESPACE_END +BOOST_CLBL_TRTS_NAMESPACE_END //-> /*` diff --git a/include/boost/callable_traits/args.hpp b/include/boost/callable_traits/args.hpp index 56c1e02..ffc1f98 100644 --- a/include/boost/callable_traits/args.hpp +++ b/include/boost/callable_traits/args.hpp @@ -6,12 +6,12 @@ Distributed under the Boost Software License, Version 1.0. */ -#ifndef CALLABLE_TRAITS_ARGS_HPP -#define CALLABLE_TRAITS_ARGS_HPP +#ifndef BOOST_CLBL_TRTS_ARGS_HPP +#define BOOST_CLBL_TRTS_ARGS_HPP #include -CALLABLE_TRAITS_NAMESPACE_BEGIN +BOOST_CLBL_TRTS_NAMESPACE_BEGIN //[ args_hpp /*`[section:ref_args args] @@ -34,7 +34,7 @@ struct args { }; //<- -CALLABLE_TRAITS_NAMESPACE_END +BOOST_CLBL_TRTS_NAMESPACE_END //-> /*` @@ -82,4 +82,4 @@ Full support on GCC 4.7.4+, Clang 3.5+, Visual Studio 2015, and XCode 6.4+. */ //] -#endif //#ifndef CALLABLE_TRAITS_ARGS_HPP +#endif //#ifndef BOOST_CLBL_TRTS_ARGS_HPP diff --git a/include/boost/callable_traits/clear_args.hpp b/include/boost/callable_traits/clear_args.hpp index 2580167..6647fac 100644 --- a/include/boost/callable_traits/clear_args.hpp +++ b/include/boost/callable_traits/clear_args.hpp @@ -6,15 +6,15 @@ Distributed under the Boost Software License, Version 1.0. */ -#ifndef CALLABLE_TRAITS_CLEAR_ARGS_HPP -#define CALLABLE_TRAITS_CLEAR_ARGS_HPP +#ifndef BOOST_CLBL_TRTS_CLEAR_ARGS_HPP +#define BOOST_CLBL_TRTS_CLEAR_ARGS_HPP #include -CALLABLE_TRAITS_NAMESPACE_BEGIN +BOOST_CLBL_TRTS_NAMESPACE_BEGIN -CALLABLE_TRAITS_DEFINE_SFINAE_ERROR_ORIGIN(clear_args) -CALLABLE_TRAITS_SFINAE_MSG(clear_args, cannot_clear_the_parameter_list_of_this_type) +BOOST_CLBL_TRTS_DEFINE_SFINAE_ERROR_ORIGIN(clear_args) +BOOST_CLBL_TRTS_SFINAE_MSG(clear_args, cannot_clear_the_parameter_list_of_this_type) //[ clear_args_hpp /*`[section:ref_clear_args clear_args] @@ -37,7 +37,7 @@ struct clear_args { }; //<- -CALLABLE_TRAITS_NAMESPACE_END +BOOST_CLBL_TRTS_NAMESPACE_END //-> /*` @@ -78,4 +78,4 @@ Full support on GCC 4.7.4+, Clang 3.5+, Visual Studio 2015, and XCode 6.4+. */ //] -#endif //CALLABLE_TRAITS_CLEAR_ARGS_HPP +#endif //BOOST_CLBL_TRTS_CLEAR_ARGS_HPP diff --git a/include/boost/callable_traits/config.hpp b/include/boost/callable_traits/config.hpp index ab95f85..f9d6f4c 100644 --- a/include/boost/callable_traits/config.hpp +++ b/include/boost/callable_traits/config.hpp @@ -6,68 +6,75 @@ Distributed under the Boost Software License, Version 1.0. */ -#ifndef CALLABLE_TRAITS_CONFIG_HPP -#define CALLABLE_TRAITS_CONFIG_HPP +#ifndef BOOST_CLBL_TRTS_CONFIG_HPP +#define BOOST_CLBL_TRTS_CONFIG_HPP #include -#define CALLABLE_TRAITS_NAMESPACE_BEGIN namespace boost { namespace callable_traits { -#define CALLABLE_TRAITS_NAMESPACE_END }} +#define BOOST_CLBL_TRTS_NAMESPACE_BEGIN namespace boost { namespace callable_traits { +#define BOOST_CLBL_TRTS_NAMESPACE_END }} -#define CALLABLE_TRAITS_DETAIL_NAMESPACE_BEGIN namespace boost { namespace callable_traits { namespace detail { -#define CALLABLE_TRAITS_DETAIL_NAMESPACE_END }}} +#define BOOST_CLBL_TRTS_DETAIL_NAMESPACE_BEGIN namespace boost { namespace callable_traits { namespace detail { +#define BOOST_CLBL_TRTS_DETAIL_NAMESPACE_END }}} -#define CALLABLE_TRAITS_EMPTY_ -#define CALLABLE_TRAITS_EMPTY CALLABLE_TRAITS_EMPTY_ +#define BOOST_CLBL_TRTS_EMPTY_ +#define BOOST_CLBL_TRTS_EMPTY BOOST_CLBL_TRTS_EMPTY_ #ifdef __cpp_transactional_memory -# define CALLABLE_TRAITS_ENABLE_TRANSACTION_SAFE +# define BOOST_CLBL_TRTS_ENABLE_TRANSACTION_SAFE #endif #ifdef __cpp_noexcept_function_type -# define CALLABLE_TRAITS_ENABLE_NOEXCEPT_TYPES +# define BOOST_CLBL_TRTS_ENABLE_NOEXCEPT_TYPES +#define BOOST_CLBL_TRTS_NOEXCEPT_TEMPL , bool IsNoexcept +#define BOOST_CLBL_TRTS_NOEXCEPT_SPEC noexcept (IsNoexcept) +#define BOOST_CLBL_TRTS_IS_NOEXCEPT std::integral_constant +#else +#define BOOST_CLBL_TRTS_NOEXCEPT_TEMPL +#define BOOST_CLBL_TRTS_NOEXCEPT_SPEC +#define BOOST_CLBL_TRTS_IS_NOEXCEPT std::false_type #endif -#ifdef CALLABLE_TRAITS_ENABLE_TRANSACTION_SAFE -# define CALLABLE_TRAITS_TRANSACTION_SAFE_SPECIFIER transaction_safe +#ifdef BOOST_CLBL_TRTS_ENABLE_TRANSACTION_SAFE +# define BOOST_CLBL_TRTS_TRANSACTION_SAFE_SPECIFIER transaction_safe #else -# define CALLABLE_TRAITS_TRANSACTION_SAFE_SPECIFIER +# define BOOST_CLBL_TRTS_TRANSACTION_SAFE_SPECIFIER #endif #ifndef __clang__ # if defined(__GNUC__) -# define CALLABLE_TRAITS_GCC +# define BOOST_CLBL_TRTS_GCC # if __GNUC__ >= 6 -# define CALLABLE_TRAITS_GCC_AT_LEAST_6_0_0 +# define BOOST_CLBL_TRTS_GCC_AT_LEAST_6_0_0 # endif # if __GNUC__ < 5 -# define CALLABLE_TRAITS_GCC_OLDER_THAN_5_0_0 +# define BOOST_CLBL_TRTS_GCC_OLDER_THAN_5_0_0 # endif # if __GNUC__ >= 5 -# define CALLABLE_TRAITS_GCC_AT_LEAST_4_9_2 +# define BOOST_CLBL_TRTS_GCC_AT_LEAST_4_9_2 # elif __GNUC__ == 4 && __GNUC_MINOR__ == 9 && __GNUC_PATCHLEVEL__ >= 2 -# define CALLABLE_TRAITS_GCC_AT_LEAST_4_9_2 +# define BOOST_CLBL_TRTS_GCC_AT_LEAST_4_9_2 # else -# define CALLABLE_TRAITS_GCC_OLDER_THAN_4_9_2 +# define BOOST_CLBL_TRTS_GCC_OLDER_THAN_4_9_2 # endif //#if __GNUC__ >= 5 # endif //#if defined __GNUC__ #endif //#ifndef __clang__ #ifdef _MSC_VER # ifdef __clang__ -# define CALLABLE_TRAITS_CLANG_C2 +# define BOOST_CLBL_TRTS_CLANG_C2 # else -# define CALLABLE_TRAITS_MSVC +# define BOOST_CLBL_TRTS_MSVC # endif // #ifdef __clang__ #endif // #ifdef _MSC_VER -#define CALLABLE_TRAITS_IX_SEQ(...) ::std::index_sequence< __VA_ARGS__ > -#define CALLABLE_TRAITS_MAKE_IX_SEQ(...) ::std::make_index_sequence< __VA_ARGS__ > -#define CALLABLE_TRAITS_DISJUNCTION(...) ::std::disjunction< __VA_ARGS__ > -#define CALLABLE_TRAITS_CONJUNCTION(...) ::std::conjunction< __VA_ARGS__ > +#define BOOST_CLBL_TRTS_IX_SEQ(...) ::std::index_sequence< __VA_ARGS__ > +#define BOOST_CLBL_TRTS_MAKE_IX_SEQ(...) ::std::make_index_sequence< __VA_ARGS__ > +#define BOOST_CLBL_TRTS_DISJUNCTION(...) ::std::disjunction< __VA_ARGS__ > +#define BOOST_CLBL_TRTS_CONJUNCTION(...) ::std::conjunction< __VA_ARGS__ > #ifndef __cpp_variable_templates -# define CALLABLE_TRAITS_DISABLE_VARIABLE_TEMPLATES +# define BOOST_CLBL_TRTS_DISABLE_VARIABLE_TEMPLATES #endif #ifndef __cpp_lib_logical_traits @@ -79,30 +86,30 @@ Distributed under the Boost Software License, Version 1.0. # include #endif // __cpp_lib_integer_sequence -#if defined(CALLABLE_TRAITS_MSVC) && !defined(BOOST_DISABLE_WIN32) -# define CALLABLE_TRAITS_DEFAULT_VARARGS_CC __cdecl -# define CALLABLE_TRAITS_PMF_VARGARGS_CDECL_DEFAULT +#if defined(BOOST_CLBL_TRTS_MSVC) && !defined(BOOST_DISABLE_WIN32) +# define BOOST_CLBL_TRTS_DEFAULT_VARARGS_CC __cdecl +# define BOOST_CLBL_TRTS_PMF_VARGARGS_CDECL_DEFAULT #else -# define CALLABLE_TRAITS_DEFAULT_VARARGS_CC -#endif // #if defined(CALLABLE_TRAITS_MSVC) && !defined(BOOST_DISABLE_WIN32)) +# define BOOST_CLBL_TRTS_DEFAULT_VARARGS_CC +#endif // #if defined(BOOST_CLBL_TRTS_MSVC) && !defined(BOOST_DISABLE_WIN32)) -#if defined(CALLABLE_TRAITS_GCC) && !defined(CALLABLE_TRAITS_GCC_AT_LEAST_4_9_2) || defined(__INTEL_COMPILER) -# define CALLABLE_TRAITS_DISABLE_REFERENCE_QUALIFIERS -# define CALLABLE_TRAITS_DISABLE_ABOMINABLE_FUNCTIONS -#endif // #if defined CALLABLE_TRAITS_GCC && !defined(CALLABLE_TRAITS_GCC_AT_LEAST_4_9_2) +#if defined(BOOST_CLBL_TRTS_GCC) && !defined(BOOST_CLBL_TRTS_GCC_AT_LEAST_4_9_2) || defined(__INTEL_COMPILER) +# define BOOST_CLBL_TRTS_DISABLE_REFERENCE_QUALIFIERS +# define BOOST_CLBL_TRTS_DISABLE_ABOMINABLE_FUNCTIONS +#endif // #if defined BOOST_CLBL_TRTS_GCC && !defined(BOOST_CLBL_TRTS_GCC_AT_LEAST_4_9_2) -#ifdef CALLABLE_TRAITS_DISABLE_ABOMINABLE_FUNCTIONS -# define CALLABLE_TRAITS_ABOMINABLE_CONST CALLABLE_TRAITS_EMPTY -# define CALLABLE_TRAITS_ABOMINABLE_VOLATILE CALLABLE_TRAITS_EMPTY +#ifdef BOOST_CLBL_TRTS_DISABLE_ABOMINABLE_FUNCTIONS +# define BOOST_CLBL_TRTS_ABOMINABLE_CONST BOOST_CLBL_TRTS_EMPTY +# define BOOST_CLBL_TRTS_ABOMINABLE_VOLATILE BOOST_CLBL_TRTS_EMPTY #else -# define CALLABLE_TRAITS_ABOMINABLE_CONST const -# define CALLABLE_TRAITS_ABOMINABLE_VOLATILE volatile -#endif // #ifdef CALLABLE_TRAITS_DISABLE_ABOMINABLE_FUNCTIONS +# define BOOST_CLBL_TRTS_ABOMINABLE_CONST const +# define BOOST_CLBL_TRTS_ABOMINABLE_VOLATILE volatile +#endif // #ifdef BOOST_CLBL_TRTS_DISABLE_ABOMINABLE_FUNCTIONS -#ifdef CALLABLE_TRAITS_ENABLE_NOEXCEPT_TYPES -# define CALLABLE_TRAITS_NOEXCEPT_SPECIFIER noexcept +#ifdef BOOST_CLBL_TRTS_ENABLE_NOEXCEPT_TYPES +# define BOOST_CLBL_TRTS_NOEXCEPT_SPECIFIER noexcept #else -# define CALLABLE_TRAITS_NOEXCEPT_SPECIFIER CALLABLE_TRAITS_EMPTY -#endif // #ifdef CALLABLE_TRAITS_ENABLE_NOEXCEPT_TYPES +# define BOOST_CLBL_TRTS_NOEXCEPT_SPECIFIER BOOST_CLBL_TRTS_EMPTY +#endif // #ifdef BOOST_CLBL_TRTS_ENABLE_NOEXCEPT_TYPES -#endif //#ifndef CALLABLE_TRAITS_CONFIG_HPP +#endif //#ifndef BOOST_CLBL_TRTS_CONFIG_HPP diff --git a/include/boost/callable_traits/detail/core.hpp b/include/boost/callable_traits/detail/core.hpp index 95ddfe0..6b1457b 100644 --- a/include/boost/callable_traits/detail/core.hpp +++ b/include/boost/callable_traits/detail/core.hpp @@ -6,8 +6,8 @@ Distributed under the Boost Software License, Version 1.0. */ -#ifndef CALLABLE_TRAITS_DETAIL_CORE_HPP -#define CALLABLE_TRAITS_DETAIL_CORE_HPP +#ifndef BOOST_CLBL_TRTS_DETAIL_CORE_HPP +#define BOOST_CLBL_TRTS_DETAIL_CORE_HPP #include #include @@ -16,4 +16,4 @@ Distributed under the Boost Software License, Version 1.0. #include #include -#endif //#ifndef CALLABLE_TRAITS_DETAIL_CORE_HPP +#endif //#ifndef BOOST_CLBL_TRTS_DETAIL_CORE_HPP diff --git a/include/boost/callable_traits/detail/default_callable_traits.hpp b/include/boost/callable_traits/detail/default_callable_traits.hpp index d469aae..eb8336d 100644 --- a/include/boost/callable_traits/detail/default_callable_traits.hpp +++ b/include/boost/callable_traits/detail/default_callable_traits.hpp @@ -6,13 +6,13 @@ Distributed under the Boost Software License, Version 1.0. */ -#ifndef CALLABLE_TRAITS_DETAIL_DEFAULT_CALLABLE_TRAITS_HPP -#define CALLABLE_TRAITS_DETAIL_DEFAULT_CALLABLE_TRAITS_HPP +#ifndef BOOST_CLBL_TRTS_DETAIL_DEFAULT_BOOST_CLBL_TRTS_HPP +#define BOOST_CLBL_TRTS_DETAIL_DEFAULT_BOOST_CLBL_TRTS_HPP #include #include -CALLABLE_TRAITS_DETAIL_NAMESPACE_BEGIN +BOOST_CLBL_TRTS_DETAIL_NAMESPACE_BEGIN template struct default_callable_traits { @@ -192,7 +192,7 @@ struct default_callable_traits { using is_volatile_member = std::integral_constant; using is_cv_member = std::integral_constant; -#ifdef CALLABLE_TRAITS_DISABLE_REFERENCE_QUALIFIERS +#ifdef BOOST_CLBL_TRTS_DISABLE_REFERENCE_QUALIFIERS using is_reference_member = std::false_type; using is_lvalue_reference_qualified = std::false_type; using is_rvalue_reference_qualified = std::false_type; @@ -200,11 +200,11 @@ struct default_callable_traits { using is_reference_member = std::integral_constant; using is_lvalue_reference_member = std::integral_constant; using is_rvalue_reference_member = std::integral_constant; -#endif //#ifdef CALLABLE_TRAITS_DISABLE_REFERENCE_QUALIFIERS +#endif //#ifdef BOOST_CLBL_TRTS_DISABLE_REFERENCE_QUALIFIERS }; -CALLABLE_TRAITS_DETAIL_NAMESPACE_END +BOOST_CLBL_TRTS_DETAIL_NAMESPACE_END -#endif // CALLABLE_TRAITS_DETAIL_DEFAULT_CALLABLE_TRAITS_HPP +#endif // BOOST_CLBL_TRTS_DETAIL_DEFAULT_BOOST_CLBL_TRTS_HPP diff --git a/include/boost/callable_traits/detail/function.hpp b/include/boost/callable_traits/detail/function.hpp index 14a71d7..6e56008 100644 --- a/include/boost/callable_traits/detail/function.hpp +++ b/include/boost/callable_traits/detail/function.hpp @@ -6,8 +6,8 @@ Distributed under the Boost Software License, Version 1.0. */ -#ifndef CALLABLE_TRAITS_DETAIL_FUNCTION_HPP -#define CALLABLE_TRAITS_DETAIL_FUNCTION_HPP +#ifndef BOOST_CLBL_TRTS_DETAIL_FUNCTION_HPP +#define BOOST_CLBL_TRTS_DETAIL_FUNCTION_HPP #include #include @@ -16,128 +16,128 @@ Distributed under the Boost Software License, Version 1.0. #include -CALLABLE_TRAITS_DETAIL_NAMESPACE_BEGIN +BOOST_CLBL_TRTS_DETAIL_NAMESPACE_BEGIN template struct function : default_callable_traits {}; -#undef CALLABLE_TRAITS_INCLUDE_QUALIFIERS -#define CALLABLE_TRAITS_INCLUDE_QUALIFIERS +#undef BOOST_CLBL_TRTS_INCLUDE_QUALIFIERS +#define BOOST_CLBL_TRTS_INCLUDE_QUALIFIERS #include -#undef CALLABLE_TRAITS_INCLUDE_QUALIFIERS +#undef BOOST_CLBL_TRTS_INCLUDE_QUALIFIERS -#ifndef CALLABLE_TRAITS_DISABLE_ABOMINABLE_FUNCTIONS +#ifndef BOOST_CLBL_TRTS_DISABLE_ABOMINABLE_FUNCTIONS -#define CALLABLE_TRAITS_INCLUDE_QUALIFIERS const +#define BOOST_CLBL_TRTS_INCLUDE_QUALIFIERS const #include -#undef CALLABLE_TRAITS_INCLUDE_QUALIFIERS +#undef BOOST_CLBL_TRTS_INCLUDE_QUALIFIERS -#define CALLABLE_TRAITS_INCLUDE_QUALIFIERS volatile +#define BOOST_CLBL_TRTS_INCLUDE_QUALIFIERS volatile #include -#undef CALLABLE_TRAITS_INCLUDE_QUALIFIERS +#undef BOOST_CLBL_TRTS_INCLUDE_QUALIFIERS -#define CALLABLE_TRAITS_INCLUDE_QUALIFIERS const volatile +#define BOOST_CLBL_TRTS_INCLUDE_QUALIFIERS const volatile #include -#undef CALLABLE_TRAITS_INCLUDE_QUALIFIERS +#undef BOOST_CLBL_TRTS_INCLUDE_QUALIFIERS -#ifndef CALLABLE_TRAITS_DISABLE_REFERENCE_QUALIFIERS +#ifndef BOOST_CLBL_TRTS_DISABLE_REFERENCE_QUALIFIERS -#define CALLABLE_TRAITS_INCLUDE_QUALIFIERS & +#define BOOST_CLBL_TRTS_INCLUDE_QUALIFIERS & #include -#undef CALLABLE_TRAITS_INCLUDE_QUALIFIERS +#undef BOOST_CLBL_TRTS_INCLUDE_QUALIFIERS -#define CALLABLE_TRAITS_INCLUDE_QUALIFIERS && +#define BOOST_CLBL_TRTS_INCLUDE_QUALIFIERS && #include -#undef CALLABLE_TRAITS_INCLUDE_QUALIFIERS +#undef BOOST_CLBL_TRTS_INCLUDE_QUALIFIERS -#define CALLABLE_TRAITS_INCLUDE_QUALIFIERS const & +#define BOOST_CLBL_TRTS_INCLUDE_QUALIFIERS const & #include -#undef CALLABLE_TRAITS_INCLUDE_QUALIFIERS +#undef BOOST_CLBL_TRTS_INCLUDE_QUALIFIERS -#define CALLABLE_TRAITS_INCLUDE_QUALIFIERS const && +#define BOOST_CLBL_TRTS_INCLUDE_QUALIFIERS const && #include -#undef CALLABLE_TRAITS_INCLUDE_QUALIFIERS +#undef BOOST_CLBL_TRTS_INCLUDE_QUALIFIERS -#define CALLABLE_TRAITS_INCLUDE_QUALIFIERS volatile & +#define BOOST_CLBL_TRTS_INCLUDE_QUALIFIERS volatile & #include -#undef CALLABLE_TRAITS_INCLUDE_QUALIFIERS +#undef BOOST_CLBL_TRTS_INCLUDE_QUALIFIERS -#define CALLABLE_TRAITS_INCLUDE_QUALIFIERS volatile && +#define BOOST_CLBL_TRTS_INCLUDE_QUALIFIERS volatile && #include -#undef CALLABLE_TRAITS_INCLUDE_QUALIFIERS +#undef BOOST_CLBL_TRTS_INCLUDE_QUALIFIERS -#define CALLABLE_TRAITS_INCLUDE_QUALIFIERS const volatile & +#define BOOST_CLBL_TRTS_INCLUDE_QUALIFIERS const volatile & #include -#undef CALLABLE_TRAITS_INCLUDE_QUALIFIERS +#undef BOOST_CLBL_TRTS_INCLUDE_QUALIFIERS -#define CALLABLE_TRAITS_INCLUDE_QUALIFIERS const volatile && +#define BOOST_CLBL_TRTS_INCLUDE_QUALIFIERS const volatile && #include -#undef CALLABLE_TRAITS_INCLUDE_QUALIFIERS +#undef BOOST_CLBL_TRTS_INCLUDE_QUALIFIERS -#endif //#ifndef CALLABLE_TRAITS_DISABLE_REFERENCE_QUALIFIERS -#endif //#ifndef CALLABLE_TRAITS_DISABLE_ABOMINABLE_FUNCTIONS +#endif //#ifndef BOOST_CLBL_TRTS_DISABLE_REFERENCE_QUALIFIERS +#endif //#ifndef BOOST_CLBL_TRTS_DISABLE_ABOMINABLE_FUNCTIONS // function pointers -#define CALLABLE_TRAITS_CC_TAG dummy -#define CALLABLE_TRAITS_VARARGS_CC CALLABLE_TRAITS_DEFAULT_VARARGS_CC -#define CALLABLE_TRAITS_CC -#define CALLABLE_TRAITS_ST +#define BOOST_CLBL_TRTS_CC_TAG dummy +#define BOOST_CLBL_TRTS_VARARGS_CC BOOST_CLBL_TRTS_DEFAULT_VARARGS_CC +#define BOOST_CLBL_TRTS_CC +#define BOOST_CLBL_TRTS_ST #include #include -#undef CALLABLE_TRAITS_ST -#undef CALLABLE_TRAITS_CC -#undef CALLABLE_TRAITS_CC_TAG -#undef CALLABLE_TRAITS_VARARGS_CC +#undef BOOST_CLBL_TRTS_ST +#undef BOOST_CLBL_TRTS_CC +#undef BOOST_CLBL_TRTS_CC_TAG +#undef BOOST_CLBL_TRTS_VARARGS_CC /* ? -#ifdef CALLABLE_TRAITS_ENABLE_CDECL -#define CALLABLE_TRAITS_CC_TAG cdecl_tag -#define CALLABLE_TRAITS_VARARGS_CC __cdecl -#define CALLABLE_TRAITS_CC __cdecl -#define CALLABLE_TRAITS_ST +#ifdef BOOST_CLBL_TRTS_ENABLE_CDECL +#define BOOST_CLBL_TRTS_CC_TAG cdecl_tag +#define BOOST_CLBL_TRTS_VARARGS_CC __cdecl +#define BOOST_CLBL_TRTS_CC __cdecl +#define BOOST_CLBL_TRTS_ST #include -#undef CALLABLE_TRAITS_ST -#undef CALLABLE_TRAITS_CC -#undef CALLABLE_TRAITS_CC_TAG -#undef CALLABLE_TRAITS_VARARGS_CC +#undef BOOST_CLBL_TRTS_ST +#undef BOOST_CLBL_TRTS_CC +#undef BOOST_CLBL_TRTS_CC_TAG +#undef BOOST_CLBL_TRTS_VARARGS_CC #endif*/ -#ifdef CALLABLE_TRAITS_ENABLE_STDCALL -#define CALLABLE_TRAITS_CC_TAG stdcall_tag -#define CALLABLE_TRAITS_VARARGS_CC CALLABLE_TRAITS_DEFAULT_VARARGS_CC -#define CALLABLE_TRAITS_CC __stdcall -#define CALLABLE_TRAITS_ST +#ifdef BOOST_CLBL_TRTS_ENABLE_STDCALL +#define BOOST_CLBL_TRTS_CC_TAG stdcall_tag +#define BOOST_CLBL_TRTS_VARARGS_CC BOOST_CLBL_TRTS_DEFAULT_VARARGS_CC +#define BOOST_CLBL_TRTS_CC __stdcall +#define BOOST_CLBL_TRTS_ST #include -#undef CALLABLE_TRAITS_ST -#undef CALLABLE_TRAITS_CC -#undef CALLABLE_TRAITS_CC_TAG -#undef CALLABLE_TRAITS_VARARGS_CC +#undef BOOST_CLBL_TRTS_ST +#undef BOOST_CLBL_TRTS_CC +#undef BOOST_CLBL_TRTS_CC_TAG +#undef BOOST_CLBL_TRTS_VARARGS_CC #endif -#ifdef CALLABLE_TRAITS_ENABLE_FASTCALL -#define CALLABLE_TRAITS_CC_TAG fastcall_tag -#define CALLABLE_TRAITS_VARARGS_CC CALLABLE_TRAITS_DEFAULT_VARARGS_CC -#define CALLABLE_TRAITS_CC __fastcall -#define CALLABLE_TRAITS_ST +#ifdef BOOST_CLBL_TRTS_ENABLE_FASTCALL +#define BOOST_CLBL_TRTS_CC_TAG fastcall_tag +#define BOOST_CLBL_TRTS_VARARGS_CC BOOST_CLBL_TRTS_DEFAULT_VARARGS_CC +#define BOOST_CLBL_TRTS_CC __fastcall +#define BOOST_CLBL_TRTS_ST #include -#undef CALLABLE_TRAITS_CC -#undef CALLABLE_TRAITS_ST -#undef CALLABLE_TRAITS_CC_TAG -#undef CALLABLE_TRAITS_VARARGS_CC +#undef BOOST_CLBL_TRTS_CC +#undef BOOST_CLBL_TRTS_ST +#undef BOOST_CLBL_TRTS_CC_TAG +#undef BOOST_CLBL_TRTS_VARARGS_CC #endif -#ifdef CALLABLE_TRAITS_ENABLE_PASCAL -#define CALLABLE_TRAITS_CC_TAG pascal_tag -#define CALLABLE_TRAITS_VARARGS_CC CALLABLE_TRAITS_DEFAULT_VARARGS_CC -#define CALLABLE_TRAITS_CC -#define CALLABLE_TRAITS_ST pascal +#ifdef BOOST_CLBL_TRTS_ENABLE_PASCAL +#define BOOST_CLBL_TRTS_CC_TAG pascal_tag +#define BOOST_CLBL_TRTS_VARARGS_CC BOOST_CLBL_TRTS_DEFAULT_VARARGS_CC +#define BOOST_CLBL_TRTS_CC +#define BOOST_CLBL_TRTS_ST pascal #include -#undef CALLABLE_TRAITS_CC -#undef CALLABLE_TRAITS_ST -#undef CALLABLE_TRAITS_CC_TAG -#undef CALLABLE_TRAITS_VARARGS_CC +#undef BOOST_CLBL_TRTS_CC +#undef BOOST_CLBL_TRTS_ST +#undef BOOST_CLBL_TRTS_CC_TAG +#undef BOOST_CLBL_TRTS_VARARGS_CC #endif template @@ -189,6 +189,6 @@ struct function : std::conditional::value, using replace_args = typename base::template replace_args&; }; -CALLABLE_TRAITS_DETAIL_NAMESPACE_END +BOOST_CLBL_TRTS_DETAIL_NAMESPACE_END -#endif // #ifndef CALLABLE_TRAITS_DETAIL_FUNCTION_HPP +#endif // #ifndef BOOST_CLBL_TRTS_DETAIL_FUNCTION_HPP diff --git a/include/boost/callable_traits/detail/function_object.hpp b/include/boost/callable_traits/detail/function_object.hpp index 2b31769..dd66454 100644 --- a/include/boost/callable_traits/detail/function_object.hpp +++ b/include/boost/callable_traits/detail/function_object.hpp @@ -6,8 +6,8 @@ Distributed under the Boost Software License, Version 1.0. */ -#ifndef CALLABLE_TRAITS_DETAIL_FUNCTION_OBJECT_HPP -#define CALLABLE_TRAITS_DETAIL_FUNCTION_OBJECT_HPP +#ifndef BOOST_CLBL_TRTS_DETAIL_FUNCTION_OBJECT_HPP +#define BOOST_CLBL_TRTS_DETAIL_FUNCTION_OBJECT_HPP #include #include @@ -17,7 +17,7 @@ Distributed under the Boost Software License, Version 1.0. #include -CALLABLE_TRAITS_DETAIL_NAMESPACE_BEGIN +BOOST_CLBL_TRTS_DETAIL_NAMESPACE_BEGIN template struct function_object : Base { @@ -114,6 +114,6 @@ CALLABLE_TRAITS_DETAIL_NAMESPACE_BEGIN struct function_object : default_callable_traits<> {}; -CALLABLE_TRAITS_DETAIL_NAMESPACE_END +BOOST_CLBL_TRTS_DETAIL_NAMESPACE_END #endif diff --git a/include/boost/callable_traits/detail/fwd/function_fwd.hpp b/include/boost/callable_traits/detail/fwd/function_fwd.hpp index 1e61f7a..3039493 100644 --- a/include/boost/callable_traits/detail/fwd/function_fwd.hpp +++ b/include/boost/callable_traits/detail/fwd/function_fwd.hpp @@ -6,16 +6,16 @@ Distributed under the Boost Software License, Version 1.0. */ -#ifndef CALLABLE_TRAITS_DETAIL_FWD_FUNCTION_FWD_HPP -#define CALLABLE_TRAITS_DETAIL_FWD_FUNCTION_FWD_HPP +#ifndef BOOST_CLBL_TRTS_DETAIL_FWD_FUNCTION_FWD_HPP +#define BOOST_CLBL_TRTS_DETAIL_FWD_FUNCTION_FWD_HPP #include -CALLABLE_TRAITS_DETAIL_NAMESPACE_BEGIN +BOOST_CLBL_TRTS_DETAIL_NAMESPACE_BEGIN template struct function; -CALLABLE_TRAITS_DETAIL_NAMESPACE_END +BOOST_CLBL_TRTS_DETAIL_NAMESPACE_END #endif diff --git a/include/boost/callable_traits/detail/fwd/function_object_fwd.hpp b/include/boost/callable_traits/detail/fwd/function_object_fwd.hpp index 64f3b96..d1b877f 100644 --- a/include/boost/callable_traits/detail/fwd/function_object_fwd.hpp +++ b/include/boost/callable_traits/detail/fwd/function_object_fwd.hpp @@ -6,13 +6,13 @@ Distributed under the Boost Software License, Version 1.0. */ -#ifndef CALLABLE_TRAITS_DETAIL_FWD_FUNCTION_OBJECT_FWD_HPP -#define CALLABLE_TRAITS_DETAIL_FWD_FUNCTION_OBJECT_FWD_HPP +#ifndef BOOST_CLBL_TRTS_DETAIL_FWD_FUNCTION_OBJECT_FWD_HPP +#define BOOST_CLBL_TRTS_DETAIL_FWD_FUNCTION_OBJECT_FWD_HPP #include #include -CALLABLE_TRAITS_DETAIL_NAMESPACE_BEGIN +BOOST_CLBL_TRTS_DETAIL_NAMESPACE_BEGIN template struct has_normal_call_operator @@ -52,7 +52,7 @@ CALLABLE_TRAITS_DETAIL_NAMESPACE_BEGIN template> struct function_object; -CALLABLE_TRAITS_DETAIL_NAMESPACE_END +BOOST_CLBL_TRTS_DETAIL_NAMESPACE_END #endif diff --git a/include/boost/callable_traits/detail/fwd/pmd_fwd.hpp b/include/boost/callable_traits/detail/fwd/pmd_fwd.hpp index b36c278..c07112e 100644 --- a/include/boost/callable_traits/detail/fwd/pmd_fwd.hpp +++ b/include/boost/callable_traits/detail/fwd/pmd_fwd.hpp @@ -6,14 +6,14 @@ Distributed under the Boost Software License, Version 1.0. */ -#ifndef CALLABLE_TRAITS_DETAIL_FWD_PMD_FWD_HPP -#define CALLABLE_TRAITS_DETAIL_FWD_PMD_FWD_HPP +#ifndef BOOST_CLBL_TRTS_DETAIL_FWD_PMD_FWD_HPP +#define BOOST_CLBL_TRTS_DETAIL_FWD_PMD_FWD_HPP -CALLABLE_TRAITS_DETAIL_NAMESPACE_BEGIN +BOOST_CLBL_TRTS_DETAIL_NAMESPACE_BEGIN template struct pmd; -CALLABLE_TRAITS_DETAIL_NAMESPACE_END +BOOST_CLBL_TRTS_DETAIL_NAMESPACE_END #endif diff --git a/include/boost/callable_traits/detail/fwd/pmf_fwd.hpp b/include/boost/callable_traits/detail/fwd/pmf_fwd.hpp index 864b1e6..488148a 100644 --- a/include/boost/callable_traits/detail/fwd/pmf_fwd.hpp +++ b/include/boost/callable_traits/detail/fwd/pmf_fwd.hpp @@ -6,16 +6,16 @@ Distributed under the Boost Software License, Version 1.0. */ -#ifndef CALLABLE_TRAITS_DETAIL_FWD_PMF_FWD_HPP -#define CALLABLE_TRAITS_DETAIL_FWD_PMF_FWD_HPP +#ifndef BOOST_CLBL_TRTS_DETAIL_FWD_PMF_FWD_HPP +#define BOOST_CLBL_TRTS_DETAIL_FWD_PMF_FWD_HPP #include -CALLABLE_TRAITS_DETAIL_NAMESPACE_BEGIN +BOOST_CLBL_TRTS_DETAIL_NAMESPACE_BEGIN template struct pmf; -CALLABLE_TRAITS_DETAIL_NAMESPACE_END +BOOST_CLBL_TRTS_DETAIL_NAMESPACE_END #endif diff --git a/include/boost/callable_traits/detail/parameter_index_helper.hpp b/include/boost/callable_traits/detail/parameter_index_helper.hpp index 452901a..76cabc9 100644 --- a/include/boost/callable_traits/detail/parameter_index_helper.hpp +++ b/include/boost/callable_traits/detail/parameter_index_helper.hpp @@ -1,9 +1,9 @@ -#ifndef CALLABLE_TRAITS_PARAMETER_INDEX_HELPER_HPP -#define CALLABLE_TRAITS_PARAMETER_INDEX_HELPER_HPP +#ifndef BOOST_CLBL_TRTS_PARAMETER_INDEX_HELPER_HPP +#define BOOST_CLBL_TRTS_PARAMETER_INDEX_HELPER_HPP #include -CALLABLE_TRAITS_DETAIL_NAMESPACE_BEGIN +BOOST_CLBL_TRTS_DETAIL_NAMESPACE_BEGIN template @@ -48,6 +48,6 @@ CALLABLE_TRAITS_DETAIL_NAMESPACE_BEGIN -CALLABLE_TRAITS_DETAIL_NAMESPACE_END +BOOST_CLBL_TRTS_DETAIL_NAMESPACE_END -#endif // #ifndef CALLABLE_TRAITS_PARAMETER_INDEX_HELPER_HPP +#endif // #ifndef BOOST_CLBL_TRTS_PARAMETER_INDEX_HELPER_HPP diff --git a/include/boost/callable_traits/detail/pmd.hpp b/include/boost/callable_traits/detail/pmd.hpp index 7ed4bb6..0a1ba71 100644 --- a/include/boost/callable_traits/detail/pmd.hpp +++ b/include/boost/callable_traits/detail/pmd.hpp @@ -6,8 +6,8 @@ Distributed under the Boost Software License, Version 1.0. */ -#ifndef CALLABLE_TRAITS_DETAIL_PMD_HPP -#define CALLABLE_TRAITS_DETAIL_PMD_HPP +#ifndef BOOST_CLBL_TRTS_DETAIL_PMD_HPP +#define BOOST_CLBL_TRTS_DETAIL_PMD_HPP #include @@ -16,7 +16,7 @@ Distributed under the Boost Software License, Version 1.0. #include #include -CALLABLE_TRAITS_DETAIL_NAMESPACE_BEGIN +BOOST_CLBL_TRTS_DETAIL_NAMESPACE_BEGIN template struct pmd : default_callable_traits {}; @@ -48,6 +48,6 @@ CALLABLE_TRAITS_DETAIL_NAMESPACE_BEGIN using expand_args = Container; }; -CALLABLE_TRAITS_DETAIL_NAMESPACE_END +BOOST_CLBL_TRTS_DETAIL_NAMESPACE_END #endif diff --git a/include/boost/callable_traits/detail/pmf.hpp b/include/boost/callable_traits/detail/pmf.hpp index b061edb..adaf218 100644 --- a/include/boost/callable_traits/detail/pmf.hpp +++ b/include/boost/callable_traits/detail/pmf.hpp @@ -6,8 +6,8 @@ Distributed under the Boost Software License, Version 1.0. */ -#ifndef CALLABLE_TRAITS_DETAIL_PMF_HPP -#define CALLABLE_TRAITS_DETAIL_PMF_HPP +#ifndef BOOST_CLBL_TRTS_DETAIL_PMF_HPP +#define BOOST_CLBL_TRTS_DETAIL_PMF_HPP #include #include @@ -16,7 +16,7 @@ Distributed under the Boost Software License, Version 1.0. #include #include -CALLABLE_TRAITS_DETAIL_NAMESPACE_BEGIN +BOOST_CLBL_TRTS_DETAIL_NAMESPACE_BEGIN template @@ -37,54 +37,54 @@ CALLABLE_TRAITS_DETAIL_NAMESPACE_BEGIN template struct pmf : default_callable_traits {}; - #define CALLABLE_TRAITS_CC_TAG dummy - #define CALLABLE_TRAITS_VARARGS_CC CALLABLE_TRAITS_DEFAULT_VARARGS_CC - #define CALLABLE_TRAITS_CC + #define BOOST_CLBL_TRTS_CC_TAG dummy + #define BOOST_CLBL_TRTS_VARARGS_CC BOOST_CLBL_TRTS_DEFAULT_VARARGS_CC + #define BOOST_CLBL_TRTS_CC #include - #undef CALLABLE_TRAITS_CC - #undef CALLABLE_TRAITS_CC_TAG - #undef CALLABLE_TRAITS_VARARGS_CC + #undef BOOST_CLBL_TRTS_CC + #undef BOOST_CLBL_TRTS_CC_TAG + #undef BOOST_CLBL_TRTS_VARARGS_CC - #define CALLABLE_TRAITS_CC_TAG dummy - #define CALLABLE_TRAITS_VARARGS_CC CALLABLE_TRAITS_DEFAULT_VARARGS_CC - #define CALLABLE_TRAITS_CC + #define BOOST_CLBL_TRTS_CC_TAG dummy + #define BOOST_CLBL_TRTS_VARARGS_CC BOOST_CLBL_TRTS_DEFAULT_VARARGS_CC + #define BOOST_CLBL_TRTS_CC #include - #undef CALLABLE_TRAITS_CC - #undef CALLABLE_TRAITS_CC_TAG - #undef CALLABLE_TRAITS_VARARGS_CC + #undef BOOST_CLBL_TRTS_CC + #undef BOOST_CLBL_TRTS_CC_TAG + #undef BOOST_CLBL_TRTS_VARARGS_CC - #ifdef CALLABLE_TRAITS_ENABLE_CDECL - #define CALLABLE_TRAITS_CC_TAG cdecl_tag - #define CALLABLE_TRAITS_VARARGS_CC __cdecl - #define CALLABLE_TRAITS_CC __cdecl + #ifdef BOOST_CLBL_TRTS_ENABLE_CDECL + #define BOOST_CLBL_TRTS_CC_TAG cdecl_tag + #define BOOST_CLBL_TRTS_VARARGS_CC __cdecl + #define BOOST_CLBL_TRTS_CC __cdecl #include - #undef CALLABLE_TRAITS_CC - #undef CALLABLE_TRAITS_CC_TAG - #undef CALLABLE_TRAITS_VARARGS_CC + #undef BOOST_CLBL_TRTS_CC + #undef BOOST_CLBL_TRTS_CC_TAG + #undef BOOST_CLBL_TRTS_VARARGS_CC - #endif //CALLABLE_TRAITS_ENABLE_CDECL + #endif //BOOST_CLBL_TRTS_ENABLE_CDECL - #ifdef CALLABLE_TRAITS_ENABLE_STDCALL - #define CALLABLE_TRAITS_CC_TAG stdcall_tag - #define CALLABLE_TRAITS_VARARGS_CC CALLABLE_TRAITS_DEFAULT_VARARGS_CC - #define CALLABLE_TRAITS_CC __stdcall + #ifdef BOOST_CLBL_TRTS_ENABLE_STDCALL + #define BOOST_CLBL_TRTS_CC_TAG stdcall_tag + #define BOOST_CLBL_TRTS_VARARGS_CC BOOST_CLBL_TRTS_DEFAULT_VARARGS_CC + #define BOOST_CLBL_TRTS_CC __stdcall #include - #undef CALLABLE_TRAITS_CC - #undef CALLABLE_TRAITS_CC_TAG - #undef CALLABLE_TRAITS_VARARGS_CC + #undef BOOST_CLBL_TRTS_CC + #undef BOOST_CLBL_TRTS_CC_TAG + #undef BOOST_CLBL_TRTS_VARARGS_CC #endif - #ifdef CALLABLE_TRAITS_ENABLE_FASTCALL - #define CALLABLE_TRAITS_CC_TAG fastcall_tag - #define CALLABLE_TRAITS_VARARGS_CC CALLABLE_TRAITS_DEFAULT_VARARGS_CC - #define CALLABLE_TRAITS_CC __fastcall + #ifdef BOOST_CLBL_TRTS_ENABLE_FASTCALL + #define BOOST_CLBL_TRTS_CC_TAG fastcall_tag + #define BOOST_CLBL_TRTS_VARARGS_CC BOOST_CLBL_TRTS_DEFAULT_VARARGS_CC + #define BOOST_CLBL_TRTS_CC __fastcall #include - #undef CALLABLE_TRAITS_CC - #undef CALLABLE_TRAITS_CC_TAG - #undef CALLABLE_TRAITS_VARARGS_CC + #undef BOOST_CLBL_TRTS_CC + #undef BOOST_CLBL_TRTS_CC_TAG + #undef BOOST_CLBL_TRTS_VARARGS_CC #endif -CALLABLE_TRAITS_DETAIL_NAMESPACE_END +BOOST_CLBL_TRTS_DETAIL_NAMESPACE_END #endif diff --git a/include/boost/callable_traits/detail/polyfills/conjunction.hpp b/include/boost/callable_traits/detail/polyfills/conjunction.hpp index 76bd233..650fcc5 100644 --- a/include/boost/callable_traits/detail/polyfills/conjunction.hpp +++ b/include/boost/callable_traits/detail/polyfills/conjunction.hpp @@ -6,15 +6,15 @@ Distributed under the Boost Software License, Version 1.0. */ -#ifndef CALLABLE_TRAITS_DETAIL_POLYFILLS_CONJUNCTION_HPP -#define CALLABLE_TRAITS_DETAIL_POLYFILLS_CONJUNCTION_HPP +#ifndef BOOST_CLBL_TRTS_DETAIL_POLYFILLS_CONJUNCTION_HPP +#define BOOST_CLBL_TRTS_DETAIL_POLYFILLS_CONJUNCTION_HPP -#undef CALLABLE_TRAITS_CONJUNCTION -#define CALLABLE_TRAITS_CONJUNCTION(...) \ +#undef BOOST_CLBL_TRTS_CONJUNCTION +#define BOOST_CLBL_TRTS_CONJUNCTION(...) \ ::boost::callable_traits::detail::polyfills::conjunction<__VA_ARGS__> -CALLABLE_TRAITS_DETAIL_NAMESPACE_BEGIN +BOOST_CLBL_TRTS_DETAIL_NAMESPACE_BEGIN namespace polyfills { @@ -33,6 +33,6 @@ namespace polyfills { } -CALLABLE_TRAITS_DETAIL_NAMESPACE_END +BOOST_CLBL_TRTS_DETAIL_NAMESPACE_END #endif diff --git a/include/boost/callable_traits/detail/polyfills/disjunction.hpp b/include/boost/callable_traits/detail/polyfills/disjunction.hpp index 2f2b4a1..c871890 100644 --- a/include/boost/callable_traits/detail/polyfills/disjunction.hpp +++ b/include/boost/callable_traits/detail/polyfills/disjunction.hpp @@ -6,15 +6,15 @@ Distributed under the Boost Software License, Version 1.0. */ -#ifndef CALLABLE_TRAITS_DETAIL_POLYFILLS_DISJUNCTION_HPP -#define CALLABLE_TRAITS_DETAIL_POLYFILLS_DISJUNCTION_HPP +#ifndef BOOST_CLBL_TRTS_DETAIL_POLYFILLS_DISJUNCTION_HPP +#define BOOST_CLBL_TRTS_DETAIL_POLYFILLS_DISJUNCTION_HPP -#undef CALLABLE_TRAITS_DISJUNCTION -#define CALLABLE_TRAITS_DISJUNCTION(...) \ +#undef BOOST_CLBL_TRTS_DISJUNCTION +#define BOOST_CLBL_TRTS_DISJUNCTION(...) \ ::boost::callable_traits::detail::polyfills::disjunction<__VA_ARGS__> -CALLABLE_TRAITS_DETAIL_NAMESPACE_BEGIN +BOOST_CLBL_TRTS_DETAIL_NAMESPACE_BEGIN namespace polyfills { @@ -33,6 +33,6 @@ namespace polyfills { } -CALLABLE_TRAITS_DETAIL_NAMESPACE_END +BOOST_CLBL_TRTS_DETAIL_NAMESPACE_END #endif diff --git a/include/boost/callable_traits/detail/polyfills/make_index_sequence.hpp b/include/boost/callable_traits/detail/polyfills/make_index_sequence.hpp index 0384723..8a6bfe3 100644 --- a/include/boost/callable_traits/detail/polyfills/make_index_sequence.hpp +++ b/include/boost/callable_traits/detail/polyfills/make_index_sequence.hpp @@ -5,18 +5,18 @@ 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_DETAIL_POLYFILLS_MAKE_INDEX_SEQUENCE_HPP -#define CALLABLE_TRAITS_DETAIL_POLYFILLS_MAKE_INDEX_SEQUENCE_HPP +#ifndef BOOST_CLBL_TRTS_DETAIL_POLYFILLS_MAKE_INDEX_SEQUENCE_HPP +#define BOOST_CLBL_TRTS_DETAIL_POLYFILLS_MAKE_INDEX_SEQUENCE_HPP -#undef CALLABLE_TRAITS_IX_SEQ -#define CALLABLE_TRAITS_IX_SEQ(...) ::boost::callable_traits::detail::polyfills::index_sequence<__VA_ARGS__> +#undef BOOST_CLBL_TRTS_IX_SEQ +#define BOOST_CLBL_TRTS_IX_SEQ(...) ::boost::callable_traits::detail::polyfills::index_sequence<__VA_ARGS__> -#undef CALLABLE_TRAITS_MAKE_IX_SEQ -#define CALLABLE_TRAITS_MAKE_IX_SEQ(...) ::boost::callable_traits::detail::polyfills::make_index_sequence<__VA_ARGS__> +#undef BOOST_CLBL_TRTS_MAKE_IX_SEQ +#define BOOST_CLBL_TRTS_MAKE_IX_SEQ(...) ::boost::callable_traits::detail::polyfills::make_index_sequence<__VA_ARGS__> // http://stackoverflow.com/questions/17424477/implementation-c14-make-integer-sequence -CALLABLE_TRAITS_DETAIL_NAMESPACE_BEGIN +BOOST_CLBL_TRTS_DETAIL_NAMESPACE_BEGIN namespace polyfills { @@ -54,6 +54,6 @@ namespace polyfills { typename make_index_sequence_t::type; } -CALLABLE_TRAITS_DETAIL_NAMESPACE_END +BOOST_CLBL_TRTS_DETAIL_NAMESPACE_END #endif diff --git a/include/boost/callable_traits/detail/qualifier_flags.hpp b/include/boost/callable_traits/detail/qualifier_flags.hpp index 1cb6ee3..f5561f5 100644 --- a/include/boost/callable_traits/detail/qualifier_flags.hpp +++ b/include/boost/callable_traits/detail/qualifier_flags.hpp @@ -7,14 +7,14 @@ Distributed under the Boost Software License, Version 1.0. */ -#ifndef CALLABLE_TRAITS_QUALIFIER_FLAGS_HPP -#define CALLABLE_TRAITS_QUALIFIER_FLAGS_HPP +#ifndef BOOST_CLBL_TRTS_QUALIFIER_FLAGS_HPP +#define BOOST_CLBL_TRTS_QUALIFIER_FLAGS_HPP #include #include #include -CALLABLE_TRAITS_DETAIL_NAMESPACE_BEGIN +BOOST_CLBL_TRTS_DETAIL_NAMESPACE_BEGIN //bit qualifier_flags used to signify cv/ref qualifiers using qualifier_flags = std::uint32_t; @@ -51,7 +51,7 @@ constexpr qualifier_flags const_ = 1; // or member function overload. constexpr qualifier_flags volatile_ = 2; -#ifdef CALLABLE_TRAITS_DISABLE_REFERENCE_QUALIFIERS +#ifdef BOOST_CLBL_TRTS_DISABLE_REFERENCE_QUALIFIERS constexpr qualifier_flags lref_ = default_; constexpr qualifier_flags rref_ = default_; @@ -67,7 +67,7 @@ constexpr qualifier_flags lref_ = 4; // overload. constexpr qualifier_flags rref_ = 8; -#endif //#ifdef CALLABLE_TRAITS_DISABLE_REFERENCE_QUALIFIERS +#endif //#ifdef BOOST_CLBL_TRTS_DISABLE_REFERENCE_QUALIFIERS constexpr qualifier_flags cv_ = 3; @@ -121,6 +121,6 @@ template struct flag_map { static constexpr qualif template struct flag_map { static constexpr qualifier_flags value = const_ | volatile_ | lref_; }; template struct flag_map { static constexpr qualifier_flags value = const_ | volatile_ | rref_; }; -CALLABLE_TRAITS_DETAIL_NAMESPACE_END +BOOST_CLBL_TRTS_DETAIL_NAMESPACE_END -#endif //#ifndef CALLABLE_TRAITS_QUALIFIER_FLAGS_HPP +#endif //#ifndef BOOST_CLBL_TRTS_QUALIFIER_FLAGS_HPP diff --git a/include/boost/callable_traits/detail/set_function_qualifiers.hpp b/include/boost/callable_traits/detail/set_function_qualifiers.hpp index 03adf45..2477f6b 100644 --- a/include/boost/callable_traits/detail/set_function_qualifiers.hpp +++ b/include/boost/callable_traits/detail/set_function_qualifiers.hpp @@ -6,110 +6,102 @@ Distributed under the Boost Software License, Version 1.0. */ -#ifndef CALLABLE_TRAITS_DETAIL_SET_FUNCTION_QUALIFIERS_HPP -#define CALLABLE_TRAITS_DETAIL_SET_FUNCTION_QUALIFIERS_HPP +#ifndef BOOST_CLBL_TRTS_DETAIL_SET_FUNCTION_QUALIFIERS_HPP +#define BOOST_CLBL_TRTS_DETAIL_SET_FUNCTION_QUALIFIERS_HPP #include -#define CALLABLE_TRAITS_SET_FUNCTION_QUALIFIERS(QUAL) \ +#define BOOST_CLBL_TRTS_SET_FUNCTION_QUALIFIERS(QUAL) \ template \ struct set_function_qualifiers_t < \ flag_map::value, false, false, Return, Args...> { \ - \ using type = Return(Args...) QUAL; \ }; \ \ template \ struct set_function_qualifiers_t < \ flag_map::value, true, false, Return, Args...> { \ - \ using type = Return(Args...) QUAL \ - CALLABLE_TRAITS_TRANSACTION_SAFE_SPECIFIER; \ + BOOST_CLBL_TRTS_TRANSACTION_SAFE_SPECIFIER; \ }; \ \ template \ struct set_function_qualifiers_t < \ flag_map::value, false, true, Return, Args...> { \ - \ using type = Return(Args...) QUAL \ - CALLABLE_TRAITS_NOEXCEPT_SPECIFIER; \ + BOOST_CLBL_TRTS_NOEXCEPT_SPECIFIER; \ }; \ \ template \ struct set_function_qualifiers_t < \ flag_map::value, true, true, Return, Args...> { \ - \ using type = Return(Args...) QUAL \ - CALLABLE_TRAITS_TRANSACTION_SAFE_SPECIFIER \ - CALLABLE_TRAITS_NOEXCEPT_SPECIFIER; \ + BOOST_CLBL_TRTS_TRANSACTION_SAFE_SPECIFIER \ + BOOST_CLBL_TRTS_NOEXCEPT_SPECIFIER; \ }; \ \ template \ struct set_varargs_function_qualifiers_t < \ flag_map::value, false, false, Return, Args...> { \ - \ using type = Return(Args..., ...) QUAL; \ }; \ \ template \ struct set_varargs_function_qualifiers_t < \ flag_map::value, true, false, Return, Args...> { \ - \ using type = Return(Args..., ...) QUAL \ - CALLABLE_TRAITS_TRANSACTION_SAFE_SPECIFIER; \ + BOOST_CLBL_TRTS_TRANSACTION_SAFE_SPECIFIER; \ }; \ \ template \ struct set_varargs_function_qualifiers_t < \ flag_map::value, false, true, Return, Args...> { \ - \ using type = Return(Args..., ...) QUAL \ - CALLABLE_TRAITS_NOEXCEPT_SPECIFIER; \ + BOOST_CLBL_TRTS_NOEXCEPT_SPECIFIER; \ }; \ \ template \ struct set_varargs_function_qualifiers_t < \ flag_map::value, true, true, Return, Args...> { \ - \ using type = Return(Args..., ...) QUAL \ - CALLABLE_TRAITS_TRANSACTION_SAFE_SPECIFIER \ - CALLABLE_TRAITS_NOEXCEPT_SPECIFIER; \ + BOOST_CLBL_TRTS_TRANSACTION_SAFE_SPECIFIER \ + BOOST_CLBL_TRTS_NOEXCEPT_SPECIFIER; \ } \ /**/ -CALLABLE_TRAITS_DETAIL_NAMESPACE_BEGIN +BOOST_CLBL_TRTS_DETAIL_NAMESPACE_BEGIN - template + template struct set_function_qualifiers_t { using type = Return(Args...); }; - template + template struct set_varargs_function_qualifiers_t { using type = Return(Args..., ...); }; -#ifndef CALLABLE_TRAITS_DISABLE_ABOMINABLE_FUNCTIONS +#ifndef BOOST_CLBL_TRTS_DISABLE_ABOMINABLE_FUNCTIONS - CALLABLE_TRAITS_SET_FUNCTION_QUALIFIERS(const); - CALLABLE_TRAITS_SET_FUNCTION_QUALIFIERS(volatile); - CALLABLE_TRAITS_SET_FUNCTION_QUALIFIERS(const volatile); + BOOST_CLBL_TRTS_SET_FUNCTION_QUALIFIERS(const); + BOOST_CLBL_TRTS_SET_FUNCTION_QUALIFIERS(volatile); + BOOST_CLBL_TRTS_SET_FUNCTION_QUALIFIERS(const volatile); -#ifndef CALLABLE_TRAITS_DISABLE_REFERENCE_QUALIFIERS +#ifndef BOOST_CLBL_TRTS_DISABLE_REFERENCE_QUALIFIERS - CALLABLE_TRAITS_SET_FUNCTION_QUALIFIERS(&); - CALLABLE_TRAITS_SET_FUNCTION_QUALIFIERS(&&); - CALLABLE_TRAITS_SET_FUNCTION_QUALIFIERS(const &); - CALLABLE_TRAITS_SET_FUNCTION_QUALIFIERS(const &&); - CALLABLE_TRAITS_SET_FUNCTION_QUALIFIERS(volatile &); - CALLABLE_TRAITS_SET_FUNCTION_QUALIFIERS(volatile &&); - CALLABLE_TRAITS_SET_FUNCTION_QUALIFIERS(const volatile &); - CALLABLE_TRAITS_SET_FUNCTION_QUALIFIERS(const volatile &&); + BOOST_CLBL_TRTS_SET_FUNCTION_QUALIFIERS(&); + BOOST_CLBL_TRTS_SET_FUNCTION_QUALIFIERS(&&); + BOOST_CLBL_TRTS_SET_FUNCTION_QUALIFIERS(const &); + BOOST_CLBL_TRTS_SET_FUNCTION_QUALIFIERS(const &&); + BOOST_CLBL_TRTS_SET_FUNCTION_QUALIFIERS(volatile &); + BOOST_CLBL_TRTS_SET_FUNCTION_QUALIFIERS(volatile &&); + BOOST_CLBL_TRTS_SET_FUNCTION_QUALIFIERS(const volatile &); + BOOST_CLBL_TRTS_SET_FUNCTION_QUALIFIERS(const volatile &&); -#endif //#ifndef CALLABLE_TRAITS_DISABLE_REFERENCE_QUALIFIERS -#endif //#ifndef CALLABLE_TRAITS_DISABLE_ABOMINABLE_FUNCTIONS +#endif //#ifndef BOOST_CLBL_TRTS_DISABLE_REFERENCE_QUALIFIERS +#endif //#ifndef BOOST_CLBL_TRTS_DISABLE_ABOMINABLE_FUNCTIONS template @@ -123,6 +115,6 @@ CALLABLE_TRAITS_DETAIL_NAMESPACE_BEGIN typename set_varargs_function_qualifiers_t::type; -CALLABLE_TRAITS_DETAIL_NAMESPACE_END +BOOST_CLBL_TRTS_DETAIL_NAMESPACE_END -#endif //CALLABLE_TRAITS_DETAIL_SET_FUNCTION_QUALIFIERS_HPP +#endif //BOOST_CLBL_TRTS_DETAIL_SET_FUNCTION_QUALIFIERS_HPP diff --git a/include/boost/callable_traits/detail/sfinae_errors.hpp b/include/boost/callable_traits/detail/sfinae_errors.hpp index 879da29..e69a374 100644 --- a/include/boost/callable_traits/detail/sfinae_errors.hpp +++ b/include/boost/callable_traits/detail/sfinae_errors.hpp @@ -6,12 +6,12 @@ Distributed under the Boost Software License, Version 1.0. */ -#ifndef CALLABLE_TRAITS_SFINAE_ERRORS_HPP -#define CALLABLE_TRAITS_SFINAE_ERRORS_HPP +#ifndef BOOST_CLBL_TRTS_SFINAE_ERRORS_HPP +#define BOOST_CLBL_TRTS_SFINAE_ERRORS_HPP #include -CALLABLE_TRAITS_DETAIL_NAMESPACE_BEGIN +BOOST_CLBL_TRTS_DETAIL_NAMESPACE_BEGIN struct sfinae_error{}; @@ -23,7 +23,6 @@ CALLABLE_TRAITS_DETAIL_NAMESPACE_BEGIN template struct fail_if : T { - static_assert(std::is_base_of::value, "incorrect usage of fail_if"); @@ -31,7 +30,7 @@ CALLABLE_TRAITS_DETAIL_NAMESPACE_BEGIN }; template - using sfinae_try = typename CALLABLE_TRAITS_DISJUNCTION( + using sfinae_try = typename BOOST_CLBL_TRTS_DISJUNCTION( FailIfs..., success)::_::type; template @@ -40,12 +39,12 @@ CALLABLE_TRAITS_DETAIL_NAMESPACE_BEGIN FailMsg, FailMsg>::type::_::type; }; -CALLABLE_TRAITS_DETAIL_NAMESPACE_END +BOOST_CLBL_TRTS_DETAIL_NAMESPACE_END -#define CALLABLE_TRAITS_PP_CAT_(x, y) x ## y -#define CALLABLE_TRAITS_PP_CAT(x, y) CALLABLE_TRAITS_PP_CAT_(x, y) +#define BOOST_CLBL_TRTS_PP_CAT_(x, y) x ## y +#define BOOST_CLBL_TRTS_PP_CAT(x, y) BOOST_CLBL_TRTS_PP_CAT_(x, y) -#define CALLABLE_TRAITS_DEFINE_SFINAE_ERROR_ORIGIN(origin) \ +#define BOOST_CLBL_TRTS_DEFINE_SFINAE_ERROR_ORIGIN(origin) \ namespace error { \ template \ struct origin : \ @@ -54,37 +53,37 @@ namespace error { \ } \ /**/ -#define CALLABLE_TRAITS_SFINAE_MSG(origin, name) \ -struct CALLABLE_TRAITS_PP_CAT(name, _ ){}; \ +#define BOOST_CLBL_TRTS_SFINAE_MSG(origin, name) \ +struct BOOST_CLBL_TRTS_PP_CAT(name, _ ){}; \ struct name : error::origin< \ - CALLABLE_TRAITS_PP_CAT(name, _ )>{}; \ + BOOST_CLBL_TRTS_PP_CAT(name, _ )>{}; \ /**/ -CALLABLE_TRAITS_NAMESPACE_BEGIN +BOOST_CLBL_TRTS_NAMESPACE_BEGIN - CALLABLE_TRAITS_DEFINE_SFINAE_ERROR_ORIGIN(parameters) - CALLABLE_TRAITS_SFINAE_MSG(parameters, index_out_of_range_for_parameter_list) - CALLABLE_TRAITS_SFINAE_MSG(parameters, cannot_determine_parameters_for_this_type) + BOOST_CLBL_TRTS_DEFINE_SFINAE_ERROR_ORIGIN(parameters) + BOOST_CLBL_TRTS_SFINAE_MSG(parameters, index_out_of_range_for_parameter_list) + BOOST_CLBL_TRTS_SFINAE_MSG(parameters, cannot_determine_parameters_for_this_type) - CALLABLE_TRAITS_DEFINE_SFINAE_ERROR_ORIGIN(varargs) - CALLABLE_TRAITS_SFINAE_MSG(varargs, varargs_are_illegal_for_this_type) + BOOST_CLBL_TRTS_DEFINE_SFINAE_ERROR_ORIGIN(varargs) + BOOST_CLBL_TRTS_SFINAE_MSG(varargs, varargs_are_illegal_for_this_type) - CALLABLE_TRAITS_DEFINE_SFINAE_ERROR_ORIGIN(member_qualifiers) - CALLABLE_TRAITS_SFINAE_MSG(member_qualifiers, member_qualifiers_are_illegal_for_this_type) - CALLABLE_TRAITS_SFINAE_MSG(member_qualifiers, this_compiler_doesnt_support_abominable_function_types) + BOOST_CLBL_TRTS_DEFINE_SFINAE_ERROR_ORIGIN(member_qualifiers) + BOOST_CLBL_TRTS_SFINAE_MSG(member_qualifiers, member_qualifiers_are_illegal_for_this_type) + BOOST_CLBL_TRTS_SFINAE_MSG(member_qualifiers, this_compiler_doesnt_support_abominable_function_types) - CALLABLE_TRAITS_DEFINE_SFINAE_ERROR_ORIGIN(transaction_safe_) - CALLABLE_TRAITS_SFINAE_MSG(transaction_safe_, transaction_safe_is_not_supported_by_this_configuration) + BOOST_CLBL_TRTS_DEFINE_SFINAE_ERROR_ORIGIN(transaction_safe_) + BOOST_CLBL_TRTS_SFINAE_MSG(transaction_safe_, transaction_safe_is_not_supported_by_this_configuration) - CALLABLE_TRAITS_DEFINE_SFINAE_ERROR_ORIGIN(expand_args) - CALLABLE_TRAITS_SFINAE_MSG(expand_args, cannot_expand_the_parameter_list_of_first_template_argument) + BOOST_CLBL_TRTS_DEFINE_SFINAE_ERROR_ORIGIN(expand_args) + BOOST_CLBL_TRTS_SFINAE_MSG(expand_args, cannot_expand_the_parameter_list_of_first_template_argument) - CALLABLE_TRAITS_DEFINE_SFINAE_ERROR_ORIGIN(member_pointer_required) - CALLABLE_TRAITS_SFINAE_MSG(member_pointer_required, type_is_not_a_member_pointer) + BOOST_CLBL_TRTS_DEFINE_SFINAE_ERROR_ORIGIN(member_pointer_required) + BOOST_CLBL_TRTS_SFINAE_MSG(member_pointer_required, type_is_not_a_member_pointer) - CALLABLE_TRAITS_DEFINE_SFINAE_ERROR_ORIGIN(reference_error) - CALLABLE_TRAITS_SFINAE_MSG(reference_error, reference_type_not_supported_by_this_metafunction) + BOOST_CLBL_TRTS_DEFINE_SFINAE_ERROR_ORIGIN(reference_error) + BOOST_CLBL_TRTS_SFINAE_MSG(reference_error, reference_type_not_supported_by_this_metafunction) -CALLABLE_TRAITS_NAMESPACE_END +BOOST_CLBL_TRTS_NAMESPACE_END -#endif // #ifndef CALLABLE_TRAITS_SFINAE_ERRORS_HPP +#endif // #ifndef BOOST_CLBL_TRTS_SFINAE_ERRORS_HPP diff --git a/include/boost/callable_traits/detail/traits.hpp b/include/boost/callable_traits/detail/traits.hpp index c5a3c67..1e20034 100644 --- a/include/boost/callable_traits/detail/traits.hpp +++ b/include/boost/callable_traits/detail/traits.hpp @@ -6,8 +6,8 @@ Distributed under the Boost Software License, Version 1.0. */ -#ifndef CALLABLE_TRAITS_DETAIL_TRAITS_HPP -#define CALLABLE_TRAITS_DETAIL_TRAITS_HPP +#ifndef BOOST_CLBL_TRTS_DETAIL_TRAITS_HPP +#define BOOST_CLBL_TRTS_DETAIL_TRAITS_HPP #include #include @@ -15,10 +15,11 @@ Distributed under the Boost Software License, Version 1.0. #include #include -CALLABLE_TRAITS_DETAIL_NAMESPACE_BEGIN +BOOST_CLBL_TRTS_DETAIL_NAMESPACE_BEGIN + // Here is where the magic happens template - using traits = typename CALLABLE_TRAITS_DISJUNCTION( + using traits = typename BOOST_CLBL_TRTS_DISJUNCTION( function_object, function, pmf, @@ -27,6 +28,6 @@ CALLABLE_TRAITS_DETAIL_NAMESPACE_BEGIN default_callable_traits )::traits; -CALLABLE_TRAITS_DETAIL_NAMESPACE_END +BOOST_CLBL_TRTS_DETAIL_NAMESPACE_END #endif diff --git a/include/boost/callable_traits/detail/unguarded/args_pack_manipulations.hpp b/include/boost/callable_traits/detail/unguarded/args_pack_manipulations.hpp index 9c49e1e..df5fce7 100644 --- a/include/boost/callable_traits/detail/unguarded/args_pack_manipulations.hpp +++ b/include/boost/callable_traits/detail/unguarded/args_pack_manipulations.hpp @@ -9,7 +9,7 @@ DO NOT INCLUDE THIS HEADER DIRECTLY */ -static constexpr std::size_t arg_count = sizeof...(CALLABLE_TRAITS_ARGS_PACK); +static constexpr std::size_t arg_count = sizeof...(BOOST_CLBL_TRTS_ARGS_PACK); template struct map_insert { @@ -26,14 +26,14 @@ template struct insert_impl; template -struct insert_impl, StartTo> { +struct insert_impl, StartTo> { using type = sfinae_try< - CALLABLE_TRAITS_BEGIN_PACK_MANIP + BOOST_CLBL_TRTS_BEGIN_PACK_MANIP typename std::tuple_element< map_insert::value, - std::tuple>::type... - CALLABLE_TRAITS_END_PACK_MANIP, + std::tuple>::type... + BOOST_CLBL_TRTS_END_PACK_MANIP, fail_if >; @@ -41,7 +41,7 @@ struct insert_impl, StartTo> { template using insert_args = typename insert_impl< - CALLABLE_TRAITS_MAKE_IX_SEQ(arg_count + sizeof...(U)), + BOOST_CLBL_TRTS_MAKE_IX_SEQ(arg_count + sizeof...(U)), std::tuple, N>::type; template @@ -57,14 +57,14 @@ template struct remove_impl; template -struct remove_impl { +struct remove_impl { using type = sfinae_try< - CALLABLE_TRAITS_BEGIN_PACK_MANIP + BOOST_CLBL_TRTS_BEGIN_PACK_MANIP typename std::tuple_element< map_remove::value, - std::tuple>::type... - CALLABLE_TRAITS_END_PACK_MANIP, + std::tuple>::type... + BOOST_CLBL_TRTS_END_PACK_MANIP, fail_if >; @@ -72,17 +72,17 @@ struct remove_impl { //when not removing anything template -struct remove_impl { +struct remove_impl { using type = - CALLABLE_TRAITS_BEGIN_PACK_MANIP - CALLABLE_TRAITS_ARGS_PACK... - CALLABLE_TRAITS_END_PACK_MANIP; + BOOST_CLBL_TRTS_BEGIN_PACK_MANIP + BOOST_CLBL_TRTS_ARGS_PACK... + BOOST_CLBL_TRTS_END_PACK_MANIP; }; template using remove_args = typename remove_impl< - CALLABLE_TRAITS_MAKE_IX_SEQ(arg_count - Count), StartIndex, Count>::type; + BOOST_CLBL_TRTS_MAKE_IX_SEQ(arg_count - Count), StartIndex, Count>::type; template struct map_overwrite { @@ -99,14 +99,14 @@ template struct overwrite_impl; template -struct overwrite_impl, StartTo> { +struct overwrite_impl, StartTo> { using type = sfinae_try< - CALLABLE_TRAITS_BEGIN_PACK_MANIP + BOOST_CLBL_TRTS_BEGIN_PACK_MANIP typename std::tuple_element< map_overwrite::value, - std::tuple>::type... - CALLABLE_TRAITS_END_PACK_MANIP, + std::tuple>::type... + BOOST_CLBL_TRTS_END_PACK_MANIP, fail_if >; @@ -114,21 +114,21 @@ struct overwrite_impl, StartTo> { template using replace_args = typename overwrite_impl< - CALLABLE_TRAITS_MAKE_IX_SEQ(arg_count <= StartIndex + sizeof...(U) ? + BOOST_CLBL_TRTS_MAKE_IX_SEQ(arg_count <= StartIndex + sizeof...(U) ? StartIndex + sizeof...(U) : arg_count), std::tuple, StartIndex>::type; template using push_front = - CALLABLE_TRAITS_BEGIN_PACK_MANIP - NewArgs..., CALLABLE_TRAITS_ARGS_PACK... - CALLABLE_TRAITS_END_PACK_MANIP; + BOOST_CLBL_TRTS_BEGIN_PACK_MANIP + NewArgs..., BOOST_CLBL_TRTS_ARGS_PACK... + BOOST_CLBL_TRTS_END_PACK_MANIP; template using push_back = -CALLABLE_TRAITS_BEGIN_PACK_MANIP -CALLABLE_TRAITS_ARGS_PACK..., NewArgs... -CALLABLE_TRAITS_END_PACK_MANIP; +BOOST_CLBL_TRTS_BEGIN_PACK_MANIP +BOOST_CLBL_TRTS_ARGS_PACK..., NewArgs... +BOOST_CLBL_TRTS_END_PACK_MANIP; template using pop_front = remove_args<0, arg_count <= Count ? arg_count : Count>; diff --git a/include/boost/callable_traits/detail/unguarded/function.hpp b/include/boost/callable_traits/detail/unguarded/function.hpp index 07ffb73..ee5de44 100644 --- a/include/boost/callable_traits/detail/unguarded/function.hpp +++ b/include/boost/callable_traits/detail/unguarded/function.hpp @@ -8,18 +8,18 @@ HEADER GUARDS INTENTIONALLY OMITTED DO NOT INCLUDE THIS HEADER DIRECTLY */ -#define CALLABLE_TRAITS_INCLUDE_TRANSACTION_SAFE -#define CALLABLE_TRAITS_IS_TRANSACTION_SAFE std::false_type +#define BOOST_CLBL_TRTS_INCLUDE_TRANSACTION_SAFE +#define BOOST_CLBL_TRTS_IS_TRANSACTION_SAFE std::false_type #include -#undef CALLABLE_TRAITS_INCLUDE_TRANSACTION_SAFE -#undef CALLABLE_TRAITS_IS_TRANSACTION_SAFE +#undef BOOST_CLBL_TRTS_INCLUDE_TRANSACTION_SAFE +#undef BOOST_CLBL_TRTS_IS_TRANSACTION_SAFE -#ifdef CALLABLE_TRAITS_ENABLE_TRANSACTION_SAFE -#define CALLABLE_TRAITS_IS_TRANSACTION_SAFE std::true_type -#define CALLABLE_TRAITS_INCLUDE_TRANSACTION_SAFE transaction_safe +#ifdef BOOST_CLBL_TRTS_ENABLE_TRANSACTION_SAFE +#define BOOST_CLBL_TRTS_IS_TRANSACTION_SAFE std::true_type +#define BOOST_CLBL_TRTS_INCLUDE_TRANSACTION_SAFE transaction_safe #include #endif -#undef CALLABLE_TRAITS_INCLUDE_TRANSACTION_SAFE -#undef CALLABLE_TRAITS_IS_TRANSACTION_SAFE +#undef BOOST_CLBL_TRTS_INCLUDE_TRANSACTION_SAFE +#undef BOOST_CLBL_TRTS_IS_TRANSACTION_SAFE diff --git a/include/boost/callable_traits/detail/unguarded/function_2.hpp b/include/boost/callable_traits/detail/unguarded/function_2.hpp index 8d80997..796f483 100644 --- a/include/boost/callable_traits/detail/unguarded/function_2.hpp +++ b/include/boost/callable_traits/detail/unguarded/function_2.hpp @@ -6,21 +6,296 @@ Distributed under the Boost Software License, Version 1.0. HEADER GUARDS INTENTIONALLY OMITTED DO NOT INCLUDE THIS HEADER DIRECTLY + +macros used: + +BOOST_CLBL_TRTS_INCLUDE_QUALIFIERS - the function-level qualifiers for the + current inclusion (combinations of `const` `volatile` `&` `&&`, or nothing) + +BOOST_CLBL_TRTS_INCLUDE_TRANSACTION_SAFE - the transaction_safe specifier for + the current include (`transaction_safe` or nothing) + +BOOST_CLBL_TRTS_IS_TRANSACTION_SAFE - `std::true_type` or `std::false_type`, + tied on whether BOOST_CLBL_TRTS_INCLUDE_TRANSACTION_SAFE is `transaction_safe` + +BOOST_CLBL_TRTS_TRANSACTION_SAFE_SPECIFIER - `transaction_safe` when + BOOST_CLBL_TRTS_ENABLE_TRANSACTION_SAFE is enabled, otherwise nothing + +BOOST_CLBL_TRTS_NOEXCEPT_SPEC - the noexcept specifier for + the current include (`noexcept` or nothing) + +BOOST_CLBL_TRTS_IS_NOEXCEPT - `std::true_type` or `std::false_type`, + tied on whether BOOST_CLBL_TRTS_NOEXCEPT_SPEC is `noexcept` + +BOOST_CLBL_TRTS_NOEXCEPT_SPECIFIER - `noexcept` if + BOOST_CLBL_TRTS_ENABLE_NOEXCEPT_TYPES is defined, otherwise nothing + */ -#define CALLABLE_TRAITS_INCLUDE_NOEXCEPT -#define CALLABLE_TRAITS_IS_NOEXCEPT std::false_type -#include -#undef CALLABLE_TRAITS_INCLUDE_NOEXCEPT -#undef CALLABLE_TRAITS_IS_NOEXCEPT -#ifdef CALLABLE_TRAITS_ENABLE_NOEXCEPT_TYPES +template +struct function + : default_callable_traits { + + static constexpr bool value = true; + + using traits = function; -#define CALLABLE_TRAITS_IS_NOEXCEPT std::true_type -#define CALLABLE_TRAITS_INCLUDE_NOEXCEPT noexcept -#include -#undef CALLABLE_TRAITS_INCLUDE_NOEXCEPT -#undef CALLABLE_TRAITS_IS_NOEXCEPT + using return_type = Return; -#endif // #ifdef CALLABLE_TRAITS_ENABLE_NOEXCEPT_TYPES + using arg_types = std::tuple; + using non_invoke_arg_types = arg_types; + + using type = Return(Args...) + BOOST_CLBL_TRTS_INCLUDE_QUALIFIERS + BOOST_CLBL_TRTS_INCLUDE_TRANSACTION_SAFE + BOOST_CLBL_TRTS_NOEXCEPT_SPEC; + + using function_type = Return(Args...); + + using qualified_function_type = Return(Args...) + BOOST_CLBL_TRTS_INCLUDE_QUALIFIERS + BOOST_CLBL_TRTS_INCLUDE_TRANSACTION_SAFE + BOOST_CLBL_TRTS_NOEXCEPT_SPEC; + + using remove_varargs = type; + + using add_varargs = Return (Args..., ...) + BOOST_CLBL_TRTS_INCLUDE_QUALIFIERS + BOOST_CLBL_TRTS_INCLUDE_TRANSACTION_SAFE + BOOST_CLBL_TRTS_NOEXCEPT_SPEC; + + using is_noexcept = BOOST_CLBL_TRTS_IS_NOEXCEPT; + + using remove_noexcept = Return(Args...) + BOOST_CLBL_TRTS_INCLUDE_QUALIFIERS + BOOST_CLBL_TRTS_INCLUDE_TRANSACTION_SAFE; + + using add_noexcept = Return(Args...) + BOOST_CLBL_TRTS_INCLUDE_QUALIFIERS + BOOST_CLBL_TRTS_INCLUDE_TRANSACTION_SAFE + BOOST_CLBL_TRTS_NOEXCEPT_SPECIFIER; + + using is_transaction_safe = BOOST_CLBL_TRTS_IS_TRANSACTION_SAFE; + + using remove_transaction_safe = Return(Args...) + BOOST_CLBL_TRTS_INCLUDE_QUALIFIERS + BOOST_CLBL_TRTS_NOEXCEPT_SPEC; + + using add_transaction_safe = Return(Args...) + BOOST_CLBL_TRTS_INCLUDE_QUALIFIERS + BOOST_CLBL_TRTS_TRANSACTION_SAFE_SPECIFIER + BOOST_CLBL_TRTS_NOEXCEPT_SPEC; + + using qualifiers = default_callable_traits; + + template + using set_qualifiers = set_function_qualifiers; + + #ifdef BOOST_CLBL_TRTS_DISABLE_ABOMINABLE_FUNCTIONS + + using add_member_lvalue_reference = abominable_functions_not_supported_on_this_compiler; + using add_member_rvalue_reference = abominable_functions_not_supported_on_this_compiler; + using add_member_const = abominable_functions_not_supported_on_this_compiler; + using add_member_volatile = abominable_functions_not_supported_on_this_compiler; + using add_member_cv = abominable_functions_not_supported_on_this_compiler; + + #else + + using add_member_lvalue_reference = set_qualifiers< + collapse_flags::value>; + + using add_member_rvalue_reference = set_qualifiers< + collapse_flags::value>; + + using add_member_const = set_qualifiers; + + using add_member_volatile = set_qualifiers; + + using add_member_cv = set_qualifiers; + + #endif // #ifdef BOOST_CLBL_TRTS_DISABLE_ABOMINABLE_FUNCTIONS + + using remove_member_reference = set_qualifiers; + + using remove_member_const = set_qualifiers< + qualifiers::ref_flags | remove_const_flag::value>; + + using remove_member_volatile = set_qualifiers< + qualifiers::ref_flags | remove_volatile_flag::value>; + + using remove_member_cv = set_qualifiers; + + template + using apply_member_pointer = add_member_pointer; + + template + using apply_return = NewReturn(Args...) + BOOST_CLBL_TRTS_INCLUDE_QUALIFIERS + BOOST_CLBL_TRTS_INCLUDE_TRANSACTION_SAFE + BOOST_CLBL_TRTS_NOEXCEPT_SPEC; + + template class Container> + using expand_args = Container; + + template class Container, typename... RightArgs> + using expand_args_left = Container; + + template class Container, typename... LeftArgs> + using expand_args_right = Container; + + using clear_args = Return() + BOOST_CLBL_TRTS_INCLUDE_QUALIFIERS + BOOST_CLBL_TRTS_INCLUDE_TRANSACTION_SAFE + BOOST_CLBL_TRTS_NOEXCEPT_SPEC; + +#undef BOOST_CLBL_TRTS_BEGIN_PACK_MANIP +#undef BOOST_CLBL_TRTS_ARGS_PACK +#undef BOOST_CLBL_TRTS_END_PACK_MANIP + +#define BOOST_CLBL_TRTS_BEGIN_PACK_MANIP Return( +#define BOOST_CLBL_TRTS_ARGS_PACK Args + +#define BOOST_CLBL_TRTS_END_PACK_MANIP \ + ) BOOST_CLBL_TRTS_INCLUDE_QUALIFIERS BOOST_CLBL_TRTS_INCLUDE_TRANSACTION_SAFE + +#include +#undef BOOST_CLBL_TRTS_BEGIN_PACK_MANIP +#undef BOOST_CLBL_TRTS_END_PACK_MANIP +}; + + +template +struct function + : default_callable_traits<> { + + static constexpr bool value = true; + + using has_varargs = std::true_type; + using traits = function; + using return_type = Return; + using arg_types = std::tuple; + + using type = Return (Args..., ...) + BOOST_CLBL_TRTS_INCLUDE_QUALIFIERS + BOOST_CLBL_TRTS_INCLUDE_TRANSACTION_SAFE + BOOST_CLBL_TRTS_NOEXCEPT_SPEC; + + using function_type = Return(Args..., ...); + + using qualified_function_type = Return(Args..., ...) + BOOST_CLBL_TRTS_INCLUDE_QUALIFIERS + BOOST_CLBL_TRTS_INCLUDE_TRANSACTION_SAFE + BOOST_CLBL_TRTS_NOEXCEPT_SPEC; + + using remove_varargs = Return (Args...) + BOOST_CLBL_TRTS_INCLUDE_QUALIFIERS + BOOST_CLBL_TRTS_INCLUDE_TRANSACTION_SAFE + BOOST_CLBL_TRTS_NOEXCEPT_SPEC; + + using add_varargs = type; + + using is_noexcept = BOOST_CLBL_TRTS_IS_NOEXCEPT; + + using remove_noexcept = Return(Args..., ...) + BOOST_CLBL_TRTS_INCLUDE_QUALIFIERS + BOOST_CLBL_TRTS_INCLUDE_TRANSACTION_SAFE; + + using add_noexcept = Return(Args..., ...) + BOOST_CLBL_TRTS_INCLUDE_QUALIFIERS + BOOST_CLBL_TRTS_INCLUDE_TRANSACTION_SAFE + BOOST_CLBL_TRTS_NOEXCEPT_SPECIFIER; + + using is_transaction_safe = BOOST_CLBL_TRTS_IS_TRANSACTION_SAFE; + + using remove_transaction_safe = Return(Args..., ...) + BOOST_CLBL_TRTS_INCLUDE_QUALIFIERS + BOOST_CLBL_TRTS_NOEXCEPT_SPEC; + + using add_transaction_safe = Return(Args..., ...) + BOOST_CLBL_TRTS_INCLUDE_QUALIFIERS + BOOST_CLBL_TRTS_TRANSACTION_SAFE_SPECIFIER + BOOST_CLBL_TRTS_NOEXCEPT_SPEC; + + using qualifiers = default_callable_traits; + + template + using set_qualifiers = set_varargs_function_qualifiers; + + #ifdef BOOST_CLBL_TRTS_DISABLE_ABOMINABLE_FUNCTIONS + + using add_member_lvalue_reference = abominable_functions_not_supported_on_this_compiler; + using add_member_rvalue_reference = abominable_functions_not_supported_on_this_compiler; + using add_member_const = abominable_functions_not_supported_on_this_compiler; + using add_member_volatile = abominable_functions_not_supported_on_this_compiler; + using add_member_cv = abominable_functions_not_supported_on_this_compiler; + + #else + + using add_member_lvalue_reference = set_qualifiers< + collapse_flags::value>; + + using add_member_rvalue_reference = set_qualifiers< + collapse_flags::value>; + + using add_member_const = set_qualifiers; + + using add_member_volatile = set_qualifiers; + + using add_member_cv = set_qualifiers; + + #endif // #ifdef BOOST_CLBL_TRTS_DISABLE_ABOMINABLE_FUNCTIONS + + using remove_member_reference = set_qualifiers; + + using remove_member_const = set_qualifiers< + qualifiers::ref_flags | remove_const_flag::value>; + + using remove_member_volatile = set_qualifiers< + qualifiers::ref_flags | remove_volatile_flag::value>; + + using remove_member_cv = set_qualifiers; + + template + using apply_member_pointer = + Return( BOOST_CLBL_TRTS_DEFAULT_VARARGS_CC U::*)(Args..., ...) + BOOST_CLBL_TRTS_INCLUDE_QUALIFIERS + BOOST_CLBL_TRTS_INCLUDE_TRANSACTION_SAFE + BOOST_CLBL_TRTS_NOEXCEPT_SPEC; + + template + using apply_return = NewReturn(Args..., ...) + BOOST_CLBL_TRTS_INCLUDE_QUALIFIERS + BOOST_CLBL_TRTS_INCLUDE_TRANSACTION_SAFE + BOOST_CLBL_TRTS_NOEXCEPT_SPEC; + + template class Container> + using expand_args = Container; + + using clear_args = Return() + BOOST_CLBL_TRTS_INCLUDE_QUALIFIERS + BOOST_CLBL_TRTS_INCLUDE_TRANSACTION_SAFE + BOOST_CLBL_TRTS_NOEXCEPT_SPEC; + +#define BOOST_CLBL_TRTS_BEGIN_PACK_MANIP Return( +#define BOOST_CLBL_TRTS_ARGS_PACK Args + +#define BOOST_CLBL_TRTS_END_PACK_MANIP \ + , ...) BOOST_CLBL_TRTS_INCLUDE_QUALIFIERS BOOST_CLBL_TRTS_INCLUDE_TRANSACTION_SAFE BOOST_CLBL_TRTS_NOEXCEPT_SPEC + + +#include +#undef BOOST_CLBL_TRTS_BEGIN_PACK_MANIP +#undef BOOST_CLBL_TRTS_ARGS_PACK +#undef BOOST_CLBL_TRTS_END_PACK_MANIP + +}; diff --git a/include/boost/callable_traits/detail/unguarded/function_3.hpp b/include/boost/callable_traits/detail/unguarded/function_3.hpp deleted file mode 100644 index 99456c3..0000000 --- a/include/boost/callable_traits/detail/unguarded/function_3.hpp +++ /dev/null @@ -1,301 +0,0 @@ -/* -Copyright (c) 2016 Barrett Adair - -Distributed under the Boost Software License, Version 1.0. -(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt) - -HEADER GUARDS INTENTIONALLY OMITTED -DO NOT INCLUDE THIS HEADER DIRECTLY - -macros used: - -CALLABLE_TRAITS_INCLUDE_QUALIFIERS - the function-level qualifiers for the - current inclusion (combinations of `const` `volatile` `&` `&&`, or nothing) - -CALLABLE_TRAITS_INCLUDE_TRANSACTION_SAFE - the transaction_safe specifier for - the current include (`transaction_safe` or nothing) - -CALLABLE_TRAITS_IS_TRANSACTION_SAFE - `std::true_type` or `std::false_type`, - tied on whether CALLABLE_TRAITS_INCLUDE_TRANSACTION_SAFE is `transaction_safe` - -CALLABLE_TRAITS_TRANSACTION_SAFE_SPECIFIER - `transaction_safe` when - CALLABLE_TRAITS_ENABLE_TRANSACTION_SAFE is enabled, otherwise nothing - -CALLABLE_TRAITS_INCLUDE_NOEXCEPT - the noexcept specifier for - the current include (`noexcept` or nothing) - -CALLABLE_TRAITS_IS_NOEXCEPT - `std::true_type` or `std::false_type`, - tied on whether CALLABLE_TRAITS_INCLUDE_NOEXCEPT is `noexcept` - -CALLABLE_TRAITS_NOEXCEPT_SPECIFIER - `noexcept` if - CALLABLE_TRAITS_ENABLE_NOEXCEPT_TYPES is defined, otherwise nothing - -*/ - - - -template -struct function - : default_callable_traits { - - static constexpr bool value = true; - - using traits = function; - - using return_type = Return; - - using arg_types = std::tuple; - using non_invoke_arg_types = arg_types; - - using type = Return(Args...) - CALLABLE_TRAITS_INCLUDE_QUALIFIERS - CALLABLE_TRAITS_INCLUDE_TRANSACTION_SAFE - CALLABLE_TRAITS_INCLUDE_NOEXCEPT; - - using function_type = Return(Args...); - - using qualified_function_type = Return(Args...) - CALLABLE_TRAITS_INCLUDE_QUALIFIERS - CALLABLE_TRAITS_INCLUDE_TRANSACTION_SAFE - CALLABLE_TRAITS_INCLUDE_NOEXCEPT; - - using remove_varargs = type; - - using add_varargs = Return (Args..., ...) - CALLABLE_TRAITS_INCLUDE_QUALIFIERS - CALLABLE_TRAITS_INCLUDE_TRANSACTION_SAFE - CALLABLE_TRAITS_INCLUDE_NOEXCEPT; - - using is_noexcept = CALLABLE_TRAITS_IS_NOEXCEPT; - - using remove_noexcept = Return(Args...) - CALLABLE_TRAITS_INCLUDE_QUALIFIERS - CALLABLE_TRAITS_INCLUDE_TRANSACTION_SAFE; - - using add_noexcept = Return(Args...) - CALLABLE_TRAITS_INCLUDE_QUALIFIERS - CALLABLE_TRAITS_INCLUDE_TRANSACTION_SAFE - CALLABLE_TRAITS_NOEXCEPT_SPECIFIER; - - using is_transaction_safe = CALLABLE_TRAITS_IS_TRANSACTION_SAFE; - - using remove_transaction_safe = Return(Args...) - CALLABLE_TRAITS_INCLUDE_QUALIFIERS - CALLABLE_TRAITS_INCLUDE_NOEXCEPT; - - using add_transaction_safe = Return(Args...) - CALLABLE_TRAITS_INCLUDE_QUALIFIERS - CALLABLE_TRAITS_TRANSACTION_SAFE_SPECIFIER - CALLABLE_TRAITS_INCLUDE_NOEXCEPT; - - using qualifiers = default_callable_traits; - - template - using set_qualifiers = set_function_qualifiers; - - #ifdef CALLABLE_TRAITS_DISABLE_ABOMINABLE_FUNCTIONS - - using add_member_lvalue_reference = abominable_functions_not_supported_on_this_compiler; - using add_member_rvalue_reference = abominable_functions_not_supported_on_this_compiler; - using add_member_const = abominable_functions_not_supported_on_this_compiler; - using add_member_volatile = abominable_functions_not_supported_on_this_compiler; - using add_member_cv = abominable_functions_not_supported_on_this_compiler; - - #else - - using add_member_lvalue_reference = set_qualifiers< - collapse_flags::value>; - - using add_member_rvalue_reference = set_qualifiers< - collapse_flags::value>; - - using add_member_const = set_qualifiers; - - using add_member_volatile = set_qualifiers; - - using add_member_cv = set_qualifiers; - - #endif // #ifdef CALLABLE_TRAITS_DISABLE_ABOMINABLE_FUNCTIONS - - using remove_member_reference = set_qualifiers; - - using remove_member_const = set_qualifiers< - qualifiers::ref_flags | remove_const_flag::value>; - - using remove_member_volatile = set_qualifiers< - qualifiers::ref_flags | remove_volatile_flag::value>; - - using remove_member_cv = set_qualifiers; - - template - using apply_member_pointer = add_member_pointer; - - template - using apply_return = NewReturn(Args...) - CALLABLE_TRAITS_INCLUDE_QUALIFIERS - CALLABLE_TRAITS_INCLUDE_TRANSACTION_SAFE - CALLABLE_TRAITS_INCLUDE_NOEXCEPT; - - template class Container> - using expand_args = Container; - - template class Container, typename... RightArgs> - using expand_args_left = Container; - - template class Container, typename... LeftArgs> - using expand_args_right = Container; - - using clear_args = Return() - CALLABLE_TRAITS_INCLUDE_QUALIFIERS - CALLABLE_TRAITS_INCLUDE_TRANSACTION_SAFE - CALLABLE_TRAITS_INCLUDE_NOEXCEPT; - -#undef CALLABLE_TRAITS_BEGIN_PACK_MANIP -#undef CALLABLE_TRAITS_ARGS_PACK -#undef CALLABLE_TRAITS_END_PACK_MANIP - -#define CALLABLE_TRAITS_BEGIN_PACK_MANIP Return( -#define CALLABLE_TRAITS_ARGS_PACK Args - -#define CALLABLE_TRAITS_END_PACK_MANIP \ - ) CALLABLE_TRAITS_INCLUDE_QUALIFIERS CALLABLE_TRAITS_INCLUDE_TRANSACTION_SAFE - -#include -#undef CALLABLE_TRAITS_BEGIN_PACK_MANIP -#undef CALLABLE_TRAITS_END_PACK_MANIP -}; - - -template -struct function - : default_callable_traits<> { - - static constexpr bool value = true; - - using has_varargs = std::true_type; - using traits = function; - using return_type = Return; - using arg_types = std::tuple; - - using type = Return (Args..., ...) - CALLABLE_TRAITS_INCLUDE_QUALIFIERS - CALLABLE_TRAITS_INCLUDE_TRANSACTION_SAFE - CALLABLE_TRAITS_INCLUDE_NOEXCEPT; - - using function_type = Return(Args..., ...); - - using qualified_function_type = Return(Args..., ...) - CALLABLE_TRAITS_INCLUDE_QUALIFIERS - CALLABLE_TRAITS_INCLUDE_TRANSACTION_SAFE - CALLABLE_TRAITS_INCLUDE_NOEXCEPT; - - using remove_varargs = Return (Args...) - CALLABLE_TRAITS_INCLUDE_QUALIFIERS - CALLABLE_TRAITS_INCLUDE_TRANSACTION_SAFE - CALLABLE_TRAITS_INCLUDE_NOEXCEPT; - - using add_varargs = type; - - using is_noexcept = CALLABLE_TRAITS_IS_NOEXCEPT; - - using remove_noexcept = Return(Args..., ...) - CALLABLE_TRAITS_INCLUDE_QUALIFIERS - CALLABLE_TRAITS_INCLUDE_TRANSACTION_SAFE; - - using add_noexcept = Return(Args..., ...) - CALLABLE_TRAITS_INCLUDE_QUALIFIERS - CALLABLE_TRAITS_INCLUDE_TRANSACTION_SAFE - CALLABLE_TRAITS_NOEXCEPT_SPECIFIER; - - using is_transaction_safe = CALLABLE_TRAITS_IS_TRANSACTION_SAFE; - - using remove_transaction_safe = Return(Args..., ...) - CALLABLE_TRAITS_INCLUDE_QUALIFIERS - CALLABLE_TRAITS_INCLUDE_NOEXCEPT; - - using add_transaction_safe = Return(Args..., ...) - CALLABLE_TRAITS_INCLUDE_QUALIFIERS - CALLABLE_TRAITS_TRANSACTION_SAFE_SPECIFIER - CALLABLE_TRAITS_INCLUDE_NOEXCEPT; - - using qualifiers = default_callable_traits; - - template - using set_qualifiers = set_varargs_function_qualifiers; - - #ifdef CALLABLE_TRAITS_DISABLE_ABOMINABLE_FUNCTIONS - - using add_member_lvalue_reference = abominable_functions_not_supported_on_this_compiler; - using add_member_rvalue_reference = abominable_functions_not_supported_on_this_compiler; - using add_member_const = abominable_functions_not_supported_on_this_compiler; - using add_member_volatile = abominable_functions_not_supported_on_this_compiler; - using add_member_cv = abominable_functions_not_supported_on_this_compiler; - - #else - - using add_member_lvalue_reference = set_qualifiers< - collapse_flags::value>; - - using add_member_rvalue_reference = set_qualifiers< - collapse_flags::value>; - - using add_member_const = set_qualifiers; - - using add_member_volatile = set_qualifiers; - - using add_member_cv = set_qualifiers; - - #endif // #ifdef CALLABLE_TRAITS_DISABLE_ABOMINABLE_FUNCTIONS - - using remove_member_reference = set_qualifiers; - - using remove_member_const = set_qualifiers< - qualifiers::ref_flags | remove_const_flag::value>; - - using remove_member_volatile = set_qualifiers< - qualifiers::ref_flags | remove_volatile_flag::value>; - - using remove_member_cv = set_qualifiers; - - template - using apply_member_pointer = - Return( CALLABLE_TRAITS_DEFAULT_VARARGS_CC U::*)(Args..., ...) - CALLABLE_TRAITS_INCLUDE_QUALIFIERS - CALLABLE_TRAITS_INCLUDE_TRANSACTION_SAFE - CALLABLE_TRAITS_INCLUDE_NOEXCEPT; - - template - using apply_return = NewReturn(Args..., ...) - CALLABLE_TRAITS_INCLUDE_QUALIFIERS - CALLABLE_TRAITS_INCLUDE_TRANSACTION_SAFE - CALLABLE_TRAITS_INCLUDE_NOEXCEPT; - - template class Container> - using expand_args = Container; - - using clear_args = Return() - CALLABLE_TRAITS_INCLUDE_QUALIFIERS - CALLABLE_TRAITS_INCLUDE_TRANSACTION_SAFE - CALLABLE_TRAITS_INCLUDE_NOEXCEPT; - -#define CALLABLE_TRAITS_BEGIN_PACK_MANIP Return( -#define CALLABLE_TRAITS_ARGS_PACK Args - -#define CALLABLE_TRAITS_END_PACK_MANIP \ - , ...) CALLABLE_TRAITS_INCLUDE_QUALIFIERS CALLABLE_TRAITS_INCLUDE_TRANSACTION_SAFE CALLABLE_TRAITS_INCLUDE_NOEXCEPT - - -#include -#undef CALLABLE_TRAITS_BEGIN_PACK_MANIP -#undef CALLABLE_TRAITS_ARGS_PACK -#undef CALLABLE_TRAITS_END_PACK_MANIP - -}; diff --git a/include/boost/callable_traits/detail/unguarded/function_ptr.hpp b/include/boost/callable_traits/detail/unguarded/function_ptr.hpp index 402acdd..4aa8ad5 100644 --- a/include/boost/callable_traits/detail/unguarded/function_ptr.hpp +++ b/include/boost/callable_traits/detail/unguarded/function_ptr.hpp @@ -8,18 +8,18 @@ HEADER GUARDS INTENTIONALLY OMITTED DO NOT INCLUDE THIS HEADER DIRECTLY */ -#define CALLABLE_TRAITS_INCLUDE_TRANSACTION_SAFE -#define CALLABLE_TRAITS_IS_TRANSACTION_SAFE std::false_type +#define BOOST_CLBL_TRTS_INCLUDE_TRANSACTION_SAFE +#define BOOST_CLBL_TRTS_IS_TRANSACTION_SAFE std::false_type #include -#undef CALLABLE_TRAITS_INCLUDE_TRANSACTION_SAFE -#undef CALLABLE_TRAITS_IS_TRANSACTION_SAFE +#undef BOOST_CLBL_TRTS_INCLUDE_TRANSACTION_SAFE +#undef BOOST_CLBL_TRTS_IS_TRANSACTION_SAFE -#ifdef CALLABLE_TRAITS_ENABLE_TRANSACTION_SAFE -#define CALLABLE_TRAITS_IS_TRANSACTION_SAFE std::true_type -#define CALLABLE_TRAITS_INCLUDE_TRANSACTION_SAFE transaction_safe +#ifdef BOOST_CLBL_TRTS_ENABLE_TRANSACTION_SAFE +#define BOOST_CLBL_TRTS_IS_TRANSACTION_SAFE std::true_type +#define BOOST_CLBL_TRTS_INCLUDE_TRANSACTION_SAFE transaction_safe #include #endif -#undef CALLABLE_TRAITS_INCLUDE_TRANSACTION_SAFE -#undef CALLABLE_TRAITS_IS_TRANSACTION_SAFE +#undef BOOST_CLBL_TRTS_INCLUDE_TRANSACTION_SAFE +#undef BOOST_CLBL_TRTS_IS_TRANSACTION_SAFE diff --git a/include/boost/callable_traits/detail/unguarded/function_ptr_2.hpp b/include/boost/callable_traits/detail/unguarded/function_ptr_2.hpp index 12f8c50..486a3bd 100644 --- a/include/boost/callable_traits/detail/unguarded/function_ptr_2.hpp +++ b/include/boost/callable_traits/detail/unguarded/function_ptr_2.hpp @@ -6,21 +6,114 @@ Distributed under the Boost Software License, Version 1.0. HEADER GUARDS INTENTIONALLY OMITTED DO NOT INCLUDE THIS HEADER DIRECTLY + +macros used: + +BOOST_CLBL_TRTS_INCLUDE_TRANSACTION_SAFE - the transaction_safe specifier for + the current include (`transaction_safe` or nothing) + +BOOST_CLBL_TRTS_IS_TRANSACTION_SAFE - `std::true_type` or `std::false_type`, + tied on whether BOOST_CLBL_TRTS_INCLUDE_TRANSACTION_SAFE is `transaction_safe` + +BOOST_CLBL_TRTS_TRANSACTION_SAFE_SPECIFIER - `transaction_safe` when + BOOST_CLBL_TRTS_ENABLE_TRANSACTION_SAFE is enabled, otherwise nothing + +BOOST_CLBL_TRTS_NOEXCEPT_SPEC - the noexcept specifier for + the current include (`noexcept` or nothing) + +BOOST_CLBL_TRTS_IS_NOEXCEPT - `std::true_type` or `std::false_type`, + tied on whether BOOST_CLBL_TRTS_NOEXCEPT_SPEC is `noexcept` + +BOOST_CLBL_TRTS_NOEXCEPT_SPECIFIER - `noexcept` if + BOOST_CLBL_TRTS_ENABLE_NOEXCEPT_TYPES is defined, otherwise nothing */ -#define CALLABLE_TRAITS_INCLUDE_NOEXCEPT -#define CALLABLE_TRAITS_IS_NOEXCEPT std::false_type -#include +template +struct function< + BOOST_CLBL_TRTS_ST Return(BOOST_CLBL_TRTS_CC *)(Args...) + BOOST_CLBL_TRTS_INCLUDE_TRANSACTION_SAFE + BOOST_CLBL_TRTS_NOEXCEPT_SPEC> + : default_callable_traits<> { -#undef CALLABLE_TRAITS_INCLUDE_NOEXCEPT -#undef CALLABLE_TRAITS_IS_NOEXCEPT + static constexpr bool value = true; -#ifdef CALLABLE_TRAITS_ENABLE_NOEXCEPT_TYPES + using traits = function; -#define CALLABLE_TRAITS_IS_NOEXCEPT std::true_type -#define CALLABLE_TRAITS_INCLUDE_NOEXCEPT noexcept -#include -#undef CALLABLE_TRAITS_INCLUDE_NOEXCEPT -#undef CALLABLE_TRAITS_IS_NOEXCEPT + using return_type = Return; + + using arg_types = std::tuple; + using non_invoke_arg_types = arg_types; + + using type = BOOST_CLBL_TRTS_ST Return(BOOST_CLBL_TRTS_CC *)(Args...) + BOOST_CLBL_TRTS_INCLUDE_TRANSACTION_SAFE; + + using function_type = Return(Args...); + using qualified_function_type = function_type; + using remove_varargs = type; + + using add_varargs = + BOOST_CLBL_TRTS_ST Return (BOOST_CLBL_TRTS_VARARGS_CC *)(Args..., ...) + BOOST_CLBL_TRTS_INCLUDE_TRANSACTION_SAFE + BOOST_CLBL_TRTS_NOEXCEPT_SPEC; + + using is_noexcept = BOOST_CLBL_TRTS_IS_NOEXCEPT; + + using remove_noexcept = Return(BOOST_CLBL_TRTS_CC *)(Args...) + BOOST_CLBL_TRTS_INCLUDE_TRANSACTION_SAFE; + + using add_noexcept = Return(BOOST_CLBL_TRTS_CC *)(Args...) + BOOST_CLBL_TRTS_INCLUDE_TRANSACTION_SAFE + BOOST_CLBL_TRTS_NOEXCEPT_SPECIFIER; + + using is_transaction_safe = BOOST_CLBL_TRTS_IS_TRANSACTION_SAFE; + + using remove_transaction_safe = Return(BOOST_CLBL_TRTS_CC *)(Args...) + BOOST_CLBL_TRTS_NOEXCEPT_SPEC; + + using add_transaction_safe = Return(BOOST_CLBL_TRTS_CC *)(Args...) + BOOST_CLBL_TRTS_TRANSACTION_SAFE_SPECIFIER + BOOST_CLBL_TRTS_NOEXCEPT_SPEC; + + template + using apply_member_pointer = + BOOST_CLBL_TRTS_ST Return(BOOST_CLBL_TRTS_CC U::*)(Args...) + BOOST_CLBL_TRTS_INCLUDE_TRANSACTION_SAFE + BOOST_CLBL_TRTS_NOEXCEPT_SPEC; + + template + using apply_return = + BOOST_CLBL_TRTS_ST NewReturn(BOOST_CLBL_TRTS_CC *)(Args...) + BOOST_CLBL_TRTS_INCLUDE_TRANSACTION_SAFE + BOOST_CLBL_TRTS_NOEXCEPT_SPEC; + + using clear_args = + BOOST_CLBL_TRTS_ST Return(BOOST_CLBL_TRTS_CC *)() + BOOST_CLBL_TRTS_INCLUDE_TRANSACTION_SAFE + BOOST_CLBL_TRTS_NOEXCEPT_SPEC; + + template class Container> + using expand_args = Container; + + template class Container, typename... RightArgs> + using expand_args_left = Container; + + template class Container, typename... LeftArgs> + using expand_args_right = Container; + +#undef BOOST_CLBL_TRTS_BEGIN_PACK_MANIP +#undef BOOST_CLBL_TRTS_ARGS_PACK +#undef BOOST_CLBL_TRTS_END_PACK_MANIP + +#define BOOST_CLBL_TRTS_BEGIN_PACK_MANIP Return(BOOST_CLBL_TRTS_CC *)( + +#define BOOST_CLBL_TRTS_ARGS_PACK Args + +#define BOOST_CLBL_TRTS_END_PACK_MANIP \ + ) BOOST_CLBL_TRTS_INCLUDE_TRANSACTION_SAFE BOOST_CLBL_TRTS_NOEXCEPT_SPEC + +#include +#undef BOOST_CLBL_TRTS_BEGIN_PACK_MANIP +#undef BOOST_CLBL_TRTS_ARGS_PACK +#undef BOOST_CLBL_TRTS_END_PACK_MANIP +}; -#endif // #ifdef CALLABLE_TRAITS_ENABLE_NOEXCEPT_TYPES diff --git a/include/boost/callable_traits/detail/unguarded/function_ptr_3.hpp b/include/boost/callable_traits/detail/unguarded/function_ptr_3.hpp deleted file mode 100644 index 1e3ef32..0000000 --- a/include/boost/callable_traits/detail/unguarded/function_ptr_3.hpp +++ /dev/null @@ -1,119 +0,0 @@ -/* -Copyright (c) 2016 Modified Work Barrett Adair - -Distributed under the Boost Software License, Version 1.0. -(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt) - -HEADER GUARDS INTENTIONALLY OMITTED -DO NOT INCLUDE THIS HEADER DIRECTLY - -macros used: - -CALLABLE_TRAITS_INCLUDE_TRANSACTION_SAFE - the transaction_safe specifier for - the current include (`transaction_safe` or nothing) - -CALLABLE_TRAITS_IS_TRANSACTION_SAFE - `std::true_type` or `std::false_type`, - tied on whether CALLABLE_TRAITS_INCLUDE_TRANSACTION_SAFE is `transaction_safe` - -CALLABLE_TRAITS_TRANSACTION_SAFE_SPECIFIER - `transaction_safe` when - CALLABLE_TRAITS_ENABLE_TRANSACTION_SAFE is enabled, otherwise nothing - -CALLABLE_TRAITS_INCLUDE_NOEXCEPT - the noexcept specifier for - the current include (`noexcept` or nothing) - -CALLABLE_TRAITS_IS_NOEXCEPT - `std::true_type` or `std::false_type`, - tied on whether CALLABLE_TRAITS_INCLUDE_NOEXCEPT is `noexcept` - -CALLABLE_TRAITS_NOEXCEPT_SPECIFIER - `noexcept` if - CALLABLE_TRAITS_ENABLE_NOEXCEPT_TYPES is defined, otherwise nothing -*/ - -template -struct function< - CALLABLE_TRAITS_ST Return(CALLABLE_TRAITS_CC *)(Args...) - CALLABLE_TRAITS_INCLUDE_TRANSACTION_SAFE - CALLABLE_TRAITS_INCLUDE_NOEXCEPT> - : default_callable_traits<> { - - static constexpr bool value = true; - - using traits = function; - - using return_type = Return; - - using arg_types = std::tuple; - using non_invoke_arg_types = arg_types; - - using type = CALLABLE_TRAITS_ST Return(CALLABLE_TRAITS_CC *)(Args...) - CALLABLE_TRAITS_INCLUDE_TRANSACTION_SAFE; - - using function_type = Return(Args...); - using qualified_function_type = function_type; - using remove_varargs = type; - - using add_varargs = - CALLABLE_TRAITS_ST Return (CALLABLE_TRAITS_VARARGS_CC *)(Args..., ...) - CALLABLE_TRAITS_INCLUDE_TRANSACTION_SAFE - CALLABLE_TRAITS_INCLUDE_NOEXCEPT; - - using is_noexcept = CALLABLE_TRAITS_IS_NOEXCEPT; - - using remove_noexcept = Return(CALLABLE_TRAITS_CC *)(Args...) - CALLABLE_TRAITS_INCLUDE_TRANSACTION_SAFE; - - using add_noexcept = Return(CALLABLE_TRAITS_CC *)(Args...) - CALLABLE_TRAITS_INCLUDE_TRANSACTION_SAFE - CALLABLE_TRAITS_NOEXCEPT_SPECIFIER; - - using is_transaction_safe = CALLABLE_TRAITS_IS_TRANSACTION_SAFE; - - using remove_transaction_safe = Return(CALLABLE_TRAITS_CC *)(Args...) - CALLABLE_TRAITS_INCLUDE_NOEXCEPT; - - using add_transaction_safe = Return(CALLABLE_TRAITS_CC *)(Args...) - CALLABLE_TRAITS_TRANSACTION_SAFE_SPECIFIER - CALLABLE_TRAITS_INCLUDE_NOEXCEPT; - - template - using apply_member_pointer = - CALLABLE_TRAITS_ST Return(CALLABLE_TRAITS_CC U::*)(Args...) - CALLABLE_TRAITS_INCLUDE_TRANSACTION_SAFE - CALLABLE_TRAITS_INCLUDE_NOEXCEPT; - - template - using apply_return = - CALLABLE_TRAITS_ST NewReturn(CALLABLE_TRAITS_CC *)(Args...) - CALLABLE_TRAITS_INCLUDE_TRANSACTION_SAFE - CALLABLE_TRAITS_INCLUDE_NOEXCEPT; - - using clear_args = - CALLABLE_TRAITS_ST Return(CALLABLE_TRAITS_CC *)() - CALLABLE_TRAITS_INCLUDE_TRANSACTION_SAFE - CALLABLE_TRAITS_INCLUDE_NOEXCEPT; - - template class Container> - using expand_args = Container; - - template class Container, typename... RightArgs> - using expand_args_left = Container; - - template class Container, typename... LeftArgs> - using expand_args_right = Container; - -#undef CALLABLE_TRAITS_BEGIN_PACK_MANIP -#undef CALLABLE_TRAITS_ARGS_PACK -#undef CALLABLE_TRAITS_END_PACK_MANIP - -#define CALLABLE_TRAITS_BEGIN_PACK_MANIP Return(CALLABLE_TRAITS_CC *)( - -#define CALLABLE_TRAITS_ARGS_PACK Args - -#define CALLABLE_TRAITS_END_PACK_MANIP \ - ) CALLABLE_TRAITS_INCLUDE_TRANSACTION_SAFE CALLABLE_TRAITS_INCLUDE_NOEXCEPT - -#include -#undef CALLABLE_TRAITS_BEGIN_PACK_MANIP -#undef CALLABLE_TRAITS_ARGS_PACK -#undef CALLABLE_TRAITS_END_PACK_MANIP -}; - diff --git a/include/boost/callable_traits/detail/unguarded/function_ptr_varargs.hpp b/include/boost/callable_traits/detail/unguarded/function_ptr_varargs.hpp index 4d3c7bc..7bcd100 100644 --- a/include/boost/callable_traits/detail/unguarded/function_ptr_varargs.hpp +++ b/include/boost/callable_traits/detail/unguarded/function_ptr_varargs.hpp @@ -8,18 +8,18 @@ HEADER GUARDS INTENTIONALLY OMITTED DO NOT INCLUDE THIS HEADER DIRECTLY */ -#define CALLABLE_TRAITS_INCLUDE_TRANSACTION_SAFE -#define CALLABLE_TRAITS_IS_TRANSACTION_SAFE std::false_type +#define BOOST_CLBL_TRTS_INCLUDE_TRANSACTION_SAFE +#define BOOST_CLBL_TRTS_IS_TRANSACTION_SAFE std::false_type #include -#undef CALLABLE_TRAITS_INCLUDE_TRANSACTION_SAFE -#undef CALLABLE_TRAITS_IS_TRANSACTION_SAFE +#undef BOOST_CLBL_TRTS_INCLUDE_TRANSACTION_SAFE +#undef BOOST_CLBL_TRTS_IS_TRANSACTION_SAFE -#ifdef CALLABLE_TRAITS_ENABLE_TRANSACTION_SAFE -#define CALLABLE_TRAITS_IS_TRANSACTION_SAFE std::true_type -#define CALLABLE_TRAITS_INCLUDE_TRANSACTION_SAFE transaction_safe +#ifdef BOOST_CLBL_TRTS_ENABLE_TRANSACTION_SAFE +#define BOOST_CLBL_TRTS_IS_TRANSACTION_SAFE std::true_type +#define BOOST_CLBL_TRTS_INCLUDE_TRANSACTION_SAFE transaction_safe #include #endif -#undef CALLABLE_TRAITS_INCLUDE_TRANSACTION_SAFE -#undef CALLABLE_TRAITS_IS_TRANSACTION_SAFE +#undef BOOST_CLBL_TRTS_INCLUDE_TRANSACTION_SAFE +#undef BOOST_CLBL_TRTS_IS_TRANSACTION_SAFE diff --git a/include/boost/callable_traits/detail/unguarded/function_ptr_varargs_2.hpp b/include/boost/callable_traits/detail/unguarded/function_ptr_varargs_2.hpp index 207945a..38a247b 100644 --- a/include/boost/callable_traits/detail/unguarded/function_ptr_varargs_2.hpp +++ b/include/boost/callable_traits/detail/unguarded/function_ptr_varargs_2.hpp @@ -6,21 +6,116 @@ Distributed under the Boost Software License, Version 1.0. HEADER GUARDS INTENTIONALLY OMITTED DO NOT INCLUDE THIS HEADER DIRECTLY + +macros used: + +BOOST_CLBL_TRTS_INCLUDE_TRANSACTION_SAFE - the transaction_safe specifier for + the current include (`transaction_safe` or nothing) + +BOOST_CLBL_TRTS_IS_TRANSACTION_SAFE - `std::true_type` or `std::false_type`, + tied on whether BOOST_CLBL_TRTS_INCLUDE_TRANSACTION_SAFE is `transaction_safe` + +BOOST_CLBL_TRTS_TRANSACTION_SAFE_SPECIFIER - `transaction_safe` when + BOOST_CLBL_TRTS_ENABLE_TRANSACTION_SAFE is enabled, otherwise nothing + +BOOST_CLBL_TRTS_NOEXCEPT_SPEC - the noexcept specifier for + the current include (`noexcept` or nothing) + +BOOST_CLBL_TRTS_IS_NOEXCEPT - `std::true_type` or `std::false_type`, + tied on whether BOOST_CLBL_TRTS_NOEXCEPT_SPEC is `noexcept` + +BOOST_CLBL_TRTS_NOEXCEPT_SPECIFIER - `noexcept` if + BOOST_CLBL_TRTS_ENABLE_NOEXCEPT_TYPES is defined, otherwise nothing */ -#define CALLABLE_TRAITS_INCLUDE_NOEXCEPT -#define CALLABLE_TRAITS_IS_NOEXCEPT std::false_type -#include +template +struct function + : default_callable_traits<> { -#undef CALLABLE_TRAITS_INCLUDE_NOEXCEPT -#undef CALLABLE_TRAITS_IS_NOEXCEPT + static constexpr bool value = true; -#ifdef CALLABLE_TRAITS_ENABLE_NOEXCEPT_TYPES + using has_varargs = std::true_type; -#define CALLABLE_TRAITS_IS_NOEXCEPT std::true_type -#define CALLABLE_TRAITS_INCLUDE_NOEXCEPT noexcept -#include -#undef CALLABLE_TRAITS_INCLUDE_NOEXCEPT -#undef CALLABLE_TRAITS_IS_NOEXCEPT + using traits = function; + + using return_type = Return; + + using arg_types = std::tuple; + using non_invoke_arg_types = arg_types; + + using type = + BOOST_CLBL_TRTS_ST Return(BOOST_CLBL_TRTS_VARARGS_CC *)(Args..., ...) + BOOST_CLBL_TRTS_INCLUDE_TRANSACTION_SAFE + BOOST_CLBL_TRTS_NOEXCEPT_SPEC; + + using function_type = Return(Args..., ...); + + using qualified_function_type = function_type; + + using remove_varargs = + BOOST_CLBL_TRTS_ST Return(BOOST_CLBL_TRTS_CC *)(Args...) + BOOST_CLBL_TRTS_INCLUDE_TRANSACTION_SAFE; + + using add_varargs = type; + + using is_noexcept = BOOST_CLBL_TRTS_IS_NOEXCEPT; + + using remove_noexcept = BOOST_CLBL_TRTS_ST Return(BOOST_CLBL_TRTS_CC *)(Args..., ...) + BOOST_CLBL_TRTS_INCLUDE_TRANSACTION_SAFE; + + using add_noexcept = BOOST_CLBL_TRTS_ST Return(BOOST_CLBL_TRTS_CC *)(Args..., ...) + BOOST_CLBL_TRTS_INCLUDE_TRANSACTION_SAFE + BOOST_CLBL_TRTS_NOEXCEPT_SPECIFIER; + + using is_transaction_safe = BOOST_CLBL_TRTS_IS_TRANSACTION_SAFE; + + using remove_transaction_safe = Return(BOOST_CLBL_TRTS_VARARGS_CC *)(Args..., ...) + BOOST_CLBL_TRTS_NOEXCEPT_SPEC; + + using add_transaction_safe = Return(BOOST_CLBL_TRTS_VARARGS_CC *)(Args..., ...) + BOOST_CLBL_TRTS_TRANSACTION_SAFE_SPECIFIER + BOOST_CLBL_TRTS_NOEXCEPT_SPEC; + + template + using apply_member_pointer = + BOOST_CLBL_TRTS_ST Return(BOOST_CLBL_TRTS_VARARGS_CC U::*)(Args..., ...) + BOOST_CLBL_TRTS_INCLUDE_TRANSACTION_SAFE + BOOST_CLBL_TRTS_NOEXCEPT_SPEC; + + template + using apply_return = + BOOST_CLBL_TRTS_ST NewReturn(BOOST_CLBL_TRTS_VARARGS_CC *)(Args..., ...) + BOOST_CLBL_TRTS_INCLUDE_TRANSACTION_SAFE + BOOST_CLBL_TRTS_NOEXCEPT_SPEC; + + template class Container> + using expand_args = Container; + + template class Container, typename... RightArgs> + using expand_args_left = Container; + + template class Container, typename... LeftArgs> + using expand_args_right = Container; + + using clear_args = + BOOST_CLBL_TRTS_ST Return(BOOST_CLBL_TRTS_VARARGS_CC *)() + BOOST_CLBL_TRTS_INCLUDE_TRANSACTION_SAFE + BOOST_CLBL_TRTS_NOEXCEPT_SPEC; + +#undef BOOST_CLBL_TRTS_BEGIN_PACK_MANIP +#undef BOOST_CLBL_TRTS_ARGS_PACK +#undef BOOST_CLBL_TRTS_END_PACK_MANIP + +#define BOOST_CLBL_TRTS_BEGIN_PACK_MANIP Return(BOOST_CLBL_TRTS_VARARGS_CC *)( +#define BOOST_CLBL_TRTS_ARGS_PACK Args +#define BOOST_CLBL_TRTS_END_PACK_MANIP \ + , ...) BOOST_CLBL_TRTS_INCLUDE_TRANSACTION_SAFE BOOST_CLBL_TRTS_NOEXCEPT_SPEC + +#include +#undef BOOST_CLBL_TRTS_BEGIN_PACK_MANIP +#undef BOOST_CLBL_TRTS_ARGS_PACK +#undef BOOST_CLBL_TRTS_END_PACK_MANIP +}; -#endif // #ifdef CALLABLE_TRAITS_ENABLE_NOEXCEPT_TYPES diff --git a/include/boost/callable_traits/detail/unguarded/function_ptr_varargs_3.hpp b/include/boost/callable_traits/detail/unguarded/function_ptr_varargs_3.hpp deleted file mode 100644 index 6314097..0000000 --- a/include/boost/callable_traits/detail/unguarded/function_ptr_varargs_3.hpp +++ /dev/null @@ -1,121 +0,0 @@ -/* -Copyright (c) 2016 Modified Work Barrett Adair - -Distributed under the Boost Software License, Version 1.0. -(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt) - -HEADER GUARDS INTENTIONALLY OMITTED -DO NOT INCLUDE THIS HEADER DIRECTLY - -macros used: - -CALLABLE_TRAITS_INCLUDE_TRANSACTION_SAFE - the transaction_safe specifier for - the current include (`transaction_safe` or nothing) - -CALLABLE_TRAITS_IS_TRANSACTION_SAFE - `std::true_type` or `std::false_type`, - tied on whether CALLABLE_TRAITS_INCLUDE_TRANSACTION_SAFE is `transaction_safe` - -CALLABLE_TRAITS_TRANSACTION_SAFE_SPECIFIER - `transaction_safe` when - CALLABLE_TRAITS_ENABLE_TRANSACTION_SAFE is enabled, otherwise nothing - -CALLABLE_TRAITS_INCLUDE_NOEXCEPT - the noexcept specifier for - the current include (`noexcept` or nothing) - -CALLABLE_TRAITS_IS_NOEXCEPT - `std::true_type` or `std::false_type`, - tied on whether CALLABLE_TRAITS_INCLUDE_NOEXCEPT is `noexcept` - -CALLABLE_TRAITS_NOEXCEPT_SPECIFIER - `noexcept` if - CALLABLE_TRAITS_ENABLE_NOEXCEPT_TYPES is defined, otherwise nothing -*/ - -template -struct function - : default_callable_traits<> { - - static constexpr bool value = true; - - using has_varargs = std::true_type; - - using traits = function; - - using return_type = Return; - - using arg_types = std::tuple; - using non_invoke_arg_types = arg_types; - - using type = - CALLABLE_TRAITS_ST Return(CALLABLE_TRAITS_VARARGS_CC *)(Args..., ...) - CALLABLE_TRAITS_INCLUDE_TRANSACTION_SAFE - CALLABLE_TRAITS_INCLUDE_NOEXCEPT; - - using function_type = Return(Args..., ...); - - using qualified_function_type = function_type; - - using remove_varargs = - CALLABLE_TRAITS_ST Return(CALLABLE_TRAITS_CC *)(Args...) - CALLABLE_TRAITS_INCLUDE_TRANSACTION_SAFE; - - using add_varargs = type; - - using is_noexcept = CALLABLE_TRAITS_IS_NOEXCEPT; - - using remove_noexcept = CALLABLE_TRAITS_ST Return(CALLABLE_TRAITS_CC *)(Args..., ...) - CALLABLE_TRAITS_INCLUDE_TRANSACTION_SAFE; - - using add_noexcept = CALLABLE_TRAITS_ST Return(CALLABLE_TRAITS_CC *)(Args..., ...) - CALLABLE_TRAITS_INCLUDE_TRANSACTION_SAFE - CALLABLE_TRAITS_NOEXCEPT_SPECIFIER; - - using is_transaction_safe = CALLABLE_TRAITS_IS_TRANSACTION_SAFE; - - using remove_transaction_safe = Return(CALLABLE_TRAITS_VARARGS_CC *)(Args..., ...) - CALLABLE_TRAITS_INCLUDE_NOEXCEPT; - - using add_transaction_safe = Return(CALLABLE_TRAITS_VARARGS_CC *)(Args..., ...) - CALLABLE_TRAITS_TRANSACTION_SAFE_SPECIFIER - CALLABLE_TRAITS_INCLUDE_NOEXCEPT; - - template - using apply_member_pointer = - CALLABLE_TRAITS_ST Return(CALLABLE_TRAITS_VARARGS_CC U::*)(Args..., ...) - CALLABLE_TRAITS_INCLUDE_TRANSACTION_SAFE - CALLABLE_TRAITS_INCLUDE_NOEXCEPT; - - template - using apply_return = - CALLABLE_TRAITS_ST NewReturn(CALLABLE_TRAITS_VARARGS_CC *)(Args..., ...) - CALLABLE_TRAITS_INCLUDE_TRANSACTION_SAFE - CALLABLE_TRAITS_INCLUDE_NOEXCEPT; - - template class Container> - using expand_args = Container; - - template class Container, typename... RightArgs> - using expand_args_left = Container; - - template class Container, typename... LeftArgs> - using expand_args_right = Container; - - using clear_args = - CALLABLE_TRAITS_ST Return(CALLABLE_TRAITS_VARARGS_CC *)() - CALLABLE_TRAITS_INCLUDE_TRANSACTION_SAFE - CALLABLE_TRAITS_INCLUDE_NOEXCEPT; - -#undef CALLABLE_TRAITS_BEGIN_PACK_MANIP -#undef CALLABLE_TRAITS_ARGS_PACK -#undef CALLABLE_TRAITS_END_PACK_MANIP - -#define CALLABLE_TRAITS_BEGIN_PACK_MANIP Return(CALLABLE_TRAITS_VARARGS_CC *)( -#define CALLABLE_TRAITS_ARGS_PACK Args -#define CALLABLE_TRAITS_END_PACK_MANIP \ - , ...) CALLABLE_TRAITS_INCLUDE_TRANSACTION_SAFE CALLABLE_TRAITS_INCLUDE_NOEXCEPT - -#include -#undef CALLABLE_TRAITS_BEGIN_PACK_MANIP -#undef CALLABLE_TRAITS_ARGS_PACK -#undef CALLABLE_TRAITS_END_PACK_MANIP -}; - diff --git a/include/boost/callable_traits/detail/unguarded/pmf.hpp b/include/boost/callable_traits/detail/unguarded/pmf.hpp index b70549d..07aa24d 100644 --- a/include/boost/callable_traits/detail/unguarded/pmf.hpp +++ b/include/boost/callable_traits/detail/unguarded/pmf.hpp @@ -10,82 +10,85 @@ DO NOT INCLUDE THIS HEADER DIRECTLY */ -#undef CALLABLE_TRAITS_INCLUDE_QUALIFIERS -#undef CALLABLE_TRAITS_INCLUDE_ABOMINABLE_QUALIFIERS +#undef BOOST_CLBL_TRTS_INCLUDE_QUALIFIERS +#undef BOOST_CLBL_TRTS_INCLUDE_ABOMINABLE_QUALIFIERS -#define CALLABLE_TRAITS_INCLUDE_QUALIFIERS -#define CALLABLE_TRAITS_INCLUDE_ABOMINABLE_QUALIFIERS +#define BOOST_CLBL_TRTS_INCLUDE_QUALIFIERS +#define BOOST_CLBL_TRTS_INCLUDE_ABOMINABLE_QUALIFIERS #include -#undef CALLABLE_TRAITS_INCLUDE_QUALIFIERS -#undef CALLABLE_TRAITS_INCLUDE_ABOMINABLE_QUALIFIERS +#undef BOOST_CLBL_TRTS_INCLUDE_QUALIFIERS +#undef BOOST_CLBL_TRTS_INCLUDE_ABOMINABLE_QUALIFIERS -#define CALLABLE_TRAITS_INCLUDE_QUALIFIERS const -#define CALLABLE_TRAITS_INCLUDE_ABOMINABLE_QUALIFIERS CALLABLE_TRAITS_ABOMINABLE_CONST +#define BOOST_CLBL_TRTS_INCLUDE_QUALIFIERS const +#define BOOST_CLBL_TRTS_INCLUDE_ABOMINABLE_QUALIFIERS \ + BOOST_CLBL_TRTS_ABOMINABLE_CONST #include -#undef CALLABLE_TRAITS_INCLUDE_QUALIFIERS -#undef CALLABLE_TRAITS_INCLUDE_ABOMINABLE_QUALIFIERS +#undef BOOST_CLBL_TRTS_INCLUDE_QUALIFIERS +#undef BOOST_CLBL_TRTS_INCLUDE_ABOMINABLE_QUALIFIERS -#define CALLABLE_TRAITS_INCLUDE_QUALIFIERS volatile -#define CALLABLE_TRAITS_INCLUDE_ABOMINABLE_QUALIFIERS CALLABLE_TRAITS_ABOMINABLE_VOLATILE +#define BOOST_CLBL_TRTS_INCLUDE_QUALIFIERS volatile +#define BOOST_CLBL_TRTS_INCLUDE_ABOMINABLE_QUALIFIERS \ + BOOST_CLBL_TRTS_ABOMINABLE_VOLATILE #include -#undef CALLABLE_TRAITS_INCLUDE_QUALIFIERS -#undef CALLABLE_TRAITS_INCLUDE_ABOMINABLE_QUALIFIERS +#undef BOOST_CLBL_TRTS_INCLUDE_QUALIFIERS +#undef BOOST_CLBL_TRTS_INCLUDE_ABOMINABLE_QUALIFIERS -#define CALLABLE_TRAITS_INCLUDE_QUALIFIERS const volatile -#define CALLABLE_TRAITS_INCLUDE_ABOMINABLE_QUALIFIERS CALLABLE_TRAITS_ABOMINABLE_CONST CALLABLE_TRAITS_ABOMINABLE_VOLATILE +#define BOOST_CLBL_TRTS_INCLUDE_QUALIFIERS const volatile +#define BOOST_CLBL_TRTS_INCLUDE_ABOMINABLE_QUALIFIERS \ + BOOST_CLBL_TRTS_ABOMINABLE_CONST BOOST_CLBL_TRTS_ABOMINABLE_VOLATILE #include -#undef CALLABLE_TRAITS_INCLUDE_QUALIFIERS -#undef CALLABLE_TRAITS_INCLUDE_ABOMINABLE_QUALIFIERS +#undef BOOST_CLBL_TRTS_INCLUDE_QUALIFIERS +#undef BOOST_CLBL_TRTS_INCLUDE_ABOMINABLE_QUALIFIERS -#ifndef CALLABLE_TRAITS_DISABLE_REFERENCE_QUALIFIERS +#ifndef BOOST_CLBL_TRTS_DISABLE_REFERENCE_QUALIFIERS -#define CALLABLE_TRAITS_INCLUDE_QUALIFIERS & -#define CALLABLE_TRAITS_INCLUDE_ABOMINABLE_QUALIFIERS & +#define BOOST_CLBL_TRTS_INCLUDE_QUALIFIERS & +#define BOOST_CLBL_TRTS_INCLUDE_ABOMINABLE_QUALIFIERS & #include -#undef CALLABLE_TRAITS_INCLUDE_QUALIFIERS -#undef CALLABLE_TRAITS_INCLUDE_ABOMINABLE_QUALIFIERS +#undef BOOST_CLBL_TRTS_INCLUDE_QUALIFIERS +#undef BOOST_CLBL_TRTS_INCLUDE_ABOMINABLE_QUALIFIERS -#define CALLABLE_TRAITS_INCLUDE_QUALIFIERS && -#define CALLABLE_TRAITS_INCLUDE_ABOMINABLE_QUALIFIERS && +#define BOOST_CLBL_TRTS_INCLUDE_QUALIFIERS && +#define BOOST_CLBL_TRTS_INCLUDE_ABOMINABLE_QUALIFIERS && #include -#undef CALLABLE_TRAITS_INCLUDE_QUALIFIERS -#undef CALLABLE_TRAITS_INCLUDE_ABOMINABLE_QUALIFIERS +#undef BOOST_CLBL_TRTS_INCLUDE_QUALIFIERS +#undef BOOST_CLBL_TRTS_INCLUDE_ABOMINABLE_QUALIFIERS -#define CALLABLE_TRAITS_INCLUDE_QUALIFIERS const & -#define CALLABLE_TRAITS_INCLUDE_ABOMINABLE_QUALIFIERS const & +#define BOOST_CLBL_TRTS_INCLUDE_QUALIFIERS const & +#define BOOST_CLBL_TRTS_INCLUDE_ABOMINABLE_QUALIFIERS const & #include -#undef CALLABLE_TRAITS_INCLUDE_QUALIFIERS -#undef CALLABLE_TRAITS_INCLUDE_ABOMINABLE_QUALIFIERS +#undef BOOST_CLBL_TRTS_INCLUDE_QUALIFIERS +#undef BOOST_CLBL_TRTS_INCLUDE_ABOMINABLE_QUALIFIERS -#define CALLABLE_TRAITS_INCLUDE_QUALIFIERS volatile & -#define CALLABLE_TRAITS_INCLUDE_ABOMINABLE_QUALIFIERS volatile & +#define BOOST_CLBL_TRTS_INCLUDE_QUALIFIERS volatile & +#define BOOST_CLBL_TRTS_INCLUDE_ABOMINABLE_QUALIFIERS volatile & #include -#undef CALLABLE_TRAITS_INCLUDE_QUALIFIERS -#undef CALLABLE_TRAITS_INCLUDE_ABOMINABLE_QUALIFIERS +#undef BOOST_CLBL_TRTS_INCLUDE_QUALIFIERS +#undef BOOST_CLBL_TRTS_INCLUDE_ABOMINABLE_QUALIFIERS -#define CALLABLE_TRAITS_INCLUDE_QUALIFIERS const volatile & -#define CALLABLE_TRAITS_INCLUDE_ABOMINABLE_QUALIFIERS const volatile & +#define BOOST_CLBL_TRTS_INCLUDE_QUALIFIERS const volatile & +#define BOOST_CLBL_TRTS_INCLUDE_ABOMINABLE_QUALIFIERS const volatile & #include -#undef CALLABLE_TRAITS_INCLUDE_QUALIFIERS -#undef CALLABLE_TRAITS_INCLUDE_ABOMINABLE_QUALIFIERS +#undef BOOST_CLBL_TRTS_INCLUDE_QUALIFIERS +#undef BOOST_CLBL_TRTS_INCLUDE_ABOMINABLE_QUALIFIERS -#define CALLABLE_TRAITS_INCLUDE_QUALIFIERS const && -#define CALLABLE_TRAITS_INCLUDE_ABOMINABLE_QUALIFIERS const && +#define BOOST_CLBL_TRTS_INCLUDE_QUALIFIERS const && +#define BOOST_CLBL_TRTS_INCLUDE_ABOMINABLE_QUALIFIERS const && #include -#undef CALLABLE_TRAITS_INCLUDE_QUALIFIERS -#undef CALLABLE_TRAITS_INCLUDE_ABOMINABLE_QUALIFIERS +#undef BOOST_CLBL_TRTS_INCLUDE_QUALIFIERS +#undef BOOST_CLBL_TRTS_INCLUDE_ABOMINABLE_QUALIFIERS -#define CALLABLE_TRAITS_INCLUDE_QUALIFIERS volatile && -#define CALLABLE_TRAITS_INCLUDE_ABOMINABLE_QUALIFIERS volatile && +#define BOOST_CLBL_TRTS_INCLUDE_QUALIFIERS volatile && +#define BOOST_CLBL_TRTS_INCLUDE_ABOMINABLE_QUALIFIERS volatile && #include -#undef CALLABLE_TRAITS_INCLUDE_QUALIFIERS -#undef CALLABLE_TRAITS_INCLUDE_ABOMINABLE_QUALIFIERS +#undef BOOST_CLBL_TRTS_INCLUDE_QUALIFIERS +#undef BOOST_CLBL_TRTS_INCLUDE_ABOMINABLE_QUALIFIERS -#define CALLABLE_TRAITS_INCLUDE_QUALIFIERS const volatile && -#define CALLABLE_TRAITS_INCLUDE_ABOMINABLE_QUALIFIERS const volatile && +#define BOOST_CLBL_TRTS_INCLUDE_QUALIFIERS const volatile && +#define BOOST_CLBL_TRTS_INCLUDE_ABOMINABLE_QUALIFIERS const volatile && #include -#undef CALLABLE_TRAITS_INCLUDE_QUALIFIERS -#undef CALLABLE_TRAITS_INCLUDE_ABOMINABLE_QUALIFIERS +#undef BOOST_CLBL_TRTS_INCLUDE_QUALIFIERS +#undef BOOST_CLBL_TRTS_INCLUDE_ABOMINABLE_QUALIFIERS -#endif //#ifndef CALLABLE_TRAITS_DISABLE_REFERENCE_QUALIFIERS +#endif //#ifndef BOOST_CLBL_TRTS_DISABLE_REFERENCE_QUALIFIERS diff --git a/include/boost/callable_traits/detail/unguarded/pmf_2.hpp b/include/boost/callable_traits/detail/unguarded/pmf_2.hpp index 6d45701..e3568fb 100644 --- a/include/boost/callable_traits/detail/unguarded/pmf_2.hpp +++ b/include/boost/callable_traits/detail/unguarded/pmf_2.hpp @@ -11,64 +11,64 @@ DO NOT INCLUDE THIS HEADER DIRECTLY template struct set_member_function_qualifiers_t< - flag_map::value, + flag_map::value, false, // IsTransactionSafe false, // IsNoexcept - CALLABLE_TRAITS_CC_TAG, T, Return, Args...> { + BOOST_CLBL_TRTS_CC_TAG, T, Return, Args...> { - using type = Return(CALLABLE_TRAITS_CC T::*)(Args...) - CALLABLE_TRAITS_INCLUDE_QUALIFIERS; + using type = Return(BOOST_CLBL_TRTS_CC T::*)(Args...) + BOOST_CLBL_TRTS_INCLUDE_QUALIFIERS; }; template struct set_member_function_qualifiers_t< - flag_map::value, + flag_map::value, false, true, - CALLABLE_TRAITS_CC_TAG, T, Return, Args...> { + BOOST_CLBL_TRTS_CC_TAG, T, Return, Args...> { - using type = Return(CALLABLE_TRAITS_CC T::*)(Args...) - CALLABLE_TRAITS_INCLUDE_QUALIFIERS - CALLABLE_TRAITS_NOEXCEPT_SPECIFIER; + using type = Return(BOOST_CLBL_TRTS_CC T::*)(Args...) + BOOST_CLBL_TRTS_INCLUDE_QUALIFIERS + BOOST_CLBL_TRTS_NOEXCEPT_SPECIFIER; }; template struct set_member_function_qualifiers_t< - flag_map::value, + flag_map::value, true, false, - CALLABLE_TRAITS_CC_TAG, T, Return, Args...> { + BOOST_CLBL_TRTS_CC_TAG, T, Return, Args...> { - using type = Return(CALLABLE_TRAITS_CC T::*)(Args...) - CALLABLE_TRAITS_INCLUDE_QUALIFIERS - CALLABLE_TRAITS_TRANSACTION_SAFE_SPECIFIER; + using type = Return(BOOST_CLBL_TRTS_CC T::*)(Args...) + BOOST_CLBL_TRTS_INCLUDE_QUALIFIERS + BOOST_CLBL_TRTS_TRANSACTION_SAFE_SPECIFIER; }; template struct set_member_function_qualifiers_t< - flag_map::value, + flag_map::value, true, true, - CALLABLE_TRAITS_CC_TAG, T, Return, Args...> { + BOOST_CLBL_TRTS_CC_TAG, T, Return, Args...> { - using type = Return(CALLABLE_TRAITS_CC T::*)(Args...) - CALLABLE_TRAITS_INCLUDE_QUALIFIERS - CALLABLE_TRAITS_TRANSACTION_SAFE_SPECIFIER - CALLABLE_TRAITS_NOEXCEPT_SPECIFIER; + using type = Return(BOOST_CLBL_TRTS_CC T::*)(Args...) + BOOST_CLBL_TRTS_INCLUDE_QUALIFIERS + BOOST_CLBL_TRTS_TRANSACTION_SAFE_SPECIFIER + BOOST_CLBL_TRTS_NOEXCEPT_SPECIFIER; }; -#define CALLABLE_TRAITS_INCLUDE_TRANSACTION_SAFE -#define CALLABLE_TRAITS_IS_TRANSACTION_SAFE std::false_type +#define BOOST_CLBL_TRTS_INCLUDE_TRANSACTION_SAFE +#define BOOST_CLBL_TRTS_IS_TRANSACTION_SAFE std::false_type #include -#undef CALLABLE_TRAITS_INCLUDE_TRANSACTION_SAFE -#undef CALLABLE_TRAITS_IS_TRANSACTION_SAFE +#undef BOOST_CLBL_TRTS_INCLUDE_TRANSACTION_SAFE +#undef BOOST_CLBL_TRTS_IS_TRANSACTION_SAFE -#ifdef CALLABLE_TRAITS_ENABLE_TRANSACTION_SAFE +#ifdef BOOST_CLBL_TRTS_ENABLE_TRANSACTION_SAFE -#define CALLABLE_TRAITS_IS_TRANSACTION_SAFE std::true_type -#define CALLABLE_TRAITS_INCLUDE_TRANSACTION_SAFE transaction_safe +#define BOOST_CLBL_TRTS_IS_TRANSACTION_SAFE std::true_type +#define BOOST_CLBL_TRTS_INCLUDE_TRANSACTION_SAFE transaction_safe #include -#undef CALLABLE_TRAITS_INCLUDE_TRANSACTION_SAFE -#undef CALLABLE_TRAITS_IS_TRANSACTION_SAFE +#undef BOOST_CLBL_TRTS_INCLUDE_TRANSACTION_SAFE +#undef BOOST_CLBL_TRTS_IS_TRANSACTION_SAFE #endif diff --git a/include/boost/callable_traits/detail/unguarded/pmf_3.hpp b/include/boost/callable_traits/detail/unguarded/pmf_3.hpp index b0810e9..1627951 100644 --- a/include/boost/callable_traits/detail/unguarded/pmf_3.hpp +++ b/include/boost/callable_traits/detail/unguarded/pmf_3.hpp @@ -7,21 +7,166 @@ Distributed under the Boost Software License, Version 1.0. HEADER GUARDS INTENTIONALLY OMITTED DO NOT INCLUDE THIS HEADER DIRECTLY +BOOST_CLBL_TRTS_INCLUDE_QUALIFIERS - the function-level qualifiers for the + current inclusion (combinations of `const` `volatile` `&` `&&`, or nothing) + +BOOST_CLBL_TRTS_INCLUDE_TRANSACTION_SAFE - the transaction_safe specifier for + the current include (`transaction_safe` or nothing) + +BOOST_CLBL_TRTS_IS_TRANSACTION_SAFE - `std::true_type` or `std::false_type`, + tied on whether BOOST_CLBL_TRTS_INCLUDE_TRANSACTION_SAFE is `transaction_safe` + +BOOST_CLBL_TRTS_TRANSACTION_SAFE_SPECIFIER - `transaction_safe` when + BOOST_CLBL_TRTS_ENABLE_TRANSACTION_SAFE is defined, otherwise nothing + +BOOST_CLBL_TRTS_NOEXCEPT_SPEC - the noexcept specifier for + the current include (`noexcept` or nothing) + +BOOST_CLBL_TRTS_IS_NOEXCEPT - `std::true_type` or `std::false_type`, + tied on whether BOOST_CLBL_TRTS_NOEXCEPT_SPEC is `noexcept` + +BOOST_CLBL_TRTS_NOEXCEPT_SPECIFIER - `noexcept` if + BOOST_CLBL_TRTS_ENABLE_NOEXCEPT_TYPES is defined, otherwise nothing */ -#define CALLABLE_TRAITS_INCLUDE_NOEXCEPT -#define CALLABLE_TRAITS_IS_NOEXCEPT std::false_type -#include -#undef CALLABLE_TRAITS_INCLUDE_NOEXCEPT -#undef CALLABLE_TRAITS_IS_NOEXCEPT +template +struct pmf + : default_callable_traits { + + static constexpr bool value = true; + + using traits = pmf; + using return_type = Return; -#ifdef CALLABLE_TRAITS_ENABLE_NOEXCEPT_TYPES + using type = Return(BOOST_CLBL_TRTS_CC T::*)(Args...) + BOOST_CLBL_TRTS_INCLUDE_QUALIFIERS + BOOST_CLBL_TRTS_INCLUDE_TRANSACTION_SAFE + BOOST_CLBL_TRTS_NOEXCEPT_SPEC; -#define CALLABLE_TRAITS_IS_NOEXCEPT std::true_type -#define CALLABLE_TRAITS_INCLUDE_NOEXCEPT noexcept -#include -#undef CALLABLE_TRAITS_IS_NOEXCEPT -#undef CALLABLE_TRAITS_INCLUDE_NOEXCEPT + using invoke_type = typename std::conditional< + std::is_rvalue_reference::value, + T BOOST_CLBL_TRTS_INCLUDE_QUALIFIERS, + typename std::add_lvalue_reference::type + >::type; + + using arg_types = std::tuple; + using non_invoke_arg_types = std::tuple; -#endif // #ifdef CALLABLE_TRAITS_ENABLE_NOEXCEPT_TYPES + using function_object_signature = Return(Args...); + + using function_type = Return(invoke_type, Args...); + + using qualified_function_type = Return(Args...) + BOOST_CLBL_TRTS_INCLUDE_ABOMINABLE_QUALIFIERS + BOOST_CLBL_TRTS_INCLUDE_TRANSACTION_SAFE + BOOST_CLBL_TRTS_NOEXCEPT_SPEC; + + using remove_varargs = type; + + using add_varargs = + Return(BOOST_CLBL_TRTS_VARARGS_CC T::*)(Args..., ...) + BOOST_CLBL_TRTS_INCLUDE_QUALIFIERS + BOOST_CLBL_TRTS_INCLUDE_TRANSACTION_SAFE + BOOST_CLBL_TRTS_NOEXCEPT_SPEC; + + using is_noexcept = BOOST_CLBL_TRTS_IS_NOEXCEPT; + + using remove_noexcept = Return(BOOST_CLBL_TRTS_CC T::*)(Args...) + BOOST_CLBL_TRTS_INCLUDE_QUALIFIERS + BOOST_CLBL_TRTS_INCLUDE_TRANSACTION_SAFE; + + using add_noexcept = Return(BOOST_CLBL_TRTS_CC T::*)(Args...) + BOOST_CLBL_TRTS_INCLUDE_QUALIFIERS + BOOST_CLBL_TRTS_INCLUDE_TRANSACTION_SAFE + BOOST_CLBL_TRTS_NOEXCEPT_SPECIFIER; + + using is_transaction_safe = BOOST_CLBL_TRTS_IS_TRANSACTION_SAFE; + + using remove_transaction_safe = Return(BOOST_CLBL_TRTS_CC T::*)(Args...) + BOOST_CLBL_TRTS_INCLUDE_QUALIFIERS + BOOST_CLBL_TRTS_NOEXCEPT_SPEC; + + using add_transaction_safe = Return(BOOST_CLBL_TRTS_CC T::*)(Args...) + BOOST_CLBL_TRTS_INCLUDE_QUALIFIERS + BOOST_CLBL_TRTS_TRANSACTION_SAFE_SPECIFIER + BOOST_CLBL_TRTS_NOEXCEPT_SPEC; + + using class_type = T; + + using qualifiers = default_callable_traits; + + template + using set_qualifiers = set_member_function_qualifiers< + Flags, is_transaction_safe::value, is_noexcept::value, + BOOST_CLBL_TRTS_CC_TAG, T, Return, Args...>; + + using remove_member_reference = set_qualifiers; + + using add_member_lvalue_reference = set_qualifiers< + collapse_flags::value>; + + using add_member_rvalue_reference = set_qualifiers< + collapse_flags::value>; + + using add_member_const = set_qualifiers; + + using add_member_volatile = set_qualifiers; + + using add_member_cv = set_qualifiers; + + using remove_member_const = set_qualifiers< + qualifiers::ref_flags | remove_const_flag::value>; + + using remove_member_volatile = set_qualifiers< + qualifiers::ref_flags | remove_volatile_flag::value>; + + using remove_member_cv = set_qualifiers; + + template + using apply_member_pointer = + Return(BOOST_CLBL_TRTS_CC U::*)(Args...) + BOOST_CLBL_TRTS_INCLUDE_QUALIFIERS + BOOST_CLBL_TRTS_INCLUDE_TRANSACTION_SAFE + BOOST_CLBL_TRTS_NOEXCEPT_SPEC; + + template + using apply_return = + NewReturn(BOOST_CLBL_TRTS_CC T::*)(Args...) + BOOST_CLBL_TRTS_INCLUDE_QUALIFIERS + BOOST_CLBL_TRTS_INCLUDE_TRANSACTION_SAFE + BOOST_CLBL_TRTS_NOEXCEPT_SPEC; + + template class Container> + using expand_args = Container; + + template class Container, typename... RightArgs> + using expand_args_left = Container; + + template class Container, typename... LeftArgs> + using expand_args_right = Container; + + using clear_args = + Return(BOOST_CLBL_TRTS_CC T::*)() + BOOST_CLBL_TRTS_INCLUDE_QUALIFIERS + BOOST_CLBL_TRTS_INCLUDE_TRANSACTION_SAFE + BOOST_CLBL_TRTS_NOEXCEPT_SPEC; + +#undef BOOST_CLBL_TRTS_BEGIN_PACK_MANIP +#undef BOOST_CLBL_TRTS_ARGS_PACK +#undef BOOST_CLBL_TRTS_END_PACK_MANIP + +#define BOOST_CLBL_TRTS_BEGIN_PACK_MANIP Return( BOOST_CLBL_TRTS_CC T::*)( +#define BOOST_CLBL_TRTS_ARGS_PACK Args +#define BOOST_CLBL_TRTS_END_PACK_MANIP \ + ) BOOST_CLBL_TRTS_INCLUDE_QUALIFIERS BOOST_CLBL_TRTS_INCLUDE_TRANSACTION_SAFE BOOST_CLBL_TRTS_NOEXCEPT_SPEC + +#include +#undef BOOST_CLBL_TRTS_BEGIN_PACK_MANIP +#undef BOOST_CLBL_TRTS_ARGS_PACK +#undef BOOST_CLBL_TRTS_END_PACK_MANIP + +}; diff --git a/include/boost/callable_traits/detail/unguarded/pmf_4.hpp b/include/boost/callable_traits/detail/unguarded/pmf_4.hpp deleted file mode 100644 index 920686b..0000000 --- a/include/boost/callable_traits/detail/unguarded/pmf_4.hpp +++ /dev/null @@ -1,172 +0,0 @@ -/* -Copyright (c) 2016 Barrett Adair - -Distributed under the Boost Software License, Version 1.0. -(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt) - -HEADER GUARDS INTENTIONALLY OMITTED -DO NOT INCLUDE THIS HEADER DIRECTLY - -CALLABLE_TRAITS_INCLUDE_QUALIFIERS - the function-level qualifiers for the - current inclusion (combinations of `const` `volatile` `&` `&&`, or nothing) - -CALLABLE_TRAITS_INCLUDE_TRANSACTION_SAFE - the transaction_safe specifier for - the current include (`transaction_safe` or nothing) - -CALLABLE_TRAITS_IS_TRANSACTION_SAFE - `std::true_type` or `std::false_type`, - tied on whether CALLABLE_TRAITS_INCLUDE_TRANSACTION_SAFE is `transaction_safe` - -CALLABLE_TRAITS_TRANSACTION_SAFE_SPECIFIER - `transaction_safe` when - CALLABLE_TRAITS_ENABLE_TRANSACTION_SAFE is defined, otherwise nothing - -CALLABLE_TRAITS_INCLUDE_NOEXCEPT - the noexcept specifier for - the current include (`noexcept` or nothing) - -CALLABLE_TRAITS_IS_NOEXCEPT - `std::true_type` or `std::false_type`, - tied on whether CALLABLE_TRAITS_INCLUDE_NOEXCEPT is `noexcept` - -CALLABLE_TRAITS_NOEXCEPT_SPECIFIER - `noexcept` if - CALLABLE_TRAITS_ENABLE_NOEXCEPT_TYPES is defined, otherwise nothing -*/ - -template -struct pmf - : default_callable_traits { - - static constexpr bool value = true; - - using traits = pmf; - - using return_type = Return; - - using type = Return(CALLABLE_TRAITS_CC T::*)(Args...) - CALLABLE_TRAITS_INCLUDE_QUALIFIERS - CALLABLE_TRAITS_INCLUDE_TRANSACTION_SAFE - CALLABLE_TRAITS_INCLUDE_NOEXCEPT; - - using invoke_type = typename std::conditional< - std::is_rvalue_reference::value, - T CALLABLE_TRAITS_INCLUDE_QUALIFIERS, - typename std::add_lvalue_reference::type - >::type; - - using arg_types = std::tuple; - using non_invoke_arg_types = std::tuple; - - using function_object_signature = Return(Args...); - - using function_type = Return(invoke_type, Args...); - - using qualified_function_type = Return(Args...) - CALLABLE_TRAITS_INCLUDE_ABOMINABLE_QUALIFIERS - CALLABLE_TRAITS_INCLUDE_TRANSACTION_SAFE - CALLABLE_TRAITS_INCLUDE_NOEXCEPT; - - using remove_varargs = type; - - using add_varargs = - Return(CALLABLE_TRAITS_VARARGS_CC T::*)(Args..., ...) - CALLABLE_TRAITS_INCLUDE_QUALIFIERS - CALLABLE_TRAITS_INCLUDE_TRANSACTION_SAFE - CALLABLE_TRAITS_INCLUDE_NOEXCEPT; - - using is_noexcept = CALLABLE_TRAITS_IS_NOEXCEPT; - - using remove_noexcept = Return(CALLABLE_TRAITS_CC T::*)(Args...) - CALLABLE_TRAITS_INCLUDE_QUALIFIERS - CALLABLE_TRAITS_INCLUDE_TRANSACTION_SAFE; - - using add_noexcept = Return(CALLABLE_TRAITS_CC T::*)(Args...) - CALLABLE_TRAITS_INCLUDE_QUALIFIERS - CALLABLE_TRAITS_INCLUDE_TRANSACTION_SAFE - CALLABLE_TRAITS_NOEXCEPT_SPECIFIER; - - using is_transaction_safe = CALLABLE_TRAITS_IS_TRANSACTION_SAFE; - - using remove_transaction_safe = Return(CALLABLE_TRAITS_CC T::*)(Args...) - CALLABLE_TRAITS_INCLUDE_QUALIFIERS - CALLABLE_TRAITS_INCLUDE_NOEXCEPT; - - using add_transaction_safe = Return(CALLABLE_TRAITS_CC T::*)(Args...) - CALLABLE_TRAITS_INCLUDE_QUALIFIERS - CALLABLE_TRAITS_TRANSACTION_SAFE_SPECIFIER - CALLABLE_TRAITS_INCLUDE_NOEXCEPT; - - using class_type = T; - - using qualifiers = default_callable_traits; - - template - using set_qualifiers = set_member_function_qualifiers< - Flags, is_transaction_safe::value, is_noexcept::value, - CALLABLE_TRAITS_CC_TAG, T, Return, Args...>; - - using remove_member_reference = set_qualifiers; - - using add_member_lvalue_reference = set_qualifiers< - collapse_flags::value>; - - using add_member_rvalue_reference = set_qualifiers< - collapse_flags::value>; - - using add_member_const = set_qualifiers; - - using add_member_volatile = set_qualifiers; - - using add_member_cv = set_qualifiers; - - using remove_member_const = set_qualifiers< - qualifiers::ref_flags | remove_const_flag::value>; - - using remove_member_volatile = set_qualifiers< - qualifiers::ref_flags | remove_volatile_flag::value>; - - using remove_member_cv = set_qualifiers; - - template - using apply_member_pointer = - Return(CALLABLE_TRAITS_CC U::*)(Args...) - CALLABLE_TRAITS_INCLUDE_QUALIFIERS - CALLABLE_TRAITS_INCLUDE_TRANSACTION_SAFE - CALLABLE_TRAITS_INCLUDE_NOEXCEPT; - - template - using apply_return = - NewReturn(CALLABLE_TRAITS_CC T::*)(Args...) - CALLABLE_TRAITS_INCLUDE_QUALIFIERS - CALLABLE_TRAITS_INCLUDE_TRANSACTION_SAFE - CALLABLE_TRAITS_INCLUDE_NOEXCEPT; - - template class Container> - using expand_args = Container; - - template class Container, typename... RightArgs> - using expand_args_left = Container; - - template class Container, typename... LeftArgs> - using expand_args_right = Container; - - using clear_args = - Return(CALLABLE_TRAITS_CC T::*)() - CALLABLE_TRAITS_INCLUDE_QUALIFIERS - CALLABLE_TRAITS_INCLUDE_TRANSACTION_SAFE - CALLABLE_TRAITS_INCLUDE_NOEXCEPT; - -#undef CALLABLE_TRAITS_BEGIN_PACK_MANIP -#undef CALLABLE_TRAITS_ARGS_PACK -#undef CALLABLE_TRAITS_END_PACK_MANIP - -#define CALLABLE_TRAITS_BEGIN_PACK_MANIP Return( CALLABLE_TRAITS_CC T::*)( -#define CALLABLE_TRAITS_ARGS_PACK Args -#define CALLABLE_TRAITS_END_PACK_MANIP \ - ) CALLABLE_TRAITS_INCLUDE_QUALIFIERS CALLABLE_TRAITS_INCLUDE_TRANSACTION_SAFE CALLABLE_TRAITS_INCLUDE_NOEXCEPT - -#include -#undef CALLABLE_TRAITS_BEGIN_PACK_MANIP -#undef CALLABLE_TRAITS_ARGS_PACK -#undef CALLABLE_TRAITS_END_PACK_MANIP - -}; diff --git a/include/boost/callable_traits/detail/unguarded/pmf_varargs.hpp b/include/boost/callable_traits/detail/unguarded/pmf_varargs.hpp index f6d89ba..668cfd9 100644 --- a/include/boost/callable_traits/detail/unguarded/pmf_varargs.hpp +++ b/include/boost/callable_traits/detail/unguarded/pmf_varargs.hpp @@ -9,78 +9,81 @@ DO NOT INCLUDE THIS HEADER DIRECTLY */ -#define CALLABLE_TRAITS_INCLUDE_QUALIFIERS -#define CALLABLE_TRAITS_INCLUDE_ABOMINABLE_QUALIFIERS +#define BOOST_CLBL_TRTS_INCLUDE_QUALIFIERS +#define BOOST_CLBL_TRTS_INCLUDE_ABOMINABLE_QUALIFIERS #include -#undef CALLABLE_TRAITS_INCLUDE_QUALIFIERS -#undef CALLABLE_TRAITS_INCLUDE_ABOMINABLE_QUALIFIERS +#undef BOOST_CLBL_TRTS_INCLUDE_QUALIFIERS +#undef BOOST_CLBL_TRTS_INCLUDE_ABOMINABLE_QUALIFIERS -#define CALLABLE_TRAITS_INCLUDE_QUALIFIERS const -#define CALLABLE_TRAITS_INCLUDE_ABOMINABLE_QUALIFIERS CALLABLE_TRAITS_ABOMINABLE_CONST +#define BOOST_CLBL_TRTS_INCLUDE_QUALIFIERS const +#define BOOST_CLBL_TRTS_INCLUDE_ABOMINABLE_QUALIFIERS \ + BOOST_CLBL_TRTS_ABOMINABLE_CONST #include -#undef CALLABLE_TRAITS_INCLUDE_QUALIFIERS -#undef CALLABLE_TRAITS_INCLUDE_ABOMINABLE_QUALIFIERS +#undef BOOST_CLBL_TRTS_INCLUDE_QUALIFIERS +#undef BOOST_CLBL_TRTS_INCLUDE_ABOMINABLE_QUALIFIERS -#define CALLABLE_TRAITS_INCLUDE_QUALIFIERS volatile -#define CALLABLE_TRAITS_INCLUDE_ABOMINABLE_QUALIFIERS CALLABLE_TRAITS_ABOMINABLE_VOLATILE +#define BOOST_CLBL_TRTS_INCLUDE_QUALIFIERS volatile +#define BOOST_CLBL_TRTS_INCLUDE_ABOMINABLE_QUALIFIERS \ + BOOST_CLBL_TRTS_ABOMINABLE_VOLATILE #include -#undef CALLABLE_TRAITS_INCLUDE_QUALIFIERS -#undef CALLABLE_TRAITS_INCLUDE_ABOMINABLE_QUALIFIERS +#undef BOOST_CLBL_TRTS_INCLUDE_QUALIFIERS +#undef BOOST_CLBL_TRTS_INCLUDE_ABOMINABLE_QUALIFIERS -#define CALLABLE_TRAITS_INCLUDE_QUALIFIERS const volatile -#define CALLABLE_TRAITS_INCLUDE_ABOMINABLE_QUALIFIERS CALLABLE_TRAITS_ABOMINABLE_CONST CALLABLE_TRAITS_ABOMINABLE_VOLATILE +#define BOOST_CLBL_TRTS_INCLUDE_QUALIFIERS const volatile +#define BOOST_CLBL_TRTS_INCLUDE_ABOMINABLE_QUALIFIERS \ + BOOST_CLBL_TRTS_ABOMINABLE_CONST BOOST_CLBL_TRTS_ABOMINABLE_VOLATILE #include -#undef CALLABLE_TRAITS_INCLUDE_QUALIFIERS -#undef CALLABLE_TRAITS_INCLUDE_ABOMINABLE_QUALIFIERS +#undef BOOST_CLBL_TRTS_INCLUDE_QUALIFIERS +#undef BOOST_CLBL_TRTS_INCLUDE_ABOMINABLE_QUALIFIERS -#ifndef CALLABLE_TRAITS_DISABLE_REFERENCE_QUALIFIERS +#ifndef BOOST_CLBL_TRTS_DISABLE_REFERENCE_QUALIFIERS -#define CALLABLE_TRAITS_INCLUDE_QUALIFIERS & -#define CALLABLE_TRAITS_INCLUDE_ABOMINABLE_QUALIFIERS & +#define BOOST_CLBL_TRTS_INCLUDE_QUALIFIERS & +#define BOOST_CLBL_TRTS_INCLUDE_ABOMINABLE_QUALIFIERS & #include -#undef CALLABLE_TRAITS_INCLUDE_QUALIFIERS -#undef CALLABLE_TRAITS_INCLUDE_ABOMINABLE_QUALIFIERS +#undef BOOST_CLBL_TRTS_INCLUDE_QUALIFIERS +#undef BOOST_CLBL_TRTS_INCLUDE_ABOMINABLE_QUALIFIERS -#define CALLABLE_TRAITS_INCLUDE_QUALIFIERS && -#define CALLABLE_TRAITS_INCLUDE_ABOMINABLE_QUALIFIERS && +#define BOOST_CLBL_TRTS_INCLUDE_QUALIFIERS && +#define BOOST_CLBL_TRTS_INCLUDE_ABOMINABLE_QUALIFIERS && #include -#undef CALLABLE_TRAITS_INCLUDE_QUALIFIERS -#undef CALLABLE_TRAITS_INCLUDE_ABOMINABLE_QUALIFIERS +#undef BOOST_CLBL_TRTS_INCLUDE_QUALIFIERS +#undef BOOST_CLBL_TRTS_INCLUDE_ABOMINABLE_QUALIFIERS -#define CALLABLE_TRAITS_INCLUDE_QUALIFIERS const & -#define CALLABLE_TRAITS_INCLUDE_ABOMINABLE_QUALIFIERS const & +#define BOOST_CLBL_TRTS_INCLUDE_QUALIFIERS const & +#define BOOST_CLBL_TRTS_INCLUDE_ABOMINABLE_QUALIFIERS const & #include -#undef CALLABLE_TRAITS_INCLUDE_QUALIFIERS -#undef CALLABLE_TRAITS_INCLUDE_ABOMINABLE_QUALIFIERS +#undef BOOST_CLBL_TRTS_INCLUDE_QUALIFIERS +#undef BOOST_CLBL_TRTS_INCLUDE_ABOMINABLE_QUALIFIERS -#define CALLABLE_TRAITS_INCLUDE_QUALIFIERS volatile & -#define CALLABLE_TRAITS_INCLUDE_ABOMINABLE_QUALIFIERS volatile & +#define BOOST_CLBL_TRTS_INCLUDE_QUALIFIERS volatile & +#define BOOST_CLBL_TRTS_INCLUDE_ABOMINABLE_QUALIFIERS volatile & #include -#undef CALLABLE_TRAITS_INCLUDE_QUALIFIERS -#undef CALLABLE_TRAITS_INCLUDE_ABOMINABLE_QUALIFIERS +#undef BOOST_CLBL_TRTS_INCLUDE_QUALIFIERS +#undef BOOST_CLBL_TRTS_INCLUDE_ABOMINABLE_QUALIFIERS -#define CALLABLE_TRAITS_INCLUDE_QUALIFIERS const volatile & -#define CALLABLE_TRAITS_INCLUDE_ABOMINABLE_QUALIFIERS const volatile & +#define BOOST_CLBL_TRTS_INCLUDE_QUALIFIERS const volatile & +#define BOOST_CLBL_TRTS_INCLUDE_ABOMINABLE_QUALIFIERS const volatile & #include -#undef CALLABLE_TRAITS_INCLUDE_QUALIFIERS -#undef CALLABLE_TRAITS_INCLUDE_ABOMINABLE_QUALIFIERS +#undef BOOST_CLBL_TRTS_INCLUDE_QUALIFIERS +#undef BOOST_CLBL_TRTS_INCLUDE_ABOMINABLE_QUALIFIERS -#define CALLABLE_TRAITS_INCLUDE_QUALIFIERS const && -#define CALLABLE_TRAITS_INCLUDE_ABOMINABLE_QUALIFIERS const && +#define BOOST_CLBL_TRTS_INCLUDE_QUALIFIERS const && +#define BOOST_CLBL_TRTS_INCLUDE_ABOMINABLE_QUALIFIERS const && #include -#undef CALLABLE_TRAITS_INCLUDE_QUALIFIERS -#undef CALLABLE_TRAITS_INCLUDE_ABOMINABLE_QUALIFIERS +#undef BOOST_CLBL_TRTS_INCLUDE_QUALIFIERS +#undef BOOST_CLBL_TRTS_INCLUDE_ABOMINABLE_QUALIFIERS -#define CALLABLE_TRAITS_INCLUDE_QUALIFIERS volatile && -#define CALLABLE_TRAITS_INCLUDE_ABOMINABLE_QUALIFIERS volatile && +#define BOOST_CLBL_TRTS_INCLUDE_QUALIFIERS volatile && +#define BOOST_CLBL_TRTS_INCLUDE_ABOMINABLE_QUALIFIERS volatile && #include -#undef CALLABLE_TRAITS_INCLUDE_QUALIFIERS -#undef CALLABLE_TRAITS_INCLUDE_ABOMINABLE_QUALIFIERS +#undef BOOST_CLBL_TRTS_INCLUDE_QUALIFIERS +#undef BOOST_CLBL_TRTS_INCLUDE_ABOMINABLE_QUALIFIERS -#define CALLABLE_TRAITS_INCLUDE_QUALIFIERS const volatile && -#define CALLABLE_TRAITS_INCLUDE_ABOMINABLE_QUALIFIERS const volatile && +#define BOOST_CLBL_TRTS_INCLUDE_QUALIFIERS const volatile && +#define BOOST_CLBL_TRTS_INCLUDE_ABOMINABLE_QUALIFIERS const volatile && #include -#undef CALLABLE_TRAITS_INCLUDE_QUALIFIERS -#undef CALLABLE_TRAITS_INCLUDE_ABOMINABLE_QUALIFIERS +#undef BOOST_CLBL_TRTS_INCLUDE_QUALIFIERS +#undef BOOST_CLBL_TRTS_INCLUDE_ABOMINABLE_QUALIFIERS -#endif //#ifndef CALLABLE_TRAITS_DISABLE_REFERENCE_QUALIFIERS \ No newline at end of file +#endif //#ifndef BOOST_CLBL_TRTS_DISABLE_REFERENCE_QUALIFIERS \ No newline at end of file diff --git a/include/boost/callable_traits/detail/unguarded/pmf_varargs_2.hpp b/include/boost/callable_traits/detail/unguarded/pmf_varargs_2.hpp index 4a8499c..5de0668 100644 --- a/include/boost/callable_traits/detail/unguarded/pmf_varargs_2.hpp +++ b/include/boost/callable_traits/detail/unguarded/pmf_varargs_2.hpp @@ -11,65 +11,68 @@ DO NOT INCLUDE THIS HEADER DIRECTLY template struct set_varargs_member_function_qualifiers_t < - flag_map::value, + flag_map::value, false, // IsTransactionSafe false, // IsNoexcept - CALLABLE_TRAITS_CC_TAG, T, Return, Args...> { + BOOST_CLBL_TRTS_CC_TAG, T, Return, Args...> { using type = - Return(CALLABLE_TRAITS_VARARGS_CC T::*)(Args..., ...) CALLABLE_TRAITS_INCLUDE_QUALIFIERS; + Return(BOOST_CLBL_TRTS_VARARGS_CC T::*)(Args..., ...) + BOOST_CLBL_TRTS_INCLUDE_QUALIFIERS; }; template struct set_varargs_member_function_qualifiers_t < - flag_map::value, + flag_map::value, false, true, - CALLABLE_TRAITS_CC_TAG, T, Return, Args...> { + BOOST_CLBL_TRTS_CC_TAG, T, Return, Args...> { using type = - Return(CALLABLE_TRAITS_VARARGS_CC T::*)(Args..., ...) - CALLABLE_TRAITS_INCLUDE_QUALIFIERS CALLABLE_TRAITS_NOEXCEPT_SPECIFIER; + Return(BOOST_CLBL_TRTS_VARARGS_CC T::*)(Args..., ...) + BOOST_CLBL_TRTS_INCLUDE_QUALIFIERS BOOST_CLBL_TRTS_NOEXCEPT_SPECIFIER; }; template struct set_varargs_member_function_qualifiers_t < - flag_map::value, + flag_map::value, true, false, - CALLABLE_TRAITS_CC_TAG, T, Return, Args...> { + BOOST_CLBL_TRTS_CC_TAG, T, Return, Args...> { using type = - Return(CALLABLE_TRAITS_VARARGS_CC T::*)(Args..., ...) - CALLABLE_TRAITS_INCLUDE_QUALIFIERS CALLABLE_TRAITS_TRANSACTION_SAFE_SPECIFIER; + Return(BOOST_CLBL_TRTS_VARARGS_CC T::*)(Args..., ...) + BOOST_CLBL_TRTS_INCLUDE_QUALIFIERS + BOOST_CLBL_TRTS_TRANSACTION_SAFE_SPECIFIER; }; template struct set_varargs_member_function_qualifiers_t < - flag_map::value, + flag_map::value, true, true, - CALLABLE_TRAITS_CC_TAG, T, Return, Args...> { + BOOST_CLBL_TRTS_CC_TAG, T, Return, Args...> { using type = - Return(CALLABLE_TRAITS_VARARGS_CC T::*)(Args..., ...) - CALLABLE_TRAITS_INCLUDE_QUALIFIERS CALLABLE_TRAITS_TRANSACTION_SAFE_SPECIFIER - CALLABLE_TRAITS_NOEXCEPT_SPECIFIER; + Return(BOOST_CLBL_TRTS_VARARGS_CC T::*)(Args..., ...) + BOOST_CLBL_TRTS_INCLUDE_QUALIFIERS + BOOST_CLBL_TRTS_TRANSACTION_SAFE_SPECIFIER + BOOST_CLBL_TRTS_NOEXCEPT_SPECIFIER; }; -#define CALLABLE_TRAITS_INCLUDE_TRANSACTION_SAFE -#define CALLABLE_TRAITS_IS_TRANSACTION_SAFE std::false_type +#define BOOST_CLBL_TRTS_INCLUDE_TRANSACTION_SAFE +#define BOOST_CLBL_TRTS_IS_TRANSACTION_SAFE std::false_type #include -#undef CALLABLE_TRAITS_INCLUDE_TRANSACTION_SAFE -#undef CALLABLE_TRAITS_IS_TRANSACTION_SAFE +#undef BOOST_CLBL_TRTS_INCLUDE_TRANSACTION_SAFE +#undef BOOST_CLBL_TRTS_IS_TRANSACTION_SAFE -#ifdef CALLABLE_TRAITS_ENABLE_TRANSACTION_SAFE +#ifdef BOOST_CLBL_TRTS_ENABLE_TRANSACTION_SAFE -#define CALLABLE_TRAITS_IS_TRANSACTION_SAFE std::true_type -#define CALLABLE_TRAITS_INCLUDE_TRANSACTION_SAFE transaction_safe +#define BOOST_CLBL_TRTS_IS_TRANSACTION_SAFE std::true_type +#define BOOST_CLBL_TRTS_INCLUDE_TRANSACTION_SAFE transaction_safe #include #endif -#undef CALLABLE_TRAITS_INCLUDE_TRANSACTION_SAFE -#undef CALLABLE_TRAITS_IS_TRANSACTION_SAFE +#undef BOOST_CLBL_TRTS_INCLUDE_TRANSACTION_SAFE +#undef BOOST_CLBL_TRTS_IS_TRANSACTION_SAFE diff --git a/include/boost/callable_traits/detail/unguarded/pmf_varargs_3.hpp b/include/boost/callable_traits/detail/unguarded/pmf_varargs_3.hpp index a3fff5b..b9074f7 100644 --- a/include/boost/callable_traits/detail/unguarded/pmf_varargs_3.hpp +++ b/include/boost/callable_traits/detail/unguarded/pmf_varargs_3.hpp @@ -7,21 +7,168 @@ Distributed under the Boost Software License, Version 1.0. HEADER GUARDS INTENTIONALLY OMITTED DO NOT INCLUDE THIS HEADER DIRECTLY +BOOST_CLBL_TRTS_INCLUDE_QUALIFIERS - the function-level qualifiers for the + current inclusion (combinations of `const` `volatile` `&` `&&`, or nothing) + +BOOST_CLBL_TRTS_INCLUDE_TRANSACTION_SAFE - the transaction_safe specifier for + the current include (`transaction_safe` or nothing) + +BOOST_CLBL_TRTS_IS_TRANSACTION_SAFE - `std::true_type` or `std::false_type`, + tied on whether BOOST_CLBL_TRTS_INCLUDE_TRANSACTION_SAFE is `transaction_safe` + +BOOST_CLBL_TRTS_TRANSACTION_SAFE_SPECIFIER - `transaction_safe` when + BOOST_CLBL_TRTS_ENABLE_TRANSACTION_SAFE is enabled, otherwise nothing + +BOOST_CLBL_TRTS_NOEXCEPT_SPEC - the noexcept specifier for + the current include (`noexcept` or nothing) + +BOOST_CLBL_TRTS_IS_NOEXCEPT - `std::true_type` or `std::false_type`, + tied on whether BOOST_CLBL_TRTS_NOEXCEPT_SPEC is `noexcept` + +BOOST_CLBL_TRTS_NOEXCEPT_SPECIFIER - `noexcept` if + BOOST_CLBL_TRTS_ENABLE_NOEXCEPT_TYPES is defined, otherwise nothing */ -#define CALLABLE_TRAITS_INCLUDE_NOEXCEPT -#define CALLABLE_TRAITS_IS_NOEXCEPT std::false_type -#include +template +struct pmf + : default_callable_traits { -#undef CALLABLE_TRAITS_INCLUDE_NOEXCEPT -#undef CALLABLE_TRAITS_IS_NOEXCEPT + static constexpr bool value = true; -#ifdef CALLABLE_TRAITS_ENABLE_NOEXCEPT_TYPES + using has_varargs = std::true_type; -#define CALLABLE_TRAITS_IS_NOEXCEPT std::true_type -#define CALLABLE_TRAITS_INCLUDE_NOEXCEPT noexcept -#include -#undef CALLABLE_TRAITS_INCLUDE_NOEXCEPT -#undef CALLABLE_TRAITS_IS_NOEXCEPT + using traits = pmf; -#endif // #ifdef CALLABLE_TRAITS_ENABLE_NOEXCEPT_TYPES + using return_type = Return; + + using type = Return(BOOST_CLBL_TRTS_VARARGS_CC T::*)(Args..., ...) + BOOST_CLBL_TRTS_INCLUDE_QUALIFIERS + BOOST_CLBL_TRTS_INCLUDE_TRANSACTION_SAFE + BOOST_CLBL_TRTS_NOEXCEPT_SPEC; + + using invoke_type = typename std::conditional< + std::is_rvalue_reference::value, + T BOOST_CLBL_TRTS_INCLUDE_QUALIFIERS, + typename std::add_lvalue_reference::type + >::type; + + using arg_types = std::tuple; + using non_invoke_arg_types = std::tuple; + + using function_object_signature = Return(Args..., ...); + + using function_type = Return(invoke_type, Args..., ...); + + using qualified_function_type = Return(Args..., ...) + BOOST_CLBL_TRTS_INCLUDE_ABOMINABLE_QUALIFIERS + BOOST_CLBL_TRTS_INCLUDE_TRANSACTION_SAFE + BOOST_CLBL_TRTS_NOEXCEPT_SPEC; + + using remove_varargs = + Return(BOOST_CLBL_TRTS_CC T::*)(Args...) + BOOST_CLBL_TRTS_INCLUDE_QUALIFIERS + BOOST_CLBL_TRTS_INCLUDE_TRANSACTION_SAFE + BOOST_CLBL_TRTS_NOEXCEPT_SPEC; + + using add_varargs = type; + + using is_noexcept = BOOST_CLBL_TRTS_IS_NOEXCEPT; + + using remove_noexcept = Return(BOOST_CLBL_TRTS_CC T::*)(Args..., ...) + BOOST_CLBL_TRTS_INCLUDE_QUALIFIERS + BOOST_CLBL_TRTS_INCLUDE_TRANSACTION_SAFE; + + using add_noexcept = Return(BOOST_CLBL_TRTS_CC T::*)(Args..., ...) + BOOST_CLBL_TRTS_INCLUDE_QUALIFIERS + BOOST_CLBL_TRTS_INCLUDE_TRANSACTION_SAFE + BOOST_CLBL_TRTS_NOEXCEPT_SPECIFIER; + + using is_transaction_safe = BOOST_CLBL_TRTS_IS_TRANSACTION_SAFE; + + using remove_transaction_safe = Return(BOOST_CLBL_TRTS_VARARGS_CC T::*)(Args..., ...) + BOOST_CLBL_TRTS_INCLUDE_QUALIFIERS + BOOST_CLBL_TRTS_NOEXCEPT_SPEC; + + using add_transaction_safe = Return(BOOST_CLBL_TRTS_VARARGS_CC T::*)(Args..., ...) + BOOST_CLBL_TRTS_INCLUDE_QUALIFIERS + BOOST_CLBL_TRTS_TRANSACTION_SAFE_SPECIFIER + BOOST_CLBL_TRTS_NOEXCEPT_SPEC; + + using class_type = T; + + using qualifiers = default_callable_traits; + + template + using set_qualifiers = set_varargs_member_function_qualifiers< + Flags, is_transaction_safe::value, is_noexcept::value, + BOOST_CLBL_TRTS_CC_TAG, T, Return, Args...>; + + using remove_member_reference = set_qualifiers; + + using add_member_lvalue_reference = set_qualifiers< + collapse_flags::value>; + + using add_member_rvalue_reference = set_qualifiers< + collapse_flags::value>; + + using add_member_const = set_qualifiers; + + using add_member_volatile = set_qualifiers; + + using add_member_cv = set_qualifiers; + + using remove_member_const = set_qualifiers< + qualifiers::ref_flags | remove_const_flag::value>; + + using remove_member_volatile = set_qualifiers< + qualifiers::ref_flags | remove_volatile_flag::value>; + + using remove_member_cv = set_qualifiers; + + template + using apply_member_pointer = + Return(BOOST_CLBL_TRTS_VARARGS_CC U::*)(Args..., ...) + BOOST_CLBL_TRTS_INCLUDE_QUALIFIERS + BOOST_CLBL_TRTS_INCLUDE_TRANSACTION_SAFE + BOOST_CLBL_TRTS_NOEXCEPT_SPEC; + + template + using apply_return = + NewReturn(BOOST_CLBL_TRTS_VARARGS_CC T::*)(Args..., ...) + BOOST_CLBL_TRTS_INCLUDE_QUALIFIERS + BOOST_CLBL_TRTS_INCLUDE_TRANSACTION_SAFE + BOOST_CLBL_TRTS_NOEXCEPT_SPEC; + + template class Container> + using expand_args = Container; + + template class Container, typename... RightArgs> + using expand_args_left = Container; + + template class Container, typename... LeftArgs> + using expand_args_right = Container; + + using clear_args = + Return(BOOST_CLBL_TRTS_VARARGS_CC T::*)() + BOOST_CLBL_TRTS_INCLUDE_QUALIFIERS + BOOST_CLBL_TRTS_INCLUDE_TRANSACTION_SAFE + BOOST_CLBL_TRTS_NOEXCEPT_SPEC; + +#undef BOOST_CLBL_TRTS_BEGIN_PACK_MANIP +#undef BOOST_CLBL_TRTS_ARGS_PACK +#undef BOOST_CLBL_TRTS_END_PACK_MANIP + +#define BOOST_CLBL_TRTS_BEGIN_PACK_MANIP Return( BOOST_CLBL_TRTS_VARARGS_CC T::*)( +#define BOOST_CLBL_TRTS_ARGS_PACK Args +#define BOOST_CLBL_TRTS_END_PACK_MANIP \ + , ...) BOOST_CLBL_TRTS_INCLUDE_QUALIFIERS BOOST_CLBL_TRTS_INCLUDE_TRANSACTION_SAFE BOOST_CLBL_TRTS_NOEXCEPT_SPEC + +#include +#undef BOOST_CLBL_TRTS_BEGIN_PACK_MANIP +#undef BOOST_CLBL_TRTS_ARGS_PACK +#undef BOOST_CLBL_TRTS_END_PACK_MANIP + +}; diff --git a/include/boost/callable_traits/detail/unguarded/pmf_varargs_4.hpp b/include/boost/callable_traits/detail/unguarded/pmf_varargs_4.hpp deleted file mode 100644 index a21cdc3..0000000 --- a/include/boost/callable_traits/detail/unguarded/pmf_varargs_4.hpp +++ /dev/null @@ -1,174 +0,0 @@ -/* -Copyright (c) 2016 Barrett Adair - -Distributed under the Boost Software License, Version 1.0. -(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt) - -HEADER GUARDS INTENTIONALLY OMITTED -DO NOT INCLUDE THIS HEADER DIRECTLY - -CALLABLE_TRAITS_INCLUDE_QUALIFIERS - the function-level qualifiers for the - current inclusion (combinations of `const` `volatile` `&` `&&`, or nothing) - -CALLABLE_TRAITS_INCLUDE_TRANSACTION_SAFE - the transaction_safe specifier for - the current include (`transaction_safe` or nothing) - -CALLABLE_TRAITS_IS_TRANSACTION_SAFE - `std::true_type` or `std::false_type`, - tied on whether CALLABLE_TRAITS_INCLUDE_TRANSACTION_SAFE is `transaction_safe` - -CALLABLE_TRAITS_TRANSACTION_SAFE_SPECIFIER - `transaction_safe` when - CALLABLE_TRAITS_ENABLE_TRANSACTION_SAFE is enabled, otherwise nothing - -CALLABLE_TRAITS_INCLUDE_NOEXCEPT - the noexcept specifier for - the current include (`noexcept` or nothing) - -CALLABLE_TRAITS_IS_NOEXCEPT - `std::true_type` or `std::false_type`, - tied on whether CALLABLE_TRAITS_INCLUDE_NOEXCEPT is `noexcept` - -CALLABLE_TRAITS_NOEXCEPT_SPECIFIER - `noexcept` if - CALLABLE_TRAITS_ENABLE_NOEXCEPT_TYPES is defined, otherwise nothing -*/ - -template -struct pmf - : default_callable_traits { - - static constexpr bool value = true; - - using has_varargs = std::true_type; - - using traits = pmf; - - using return_type = Return; - - using type = Return(CALLABLE_TRAITS_VARARGS_CC T::*)(Args..., ...) - CALLABLE_TRAITS_INCLUDE_QUALIFIERS - CALLABLE_TRAITS_INCLUDE_TRANSACTION_SAFE - CALLABLE_TRAITS_INCLUDE_NOEXCEPT; - - using invoke_type = typename std::conditional< - std::is_rvalue_reference::value, - T CALLABLE_TRAITS_INCLUDE_QUALIFIERS, - typename std::add_lvalue_reference::type - >::type; - - using arg_types = std::tuple; - using non_invoke_arg_types = std::tuple; - - using function_object_signature = Return(Args..., ...); - - using function_type = Return(invoke_type, Args..., ...); - - using qualified_function_type = Return(Args..., ...) - CALLABLE_TRAITS_INCLUDE_ABOMINABLE_QUALIFIERS - CALLABLE_TRAITS_INCLUDE_TRANSACTION_SAFE - CALLABLE_TRAITS_INCLUDE_NOEXCEPT; - - using remove_varargs = - Return(CALLABLE_TRAITS_CC T::*)(Args...) - CALLABLE_TRAITS_INCLUDE_QUALIFIERS - CALLABLE_TRAITS_INCLUDE_TRANSACTION_SAFE - CALLABLE_TRAITS_INCLUDE_NOEXCEPT; - - using add_varargs = type; - - using is_noexcept = CALLABLE_TRAITS_IS_NOEXCEPT; - - using remove_noexcept = Return(CALLABLE_TRAITS_CC T::*)(Args..., ...) - CALLABLE_TRAITS_INCLUDE_QUALIFIERS - CALLABLE_TRAITS_INCLUDE_TRANSACTION_SAFE; - - using add_noexcept = Return(CALLABLE_TRAITS_CC T::*)(Args..., ...) - CALLABLE_TRAITS_INCLUDE_QUALIFIERS - CALLABLE_TRAITS_INCLUDE_TRANSACTION_SAFE - CALLABLE_TRAITS_NOEXCEPT_SPECIFIER; - - using is_transaction_safe = CALLABLE_TRAITS_IS_TRANSACTION_SAFE; - - using remove_transaction_safe = Return(CALLABLE_TRAITS_VARARGS_CC T::*)(Args..., ...) - CALLABLE_TRAITS_INCLUDE_QUALIFIERS - CALLABLE_TRAITS_INCLUDE_NOEXCEPT; - - using add_transaction_safe = Return(CALLABLE_TRAITS_VARARGS_CC T::*)(Args..., ...) - CALLABLE_TRAITS_INCLUDE_QUALIFIERS - CALLABLE_TRAITS_TRANSACTION_SAFE_SPECIFIER - CALLABLE_TRAITS_INCLUDE_NOEXCEPT; - - using class_type = T; - - using qualifiers = default_callable_traits; - - template - using set_qualifiers = set_varargs_member_function_qualifiers< - Flags, is_transaction_safe::value, is_noexcept::value, - CALLABLE_TRAITS_CC_TAG, T, Return, Args...>; - - using remove_member_reference = set_qualifiers; - - using add_member_lvalue_reference = set_qualifiers< - collapse_flags::value>; - - using add_member_rvalue_reference = set_qualifiers< - collapse_flags::value>; - - using add_member_const = set_qualifiers; - - using add_member_volatile = set_qualifiers; - - using add_member_cv = set_qualifiers; - - using remove_member_const = set_qualifiers< - qualifiers::ref_flags | remove_const_flag::value>; - - using remove_member_volatile = set_qualifiers< - qualifiers::ref_flags | remove_volatile_flag::value>; - - using remove_member_cv = set_qualifiers; - - template - using apply_member_pointer = - Return(CALLABLE_TRAITS_VARARGS_CC U::*)(Args..., ...) - CALLABLE_TRAITS_INCLUDE_QUALIFIERS - CALLABLE_TRAITS_INCLUDE_TRANSACTION_SAFE - CALLABLE_TRAITS_INCLUDE_NOEXCEPT; - - template - using apply_return = - NewReturn(CALLABLE_TRAITS_VARARGS_CC T::*)(Args..., ...) - CALLABLE_TRAITS_INCLUDE_QUALIFIERS - CALLABLE_TRAITS_INCLUDE_TRANSACTION_SAFE - CALLABLE_TRAITS_INCLUDE_NOEXCEPT; - - template class Container> - using expand_args = Container; - - template class Container, typename... RightArgs> - using expand_args_left = Container; - - template class Container, typename... LeftArgs> - using expand_args_right = Container; - - using clear_args = - Return(CALLABLE_TRAITS_VARARGS_CC T::*)() - CALLABLE_TRAITS_INCLUDE_QUALIFIERS - CALLABLE_TRAITS_INCLUDE_TRANSACTION_SAFE - CALLABLE_TRAITS_INCLUDE_NOEXCEPT; - -#undef CALLABLE_TRAITS_BEGIN_PACK_MANIP -#undef CALLABLE_TRAITS_ARGS_PACK -#undef CALLABLE_TRAITS_END_PACK_MANIP - -#define CALLABLE_TRAITS_BEGIN_PACK_MANIP Return( CALLABLE_TRAITS_VARARGS_CC T::*)( -#define CALLABLE_TRAITS_ARGS_PACK Args -#define CALLABLE_TRAITS_END_PACK_MANIP \ - , ...) CALLABLE_TRAITS_INCLUDE_QUALIFIERS CALLABLE_TRAITS_INCLUDE_TRANSACTION_SAFE CALLABLE_TRAITS_INCLUDE_NOEXCEPT - -#include -#undef CALLABLE_TRAITS_BEGIN_PACK_MANIP -#undef CALLABLE_TRAITS_ARGS_PACK -#undef CALLABLE_TRAITS_END_PACK_MANIP - -}; diff --git a/include/boost/callable_traits/detail/utility.hpp b/include/boost/callable_traits/detail/utility.hpp index 9d868d4..45f52a2 100644 --- a/include/boost/callable_traits/detail/utility.hpp +++ b/include/boost/callable_traits/detail/utility.hpp @@ -6,8 +6,8 @@ Distributed under the Boost Software License, Version 1.0. */ -#ifndef CALLABLE_TRAITS_DETAIL_UTILITY_HPP -#define CALLABLE_TRAITS_DETAIL_UTILITY_HPP +#ifndef BOOST_CLBL_TRTS_DETAIL_UTILITY_HPP +#define BOOST_CLBL_TRTS_DETAIL_UTILITY_HPP #include #include @@ -15,7 +15,7 @@ Distributed under the Boost Software License, Version 1.0. #include #include -CALLABLE_TRAITS_DETAIL_NAMESPACE_BEGIN +BOOST_CLBL_TRTS_DETAIL_NAMESPACE_BEGIN struct cdecl_tag{}; struct stdcall_tag{}; @@ -29,7 +29,7 @@ template using error_type = typename std::conditional< std::is_reference::value, reference_error, invalid_type>::type; -#ifdef CALLABLE_TRAITS_DISABLE_ABOMINABLE_FUNCTIONS +#ifdef BOOST_CLBL_TRTS_DISABLE_ABOMINABLE_FUNCTIONS struct abominable_functions_not_supported_on_this_compiler{}; #endif @@ -56,7 +56,8 @@ template::type> using try_but_fail_if_invalid = sfinae_try, - fail_when_same>; + fail_when_same>; template::type, @@ -70,6 +71,6 @@ template using fallback_if_invalid = typename std::conditional< std::is_same::value, Fallback, T>::type; -CALLABLE_TRAITS_DETAIL_NAMESPACE_END +BOOST_CLBL_TRTS_DETAIL_NAMESPACE_END #endif diff --git a/include/boost/callable_traits/expand_args.hpp b/include/boost/callable_traits/expand_args.hpp index d7516b8..686a5a8 100644 --- a/include/boost/callable_traits/expand_args.hpp +++ b/include/boost/callable_traits/expand_args.hpp @@ -6,12 +6,12 @@ Distributed under the Boost Software License, Version 1.0. */ -#ifndef CALLABLE_TRAITS_EXPAND_ARGS_HPP -#define CALLABLE_TRAITS_EXPAND_ARGS_HPP +#ifndef BOOST_CLBL_TRTS_EXPAND_ARGS_HPP +#define BOOST_CLBL_TRTS_EXPAND_ARGS_HPP #include -CALLABLE_TRAITS_NAMESPACE_BEGIN +BOOST_CLBL_TRTS_NAMESPACE_BEGIN //[ expand_args_hpp /*`[section:ref_expand_args expand_args] @@ -34,7 +34,7 @@ struct expand_args { }; //<- -CALLABLE_TRAITS_NAMESPACE_END +BOOST_CLBL_TRTS_NAMESPACE_END //-> /*` @@ -83,4 +83,4 @@ Full support on GCC 4.7.4+, Clang 3.5+, Visual Studio 2015, and XCode 6.4+. */ //] -#endif //CALLABLE_TRAITS_EXPAND_ARGS_HPP +#endif //BOOST_CLBL_TRTS_EXPAND_ARGS_HPP diff --git a/include/boost/callable_traits/expand_args_left.hpp b/include/boost/callable_traits/expand_args_left.hpp index 883b003..f3253ae 100644 --- a/include/boost/callable_traits/expand_args_left.hpp +++ b/include/boost/callable_traits/expand_args_left.hpp @@ -6,12 +6,12 @@ Distributed under the Boost Software License, Version 1.0. */ -#ifndef CALLABLE_TRAITS_EXPAND_ARGS_LEFT_HPP -#define CALLABLE_TRAITS_EXPAND_ARGS_LEFT_HPP +#ifndef BOOST_CLBL_TRTS_EXPAND_ARGS_LEFT_HPP +#define BOOST_CLBL_TRTS_EXPAND_ARGS_LEFT_HPP #include -CALLABLE_TRAITS_NAMESPACE_BEGIN +BOOST_CLBL_TRTS_NAMESPACE_BEGIN //[ expand_args_left_hpp /*`[section:ref_expand_args_left expand_args_left] @@ -35,7 +35,7 @@ struct expand_args_left { }; //<- -CALLABLE_TRAITS_NAMESPACE_END +BOOST_CLBL_TRTS_NAMESPACE_END //-> /*` @@ -81,4 +81,4 @@ Full support on GCC 4.7.4+, Clang 3.5+, Visual Studio 2015, and XCode 6.4+. */ //] -#endif //CALLABLE_TRAITS_EXPAND_ARGS_LEFT_HPP +#endif //BOOST_CLBL_TRTS_EXPAND_ARGS_LEFT_HPP diff --git a/include/boost/callable_traits/expand_args_right.hpp b/include/boost/callable_traits/expand_args_right.hpp index b9346be..e70f999 100644 --- a/include/boost/callable_traits/expand_args_right.hpp +++ b/include/boost/callable_traits/expand_args_right.hpp @@ -6,12 +6,12 @@ Distributed under the Boost Software License, Version 1.0. */ -#ifndef CALLABLE_TRAITS_EXPAND_ARGS_RIGHT_HPP -#define CALLABLE_TRAITS_EXPAND_ARGS_RIGHT_HPP +#ifndef BOOST_CLBL_TRTS_EXPAND_ARGS_RIGHT_HPP +#define BOOST_CLBL_TRTS_EXPAND_ARGS_RIGHT_HPP #include -CALLABLE_TRAITS_NAMESPACE_BEGIN +BOOST_CLBL_TRTS_NAMESPACE_BEGIN //[ expand_args_right_hpp /*`[section:ref_expand_args_right expand_args_right] @@ -35,7 +35,7 @@ struct expand_args_right { }; //<- -CALLABLE_TRAITS_NAMESPACE_END +BOOST_CLBL_TRTS_NAMESPACE_END //-> /*` @@ -81,4 +81,4 @@ Full support on GCC 4.7.4+, Clang 3.5+, Visual Studio 2015, and XCode 6.4+. */ //] -#endif //CALLABLE_TRAITS_EXPAND_ARGS_RIGHT_HPP +#endif //BOOST_CLBL_TRTS_EXPAND_ARGS_RIGHT_HPP diff --git a/include/boost/callable_traits/function_type.hpp b/include/boost/callable_traits/function_type.hpp index f3f34fc..cd51893 100644 --- a/include/boost/callable_traits/function_type.hpp +++ b/include/boost/callable_traits/function_type.hpp @@ -6,12 +6,12 @@ Distributed under the Boost Software License, Version 1.0. */ -#ifndef CALLABLE_TRAITS_FUNCTION_TYPE_HPP -#define CALLABLE_TRAITS_FUNCTION_TYPE_HPP +#ifndef BOOST_CLBL_TRTS_FUNCTION_TYPE_HPP +#define BOOST_CLBL_TRTS_FUNCTION_TYPE_HPP #include -CALLABLE_TRAITS_NAMESPACE_BEGIN +BOOST_CLBL_TRTS_NAMESPACE_BEGIN //[ function_type_hpp /*`[section:ref_function_type function_type] @@ -34,7 +34,7 @@ struct function_type { }; //<- -CALLABLE_TRAITS_NAMESPACE_END +BOOST_CLBL_TRTS_NAMESPACE_END //-> /*` diff --git a/include/boost/callable_traits/has_member_qualifiers.hpp b/include/boost/callable_traits/has_member_qualifiers.hpp index 2627552..f453e2a 100644 --- a/include/boost/callable_traits/has_member_qualifiers.hpp +++ b/include/boost/callable_traits/has_member_qualifiers.hpp @@ -6,12 +6,12 @@ Distributed under the Boost Software License, Version 1.0. */ -#ifndef CALLABLE_TRAITS_HAS_MEMBER_QUALIFIERS_HPP -#define CALLABLE_TRAITS_HAS_MEMBER_QUALIFIERS_HPP +#ifndef BOOST_CLBL_TRTS_HAS_MEMBER_QUALIFIERS_HPP +#define BOOST_CLBL_TRTS_HAS_MEMBER_QUALIFIERS_HPP #include -CALLABLE_TRAITS_NAMESPACE_BEGIN +BOOST_CLBL_TRTS_NAMESPACE_BEGIN //[ has_member_qualifiers_hpp /*`[section:ref_has_member_qualifiers has_member_qualifiers] @@ -25,14 +25,12 @@ struct has_member_qualifiers; //immplementation-defined //<- template -struct has_member_qualifiers - - : detail::traits::has_member_qualifiers { +struct has_member_qualifiers : detail::traits::has_member_qualifiers { using type = typename detail::traits::has_member_qualifiers; }; // older compilers don't support variable templates -#ifdef CALLABLE_TRAITS_DISABLE_VARIABLE_TEMPLATES +#ifdef BOOST_CLBL_TRTS_DISABLE_VARIABLE_TEMPLATES template struct has_member_qualifiers_v { @@ -51,7 +49,7 @@ constexpr bool has_member_qualifiers_v = //implementation-defined //-> //<- -CALLABLE_TRAITS_NAMESPACE_END +BOOST_CLBL_TRTS_NAMESPACE_END //-> /*` @@ -95,4 +93,4 @@ Full support on GCC 4.7.4+, Clang 3.5+, Visual Studio 2015, and XCode 6.4+. */ //] -#endif //CALLABLE_TRAITS_HAS_MEMBER_QUALIFIERS_HPP +#endif //BOOST_CLBL_TRTS_HAS_MEMBER_QUALIFIERS_HPP diff --git a/include/boost/callable_traits/has_varargs.hpp b/include/boost/callable_traits/has_varargs.hpp index 461c46b..99d7725 100644 --- a/include/boost/callable_traits/has_varargs.hpp +++ b/include/boost/callable_traits/has_varargs.hpp @@ -6,12 +6,12 @@ Distributed under the Boost Software License, Version 1.0. */ -#ifndef CALLABLE_TRAITS_HAS_VARARGS_HPP -#define CALLABLE_TRAITS_HAS_VARARGS_HPP +#ifndef BOOST_CLBL_TRTS_HAS_VARARGS_HPP +#define BOOST_CLBL_TRTS_HAS_VARARGS_HPP #include -CALLABLE_TRAITS_NAMESPACE_BEGIN +BOOST_CLBL_TRTS_NAMESPACE_BEGIN //[ has_varargs_hpp /*`[section:ref_has_varargs has_varargs] @@ -26,13 +26,12 @@ struct has_varargs; //implementation-defined //<- template -struct has_varargs - : detail::traits::has_varargs { +struct has_varargs : detail::traits::has_varargs { using type = typename detail::traits::has_varargs; }; //-> -#ifdef CALLABLE_TRAITS_DISABLE_VARIABLE_TEMPLATES +#ifdef BOOST_CLBL_TRTS_DISABLE_VARIABLE_TEMPLATES template struct has_varargs_v { @@ -50,7 +49,7 @@ constexpr bool has_varargs_v = //implementation-defined #endif //<- -CALLABLE_TRAITS_NAMESPACE_END +BOOST_CLBL_TRTS_NAMESPACE_END //-> /*` diff --git a/include/boost/callable_traits/has_void_return.hpp b/include/boost/callable_traits/has_void_return.hpp index 594ed6c..53b76cb 100644 --- a/include/boost/callable_traits/has_void_return.hpp +++ b/include/boost/callable_traits/has_void_return.hpp @@ -6,12 +6,12 @@ Distributed under the Boost Software License, Version 1.0. */ -#ifndef CALLABLE_TRAITS_HAS_VOID_RETURN_HPP -#define CALLABLE_TRAITS_HAS_VOID_RETURN_HPP +#ifndef BOOST_CLBL_TRTS_HAS_VOID_RETURN_HPP +#define BOOST_CLBL_TRTS_HAS_VOID_RETURN_HPP #include -CALLABLE_TRAITS_NAMESPACE_BEGIN +BOOST_CLBL_TRTS_NAMESPACE_BEGIN //[ has_void_return_hpp /*`[section:ref_has_void_return has_void_return] @@ -29,7 +29,7 @@ struct has_void_return : std::is_same::return_type, void> {}; //-> -#ifdef CALLABLE_TRAITS_DISABLE_VARIABLE_TEMPLATES +#ifdef BOOST_CLBL_TRTS_DISABLE_VARIABLE_TEMPLATES template struct has_void_return_v { @@ -47,7 +47,7 @@ constexpr bool has_void_return_v = //implementation-defined #endif //<- -CALLABLE_TRAITS_NAMESPACE_END +BOOST_CLBL_TRTS_NAMESPACE_END //-> diff --git a/include/boost/callable_traits/insert_args.hpp b/include/boost/callable_traits/insert_args.hpp index 3bf0b81..f8616ad 100644 --- a/include/boost/callable_traits/insert_args.hpp +++ b/include/boost/callable_traits/insert_args.hpp @@ -6,16 +6,16 @@ Distributed under the Boost Software License, Version 1.0. */ -#ifndef CALLABLE_TRAITS_INSERT_ARGS_HPP -#define CALLABLE_TRAITS_INSERT_ARGS_HPP +#ifndef BOOST_CLBL_TRTS_INSERT_ARGS_HPP +#define BOOST_CLBL_TRTS_INSERT_ARGS_HPP #include #include -CALLABLE_TRAITS_NAMESPACE_BEGIN +BOOST_CLBL_TRTS_NAMESPACE_BEGIN -CALLABLE_TRAITS_DEFINE_SFINAE_ERROR_ORIGIN(insert_args) -CALLABLE_TRAITS_SFINAE_MSG(insert_args, cannot_insert_parameters_into_this_type) +BOOST_CLBL_TRTS_DEFINE_SFINAE_ERROR_ORIGIN(insert_args) +BOOST_CLBL_TRTS_SFINAE_MSG(insert_args, cannot_insert_parameters_into_this_type) //[ insert_args_hpp /*`[section:ref_insert_args insert_args] @@ -58,7 +58,7 @@ struct insert_args { }; //<- -CALLABLE_TRAITS_NAMESPACE_END +BOOST_CLBL_TRTS_NAMESPACE_END //-> /*` @@ -102,4 +102,4 @@ Full support on GCC 4.7.4+, Clang 3.5+, Visual Studio 2015, and XCode 6.4+. */ //] -#endif //CALLABLE_TRAITS_INSERT_ARGS_HPP +#endif //BOOST_CLBL_TRTS_INSERT_ARGS_HPP diff --git a/include/boost/callable_traits/is_const_member.hpp b/include/boost/callable_traits/is_const_member.hpp index e3caab6..51e9fb8 100644 --- a/include/boost/callable_traits/is_const_member.hpp +++ b/include/boost/callable_traits/is_const_member.hpp @@ -6,12 +6,12 @@ Distributed under the Boost Software License, Version 1.0. */ -#ifndef CALLABLE_TRAITS_IS_CONST_MEMBER_HPP -#define CALLABLE_TRAITS_IS_CONST_MEMBER_HPP +#ifndef BOOST_CLBL_TRTS_IS_CONST_MEMBER_HPP +#define BOOST_CLBL_TRTS_IS_CONST_MEMBER_HPP #include -CALLABLE_TRAITS_NAMESPACE_BEGIN +BOOST_CLBL_TRTS_NAMESPACE_BEGIN //[ is_const_member_hpp /*`[section:ref_is_const_member is_const_member] @@ -27,12 +27,11 @@ struct is_const_member; //implementation-defined template struct is_const_member : detail::traits::is_const_member { - using type = typename detail::traits::is_const_member; }; //-> -#ifdef CALLABLE_TRAITS_DISABLE_VARIABLE_TEMPLATES +#ifdef BOOST_CLBL_TRTS_DISABLE_VARIABLE_TEMPLATES template struct is_const_member_v { @@ -50,7 +49,7 @@ constexpr bool is_const_member_v = //implementation-defined #endif //<- -CALLABLE_TRAITS_NAMESPACE_END +BOOST_CLBL_TRTS_NAMESPACE_END //-> /*` @@ -94,4 +93,4 @@ Full support on GCC 4.7.4+, Clang 3.5+, Visual Studio 2015, and XCode 6.4+. */ //] -#endif //#ifndef CALLABLE_TRAITS_IS_CONST_MEMBER_HPP +#endif //#ifndef BOOST_CLBL_TRTS_IS_CONST_MEMBER_HPP diff --git a/include/boost/callable_traits/is_cv_member.hpp b/include/boost/callable_traits/is_cv_member.hpp index aef79ec..2c7f168 100644 --- a/include/boost/callable_traits/is_cv_member.hpp +++ b/include/boost/callable_traits/is_cv_member.hpp @@ -6,12 +6,12 @@ Distributed under the Boost Software License, Version 1.0. */ -#ifndef CALLABLE_TRAITS_IS_CV_MEMBER_HPP -#define CALLABLE_TRAITS_IS_CV_MEMBER_HPP +#ifndef BOOST_CLBL_TRTS_IS_CV_MEMBER_HPP +#define BOOST_CLBL_TRTS_IS_CV_MEMBER_HPP #include -CALLABLE_TRAITS_NAMESPACE_BEGIN +BOOST_CLBL_TRTS_NAMESPACE_BEGIN //[ is_cv_member_hpp /*`[section:ref_is_cv_member is_cv_member] @@ -27,12 +27,11 @@ struct is_cv_member; //implementation-defined template struct is_cv_member : detail::traits::is_cv_member { - using type = typename detail::traits::is_cv_member; }; //-> -#ifdef CALLABLE_TRAITS_DISABLE_VARIABLE_TEMPLATES +#ifdef BOOST_CLBL_TRTS_DISABLE_VARIABLE_TEMPLATES template struct is_cv_member_v { @@ -51,7 +50,7 @@ constexpr bool is_cv_member_v = //implementation-defined #endif //<- -CALLABLE_TRAITS_NAMESPACE_END +BOOST_CLBL_TRTS_NAMESPACE_END //-> /*` @@ -93,4 +92,4 @@ Full support on GCC 4.7.4+, Clang 3.5+, Visual Studio 2015, and XCode 6.4+. */ //] -#endif //#ifndef CALLABLE_TRAITS_IS_CV_MEMBER_HPP +#endif //#ifndef BOOST_CLBL_TRTS_IS_CV_MEMBER_HPP diff --git a/include/boost/callable_traits/is_lvalue_reference_member.hpp b/include/boost/callable_traits/is_lvalue_reference_member.hpp index 51e4295..637297a 100644 --- a/include/boost/callable_traits/is_lvalue_reference_member.hpp +++ b/include/boost/callable_traits/is_lvalue_reference_member.hpp @@ -6,12 +6,12 @@ Distributed under the Boost Software License, Version 1.0. */ -#ifndef CALLABLE_TRAITS_IS_LVALUE_REFERENCE_MEMBER_HPP -#define CALLABLE_TRAITS_IS_LVALUE_REFERENCE_MEMBER_HPP +#ifndef BOOST_CLBL_TRTS_IS_LVALUE_REFERENCE_MEMBER_HPP +#define BOOST_CLBL_TRTS_IS_LVALUE_REFERENCE_MEMBER_HPP #include -CALLABLE_TRAITS_NAMESPACE_BEGIN +BOOST_CLBL_TRTS_NAMESPACE_BEGIN //[ is_lvalue_reference_member_hpp /*`[section:ref_is_lvalue_reference_member is_lvalue_reference_member] @@ -28,12 +28,11 @@ struct is_lvalue_reference_member; //implementation-defined template struct is_lvalue_reference_member : detail::traits::is_lvalue_reference_member { - using type = typename detail::traits::is_lvalue_reference_member; }; //-> -#ifdef CALLABLE_TRAITS_DISABLE_VARIABLE_TEMPLATES +#ifdef BOOST_CLBL_TRTS_DISABLE_VARIABLE_TEMPLATES template struct is_lvalue_reference_member_v { @@ -51,7 +50,7 @@ constexpr bool is_lvalue_reference_member_v = //implementation-defined #endif //<- -CALLABLE_TRAITS_NAMESPACE_END +BOOST_CLBL_TRTS_NAMESPACE_END //-> /*` @@ -92,4 +91,4 @@ Full support on GCC 4.9.2+, Clang 3.5+, Visual Studio 2015, and XCode 6.4+. */ //] -#endif //#ifndef CALLABLE_TRAITS_IS_LVALUE_REFERENCE_MEMBER_HPP +#endif //#ifndef BOOST_CLBL_TRTS_IS_LVALUE_REFERENCE_MEMBER_HPP diff --git a/include/boost/callable_traits/is_noexcept.hpp b/include/boost/callable_traits/is_noexcept.hpp index a835d95..76c88b2 100644 --- a/include/boost/callable_traits/is_noexcept.hpp +++ b/include/boost/callable_traits/is_noexcept.hpp @@ -7,12 +7,12 @@ Distributed under the Boost Software License, Version 1.0. */ -#ifndef CALLABLE_TRAITS_IS_NOEXCEPT_HPP -#define CALLABLE_TRAITS_IS_NOEXCEPT_HPP +#ifndef BOOST_CLBL_TRTS_IS_NOEXCEPT_HPP +#define BOOST_CLBL_TRTS_IS_NOEXCEPT_HPP #include -CALLABLE_TRAITS_NAMESPACE_BEGIN +BOOST_CLBL_TRTS_NAMESPACE_BEGIN //[ is_noexcept_hpp /*`[section:ref_is_noexcept is_noexcept] @@ -26,14 +26,12 @@ struct is_noexcept; //implementation-defined //<- template -struct is_noexcept - : detail::traits::is_noexcept { - +struct is_noexcept : detail::traits::is_noexcept { using type = typename detail::traits::is_noexcept; }; //-> -#ifdef CALLABLE_TRAITS_DISABLE_VARIABLE_TEMPLATES +#ifdef BOOST_CLBL_TRTS_DISABLE_VARIABLE_TEMPLATES template struct is_noexcept_v { @@ -51,7 +49,7 @@ constexpr bool is_noexcept_v = //implementation-defined #endif //<- -CALLABLE_TRAITS_NAMESPACE_END +BOOST_CLBL_TRTS_NAMESPACE_END //-> /*` @@ -93,4 +91,4 @@ Full support on GCC 4.7.4+, Clang 3.5+, Visual Studio 2015, and XCode 6.4+. Obvi */ //] -#endif //#ifndef CALLABLE_TRAITS_IS_NOEXCEPT_HPP +#endif //#ifndef BOOST_CLBL_TRTS_IS_NOEXCEPT_HPP diff --git a/include/boost/callable_traits/is_reference_member.hpp b/include/boost/callable_traits/is_reference_member.hpp index 7376c80..5e1e065 100644 --- a/include/boost/callable_traits/is_reference_member.hpp +++ b/include/boost/callable_traits/is_reference_member.hpp @@ -7,12 +7,12 @@ Distributed under the Boost Software License, Version 1.0. */ -#ifndef CALLABLE_TRAITS_IS_REFERENCE_MEMBER_HPP -#define CALLABLE_TRAITS_IS_REFERENCE_MEMBER_HPP +#ifndef BOOST_CLBL_TRTS_IS_REFERENCE_MEMBER_HPP +#define BOOST_CLBL_TRTS_IS_REFERENCE_MEMBER_HPP #include -CALLABLE_TRAITS_NAMESPACE_BEGIN +BOOST_CLBL_TRTS_NAMESPACE_BEGIN //[ is_reference_member_hpp /*`[section:ref_is_reference_member is_reference_member] @@ -27,14 +27,12 @@ struct is_reference_member; //implementation-defined //<- template -struct is_reference_member - : detail::traits::is_reference_member { - +struct is_reference_member : detail::traits::is_reference_member { using type = typename detail::traits::is_reference_member; }; //-> -#ifdef CALLABLE_TRAITS_DISABLE_VARIABLE_TEMPLATES +#ifdef BOOST_CLBL_TRTS_DISABLE_VARIABLE_TEMPLATES template struct is_reference_member_v { @@ -51,7 +49,7 @@ constexpr bool is_reference_member_v = //implementation-defined //-> #endif //<- -CALLABLE_TRAITS_NAMESPACE_END +BOOST_CLBL_TRTS_NAMESPACE_END //-> /*` @@ -93,4 +91,4 @@ Full support on GCC 4.9.2+, Clang 3.5+, Visual Studio 2015, and XCode 6.4+. */ //] -#endif //#ifndef CALLABLE_TRAITS_IS_REFERENCE_MEMBER_HPP +#endif //#ifndef BOOST_CLBL_TRTS_IS_REFERENCE_MEMBER_HPP diff --git a/include/boost/callable_traits/is_rvalue_reference_member.hpp b/include/boost/callable_traits/is_rvalue_reference_member.hpp index 5b38261..2c67d46 100644 --- a/include/boost/callable_traits/is_rvalue_reference_member.hpp +++ b/include/boost/callable_traits/is_rvalue_reference_member.hpp @@ -7,12 +7,12 @@ Distributed under the Boost Software License, Version 1.0. */ -#ifndef CALLABLE_TRAITS_IS_RVALUE_REFERENCE_MEMBER_HPP -#define CALLABLE_TRAITS_IS_RVALUE_REFERENCE_MEMBER_HPP +#ifndef BOOST_CLBL_TRTS_IS_RVALUE_REFERENCE_MEMBER_HPP +#define BOOST_CLBL_TRTS_IS_RVALUE_REFERENCE_MEMBER_HPP #include -CALLABLE_TRAITS_NAMESPACE_BEGIN +BOOST_CLBL_TRTS_NAMESPACE_BEGIN //[ is_rvalue_reference_member_hpp /*`[section:ref_is_rvalue_reference_member is_rvalue_reference_member] @@ -29,12 +29,11 @@ struct is_rvalue_reference_member; //implementation-defined template struct is_rvalue_reference_member : detail::traits::is_rvalue_reference_member { - using type = typename detail::traits::is_rvalue_reference_member; }; //-> -#ifdef CALLABLE_TRAITS_DISABLE_VARIABLE_TEMPLATES +#ifdef BOOST_CLBL_TRTS_DISABLE_VARIABLE_TEMPLATES template struct is_rvalue_reference_member_v { @@ -53,7 +52,7 @@ constexpr bool is_rvalue_reference_member_v = //implementation-defined #endif //<- -CALLABLE_TRAITS_NAMESPACE_END +BOOST_CLBL_TRTS_NAMESPACE_END //-> /*` @@ -94,4 +93,4 @@ Full support on GCC 4.9.2+, Clang 3.5+, Visual Studio 2015, and XCode 6.4+. */ //] -#endif //#ifndef CALLABLE_TRAITS_IS_RVALUE_REFERENCE_MEMBER_HPP +#endif //#ifndef BOOST_CLBL_TRTS_IS_RVALUE_REFERENCE_MEMBER_HPP diff --git a/include/boost/callable_traits/is_transaction_safe.hpp b/include/boost/callable_traits/is_transaction_safe.hpp index cb64848..ba16d75 100644 --- a/include/boost/callable_traits/is_transaction_safe.hpp +++ b/include/boost/callable_traits/is_transaction_safe.hpp @@ -7,12 +7,12 @@ Distributed under the Boost Software License, Version 1.0. */ -#ifndef CALLABLE_TRAITS_IS_TRANSACTION_SAFE_HPP -#define CALLABLE_TRAITS_IS_TRANSACTION_SAFE_HPP +#ifndef BOOST_CLBL_TRTS_IS_TRANSACTION_SAFE_HPP +#define BOOST_CLBL_TRTS_IS_TRANSACTION_SAFE_HPP #include -CALLABLE_TRAITS_NAMESPACE_BEGIN +BOOST_CLBL_TRTS_NAMESPACE_BEGIN //[ is_transaction_safe_hpp /*`[section:ref_is_transaction_safe is_transaction_safe] @@ -27,14 +27,12 @@ struct is_transaction_safe; //implementation-defined //<- template -struct is_transaction_safe - : detail::traits::is_transaction_safe { - +struct is_transaction_safe : detail::traits::is_transaction_safe { using type = typename detail::traits::is_transaction_safe; }; //-> -#ifdef CALLABLE_TRAITS_DISABLE_VARIABLE_TEMPLATES +#ifdef BOOST_CLBL_TRTS_DISABLE_VARIABLE_TEMPLATES template struct is_transaction_safe_v { @@ -52,7 +50,7 @@ constexpr bool is_transaction_safe_v = //implementation-defined #endif //<- -CALLABLE_TRAITS_NAMESPACE_END +BOOST_CLBL_TRTS_NAMESPACE_END //-> /*` @@ -94,4 +92,4 @@ Full support on GCC 4.7.4+, Clang 3.5+, Visual Studio 2015, and XCode 6.4+. Obvi */ //] -#endif //#ifndef CALLABLE_TRAITS_IS_TRANSACTION_SAFE_HPP +#endif //#ifndef BOOST_CLBL_TRTS_IS_TRANSACTION_SAFE_HPP diff --git a/include/boost/callable_traits/is_volatile_member.hpp b/include/boost/callable_traits/is_volatile_member.hpp index b89c9e8..4465528 100644 --- a/include/boost/callable_traits/is_volatile_member.hpp +++ b/include/boost/callable_traits/is_volatile_member.hpp @@ -7,12 +7,12 @@ Distributed under the Boost Software License, Version 1.0. */ -#ifndef CALLABLE_TRAITS_IS_VOLATILE_MEMBER_HPP -#define CALLABLE_TRAITS_IS_VOLATILE_MEMBER_HPP +#ifndef BOOST_CLBL_TRTS_IS_VOLATILE_MEMBER_HPP +#define BOOST_CLBL_TRTS_IS_VOLATILE_MEMBER_HPP #include -CALLABLE_TRAITS_NAMESPACE_BEGIN +BOOST_CLBL_TRTS_NAMESPACE_BEGIN //[ is_volatile_member_hpp /*`[section:ref_is_volatile_member is_volatile_member] @@ -27,14 +27,12 @@ struct is_volatile_member; //implementation-defined //<- template -struct is_volatile_member - : detail::traits::is_volatile_member { - +struct is_volatile_member : detail::traits::is_volatile_member { using type = typename detail::traits::is_volatile_member; }; //-> -#ifdef CALLABLE_TRAITS_DISABLE_VARIABLE_TEMPLATES +#ifdef BOOST_CLBL_TRTS_DISABLE_VARIABLE_TEMPLATES template struct is_volatile_member_v { @@ -52,7 +50,7 @@ constexpr bool is_volatile_member_v = //implementation-defined #endif //<- -CALLABLE_TRAITS_NAMESPACE_END +BOOST_CLBL_TRTS_NAMESPACE_END //-> @@ -96,4 +94,4 @@ Full support on GCC 4.7.4+, Clang 3.5+, Visual Studio 2015, and XCode 6.4+. */ //] -#endif //#ifndef CALLABLE_TRAITS_IS_VOLATILE_MEMBER_HPP +#endif //#ifndef BOOST_CLBL_TRTS_IS_VOLATILE_MEMBER_HPP diff --git a/include/boost/callable_traits/parent_class_of.hpp b/include/boost/callable_traits/parent_class_of.hpp index 8c2d777..20b66f3 100644 --- a/include/boost/callable_traits/parent_class_of.hpp +++ b/include/boost/callable_traits/parent_class_of.hpp @@ -6,12 +6,12 @@ Distributed under the Boost Software License, Version 1.0. */ -#ifndef CALLABLE_TRAITS_PARENT_CLASS_OF_HPP -#define CALLABLE_TRAITS_PARENT_CLASS_OF_HPP +#ifndef BOOST_CLBL_TRTS_PARENT_CLASS_OF_HPP +#define BOOST_CLBL_TRTS_PARENT_CLASS_OF_HPP #include -CALLABLE_TRAITS_NAMESPACE_BEGIN +BOOST_CLBL_TRTS_NAMESPACE_BEGIN //[ parent_class_of_hpp /*` @@ -35,7 +35,7 @@ struct parent_class_of { }; //<- -CALLABLE_TRAITS_NAMESPACE_END +BOOST_CLBL_TRTS_NAMESPACE_END //-> /*` @@ -63,4 +63,4 @@ Full support on GCC 4.7.4+, Clang 3.5+, Visual Studio 2015, and XCode 6.4+. */ //] -#endif //#ifndef CALLABLE_TRAITS_PARENT_CLASS_OF_HPP +#endif //#ifndef BOOST_CLBL_TRTS_PARENT_CLASS_OF_HPP diff --git a/include/boost/callable_traits/pop_back_args.hpp b/include/boost/callable_traits/pop_back_args.hpp index 14c9c29..9e3d19c 100644 --- a/include/boost/callable_traits/pop_back_args.hpp +++ b/include/boost/callable_traits/pop_back_args.hpp @@ -6,12 +6,12 @@ Distributed under the Boost Software License, Version 1.0. */ -#ifndef CALLABLE_TRAITS_POP_BACK_ARGS_HPP -#define CALLABLE_TRAITS_POP_BACK_ARGS_HPP +#ifndef BOOST_CLBL_TRTS_POP_BACK_ARGS_HPP +#define BOOST_CLBL_TRTS_POP_BACK_ARGS_HPP #include -CALLABLE_TRAITS_NAMESPACE_BEGIN +BOOST_CLBL_TRTS_NAMESPACE_BEGIN //[ pop_back_args_hpp /*` @@ -35,7 +35,7 @@ struct pop_back_args { }; //<- -CALLABLE_TRAITS_NAMESPACE_END +BOOST_CLBL_TRTS_NAMESPACE_END //-> /*` @@ -70,4 +70,4 @@ Full support on GCC 4.7.4+, Clang 3.5+, Visual Studio 2015, and XCode 6.4+. */ //] -#endif //CALLABLE_TRAITS_POP_BACK_ARGS_HPP +#endif //BOOST_CLBL_TRTS_POP_BACK_ARGS_HPP diff --git a/include/boost/callable_traits/pop_front_args.hpp b/include/boost/callable_traits/pop_front_args.hpp index 4fdc90d..14afd46 100644 --- a/include/boost/callable_traits/pop_front_args.hpp +++ b/include/boost/callable_traits/pop_front_args.hpp @@ -6,12 +6,12 @@ Distributed under the Boost Software License, Version 1.0. */ -#ifndef CALLABLE_TRAITS_POP_FRONT_ARGS_HPP -#define CALLABLE_TRAITS_POP_FRONT_ARGS_HPP +#ifndef BOOST_CLBL_TRTS_POP_FRONT_ARGS_HPP +#define BOOST_CLBL_TRTS_POP_FRONT_ARGS_HPP #include -CALLABLE_TRAITS_NAMESPACE_BEGIN +BOOST_CLBL_TRTS_NAMESPACE_BEGIN //[ pop_front_args_hpp /*` @@ -35,7 +35,7 @@ struct pop_front_args { }; //<- -CALLABLE_TRAITS_NAMESPACE_END +BOOST_CLBL_TRTS_NAMESPACE_END //-> /*` @@ -70,4 +70,4 @@ Full support on GCC 4.7.4+, Clang 3.5+, Visual Studio 2015, and XCode 6.4+. */ //] -#endif //CALLABLE_TRAITS_POP_FRONT_ARGS_HPP +#endif //BOOST_CLBL_TRTS_POP_FRONT_ARGS_HPP diff --git a/include/boost/callable_traits/push_back_args.hpp b/include/boost/callable_traits/push_back_args.hpp index a91fab8..50c3995 100644 --- a/include/boost/callable_traits/push_back_args.hpp +++ b/include/boost/callable_traits/push_back_args.hpp @@ -6,12 +6,12 @@ Distributed under the Boost Software License, Version 1.0. */ -#ifndef CALLABLE_TRAITS_PUSH_BACK_ARGS_HPP -#define CALLABLE_TRAITS_PUSH_BACK_ARGS_HPP +#ifndef BOOST_CLBL_TRTS_PUSH_BACK_ARGS_HPP +#define BOOST_CLBL_TRTS_PUSH_BACK_ARGS_HPP #include -CALLABLE_TRAITS_NAMESPACE_BEGIN +BOOST_CLBL_TRTS_NAMESPACE_BEGIN //[ push_back_args_hpp /*` @@ -35,7 +35,7 @@ struct push_back_args { }; //<- -CALLABLE_TRAITS_NAMESPACE_END +BOOST_CLBL_TRTS_NAMESPACE_END //-> /*` @@ -69,4 +69,4 @@ Full support on GCC 4.7.4+, Clang 3.5+, Visual Studio 2015, and XCode 6.4+. */ //] -#endif //CALLABLE_TRAITS_PUSH_BACK_ARGS_HPP +#endif //BOOST_CLBL_TRTS_PUSH_BACK_ARGS_HPP diff --git a/include/boost/callable_traits/push_front_args.hpp b/include/boost/callable_traits/push_front_args.hpp index f9c0eb3..7b082f2 100644 --- a/include/boost/callable_traits/push_front_args.hpp +++ b/include/boost/callable_traits/push_front_args.hpp @@ -6,12 +6,12 @@ Distributed under the Boost Software License, Version 1.0. */ -#ifndef CALLABLE_TRAITS_PUSH_FRONT_ARGS_HPP -#define CALLABLE_TRAITS_PUSH_FRONT_ARGS_HPP +#ifndef BOOST_CLBL_TRTS_PUSH_FRONT_ARGS_HPP +#define BOOST_CLBL_TRTS_PUSH_FRONT_ARGS_HPP #include -CALLABLE_TRAITS_NAMESPACE_BEGIN +BOOST_CLBL_TRTS_NAMESPACE_BEGIN //[ push_front_args_hpp /*` @@ -35,7 +35,7 @@ struct push_front_args { }; //<- -CALLABLE_TRAITS_NAMESPACE_END +BOOST_CLBL_TRTS_NAMESPACE_END //-> /*` @@ -69,4 +69,4 @@ Full support on GCC 4.7.4+, Clang 3.5+, Visual Studio 2015, and XCode 6.4+. */ //] -#endif //CALLABLE_TRAITS_PUSH_FRONT_ARGS_HPP +#endif //BOOST_CLBL_TRTS_PUSH_FRONT_ARGS_HPP diff --git a/include/boost/callable_traits/qualified_parent_class_of.hpp b/include/boost/callable_traits/qualified_parent_class_of.hpp index 296a1f2..227be44 100644 --- a/include/boost/callable_traits/qualified_parent_class_of.hpp +++ b/include/boost/callable_traits/qualified_parent_class_of.hpp @@ -7,12 +7,12 @@ Distributed under the Boost Software License, Version 1.0. */ -#ifndef CALLABLE_TRAITS_QUALIFIED_PARENT_CLASS_OF_HPP -#define CALLABLE_TRAITS_QUALIFIED_PARENT_CLASS_OF_HPP +#ifndef BOOST_CLBL_TRTS_QUALIFIED_PARENT_CLASS_OF_HPP +#define BOOST_CLBL_TRTS_QUALIFIED_PARENT_CLASS_OF_HPP #include -CALLABLE_TRAITS_NAMESPACE_BEGIN +BOOST_CLBL_TRTS_NAMESPACE_BEGIN //[ qualified_parent_class_of_hpp /*` @@ -36,7 +36,7 @@ struct qualified_parent_class_of { }; //<- -CALLABLE_TRAITS_NAMESPACE_END +BOOST_CLBL_TRTS_NAMESPACE_END //-> /*` @@ -69,4 +69,4 @@ Full support on GCC 4.7.4+, Clang 3.5+, Visual Studio 2015, and XCode 6.4+. */ //] -#endif //#ifndef CALLABLE_TRAITS_QUALIFIED_PARENT_CLASS_OF_HPP +#endif //#ifndef BOOST_CLBL_TRTS_QUALIFIED_PARENT_CLASS_OF_HPP diff --git a/include/boost/callable_traits/remove_args.hpp b/include/boost/callable_traits/remove_args.hpp index d89ef35..2c116f6 100644 --- a/include/boost/callable_traits/remove_args.hpp +++ b/include/boost/callable_traits/remove_args.hpp @@ -6,17 +6,17 @@ Distributed under the Boost Software License, Version 1.0. */ -#ifndef CALLABLE_TRAITS_REMOVE_ARGS_HPP -#define CALLABLE_TRAITS_REMOVE_ARGS_HPP +#ifndef BOOST_CLBL_TRTS_REMOVE_ARGS_HPP +#define BOOST_CLBL_TRTS_REMOVE_ARGS_HPP #include #include -CALLABLE_TRAITS_NAMESPACE_BEGIN +BOOST_CLBL_TRTS_NAMESPACE_BEGIN -CALLABLE_TRAITS_DEFINE_SFINAE_ERROR_ORIGIN(remove_args) -CALLABLE_TRAITS_SFINAE_MSG(remove_args, cannot_remove_parameters_from_this_type) -CALLABLE_TRAITS_SFINAE_MSG(remove_args, parameter_list_too_short_to_remove_this_many_parameters) +BOOST_CLBL_TRTS_DEFINE_SFINAE_ERROR_ORIGIN(remove_args) +BOOST_CLBL_TRTS_SFINAE_MSG(remove_args, cannot_remove_parameters_from_this_type) +BOOST_CLBL_TRTS_SFINAE_MSG(remove_args, parameter_list_too_short_to_remove_this_many_parameters) //[ remove_args_hpp /*` @@ -66,7 +66,7 @@ struct remove_args { }; //<- -CALLABLE_TRAITS_NAMESPACE_END +BOOST_CLBL_TRTS_NAMESPACE_END //-> /*` @@ -102,4 +102,4 @@ Full support on GCC 4.7.4+, Clang 3.5+, Visual Studio 2015, and XCode 6.4+. */ //] -#endif //CALLABLE_TRAITS_REMOVE_ARGS_HPP +#endif //BOOST_CLBL_TRTS_REMOVE_ARGS_HPP diff --git a/include/boost/callable_traits/remove_member_const.hpp b/include/boost/callable_traits/remove_member_const.hpp index 5dc836b..4a486c4 100644 --- a/include/boost/callable_traits/remove_member_const.hpp +++ b/include/boost/callable_traits/remove_member_const.hpp @@ -6,12 +6,12 @@ Distributed under the Boost Software License, Version 1.0. */ -#ifndef CALLABLE_TRAITS_REMOVE_MEMBER_CONST_HPP -#define CALLABLE_TRAITS_REMOVE_MEMBER_CONST_HPP +#ifndef BOOST_CLBL_TRTS_REMOVE_MEMBER_CONST_HPP +#define BOOST_CLBL_TRTS_REMOVE_MEMBER_CONST_HPP #include -CALLABLE_TRAITS_NAMESPACE_BEGIN +BOOST_CLBL_TRTS_NAMESPACE_BEGIN //[ remove_member_const_hpp /*` @@ -35,7 +35,7 @@ struct remove_member_const { }; //<- -CALLABLE_TRAITS_NAMESPACE_END +BOOST_CLBL_TRTS_NAMESPACE_END //-> /*` @@ -72,4 +72,4 @@ Full support on GCC 4.7.4+, Clang 3.5+, Visual Studio 2015, and XCode 6.4+. */ //] -#endif //#ifndef CALLABLE_TRAITS_REMOVE_MEMBER_CONST_HPP +#endif //#ifndef BOOST_CLBL_TRTS_REMOVE_MEMBER_CONST_HPP diff --git a/include/boost/callable_traits/remove_member_cv.hpp b/include/boost/callable_traits/remove_member_cv.hpp index a7c6a4b..14c5596 100644 --- a/include/boost/callable_traits/remove_member_cv.hpp +++ b/include/boost/callable_traits/remove_member_cv.hpp @@ -7,12 +7,12 @@ Distributed under the Boost Software License, Version 1.0. */ -#ifndef CALLABLE_TRAITS_REMOVE_MEMBER_CV_HPP -#define CALLABLE_TRAITS_REMOVE_MEMBER_CV_HPP +#ifndef BOOST_CLBL_TRTS_REMOVE_MEMBER_CV_HPP +#define BOOST_CLBL_TRTS_REMOVE_MEMBER_CV_HPP #include -CALLABLE_TRAITS_NAMESPACE_BEGIN +BOOST_CLBL_TRTS_NAMESPACE_BEGIN //[ remove_member_cv_hpp /*` @@ -36,7 +36,7 @@ struct remove_member_cv { }; //<- -CALLABLE_TRAITS_NAMESPACE_END +BOOST_CLBL_TRTS_NAMESPACE_END //-> /*` @@ -74,4 +74,4 @@ Full support on GCC 4.7.4+, Clang 3.5+, Visual Studio 2015, and XCode 6.4+. */ //] -#endif //#ifndef CALLABLE_TRAITS_REMOVE_MEMBER_CV_HPP +#endif //#ifndef BOOST_CLBL_TRTS_REMOVE_MEMBER_CV_HPP diff --git a/include/boost/callable_traits/remove_member_reference.hpp b/include/boost/callable_traits/remove_member_reference.hpp index 2438be3..6e8fa74 100644 --- a/include/boost/callable_traits/remove_member_reference.hpp +++ b/include/boost/callable_traits/remove_member_reference.hpp @@ -6,12 +6,12 @@ Distributed under the Boost Software License, Version 1.0. */ -#ifndef CALLABLE_TRAITS_REMOVE_MEMBER_REFERENCE_HPP -#define CALLABLE_TRAITS_REMOVE_MEMBER_REFERENCE_HPP +#ifndef BOOST_CLBL_TRTS_REMOVE_MEMBER_REFERENCE_HPP +#define BOOST_CLBL_TRTS_REMOVE_MEMBER_REFERENCE_HPP #include -CALLABLE_TRAITS_NAMESPACE_BEGIN +BOOST_CLBL_TRTS_NAMESPACE_BEGIN //[ remove_member_reference_hpp /*` @@ -35,7 +35,7 @@ struct remove_member_reference { }; //<- -CALLABLE_TRAITS_NAMESPACE_END +BOOST_CLBL_TRTS_NAMESPACE_END //-> /*` @@ -71,4 +71,4 @@ Full support on GCC 4.7.4+, Clang 3.5+, Visual Studio 2015, and XCode 6.4+. */ //] -#endif //#ifndef CALLABLE_TRAITS_REMOVE_MEMBER_REFERENCE_HPP +#endif //#ifndef BOOST_CLBL_TRTS_REMOVE_MEMBER_REFERENCE_HPP diff --git a/include/boost/callable_traits/remove_member_volatile.hpp b/include/boost/callable_traits/remove_member_volatile.hpp index 6b68fdc..4662ae3 100644 --- a/include/boost/callable_traits/remove_member_volatile.hpp +++ b/include/boost/callable_traits/remove_member_volatile.hpp @@ -6,12 +6,12 @@ Distributed under the Boost Software License, Version 1.0. */ -#ifndef CALLABLE_TRAITS_REMOVE_MEMBER_VOLATILE_HPP -#define CALLABLE_TRAITS_REMOVE_MEMBER_VOLATILE_HPP +#ifndef BOOST_CLBL_TRTS_REMOVE_MEMBER_VOLATILE_HPP +#define BOOST_CLBL_TRTS_REMOVE_MEMBER_VOLATILE_HPP #include -CALLABLE_TRAITS_NAMESPACE_BEGIN +BOOST_CLBL_TRTS_NAMESPACE_BEGIN //[ remove_member_volatile_hpp /*` @@ -34,7 +34,7 @@ struct remove_member_volatile { using type = remove_member_volatile_t; }; //<- -CALLABLE_TRAITS_NAMESPACE_END +BOOST_CLBL_TRTS_NAMESPACE_END //-> /*` @@ -71,4 +71,4 @@ Full support on GCC 4.7.4+, Clang 3.5+, Visual Studio 2015, and XCode 6.4+. */ //] -#endif //#ifndef CALLABLE_TRAITS_REMOVE_MEMBER_VOLATILE_HPP +#endif //#ifndef BOOST_CLBL_TRTS_REMOVE_MEMBER_VOLATILE_HPP diff --git a/include/boost/callable_traits/remove_noexcept.hpp b/include/boost/callable_traits/remove_noexcept.hpp index a1eb2b1..73f8ab0 100644 --- a/include/boost/callable_traits/remove_noexcept.hpp +++ b/include/boost/callable_traits/remove_noexcept.hpp @@ -7,15 +7,15 @@ Distributed under the Boost Software License, Version 1.0. */ -#ifndef CALLABLE_TRAITS_REMOVE_NOEXCEPT_HPP -#define CALLABLE_TRAITS_REMOVE_NOEXCEPT_HPP +#ifndef BOOST_CLBL_TRTS_REMOVE_NOEXCEPT_HPP +#define BOOST_CLBL_TRTS_REMOVE_NOEXCEPT_HPP #include -CALLABLE_TRAITS_NAMESPACE_BEGIN +BOOST_CLBL_TRTS_NAMESPACE_BEGIN -CALLABLE_TRAITS_DEFINE_SFINAE_ERROR_ORIGIN(remove_noexcept) -CALLABLE_TRAITS_SFINAE_MSG(remove_noexcept, cannot_remove_noexcept_from_this_type) +BOOST_CLBL_TRTS_DEFINE_SFINAE_ERROR_ORIGIN(remove_noexcept) +BOOST_CLBL_TRTS_SFINAE_MSG(remove_noexcept, cannot_remove_noexcept_from_this_type) //[ remove_noexcept_hpp /*` @@ -39,7 +39,7 @@ struct remove_noexcept { }; //<- -CALLABLE_TRAITS_NAMESPACE_END +BOOST_CLBL_TRTS_NAMESPACE_END //-> /*` @@ -80,4 +80,4 @@ Full support on GCC 4.7.4+, Clang 3.5+, Visual Studio 2015, and XCode 6.4+. */ //] -#endif //#ifndef CALLABLE_TRAITS_REMOVE_NOEXCEPT_HPP +#endif //#ifndef BOOST_CLBL_TRTS_REMOVE_NOEXCEPT_HPP diff --git a/include/boost/callable_traits/remove_transaction_safe.hpp b/include/boost/callable_traits/remove_transaction_safe.hpp index e7932dd..6225443 100644 --- a/include/boost/callable_traits/remove_transaction_safe.hpp +++ b/include/boost/callable_traits/remove_transaction_safe.hpp @@ -7,15 +7,15 @@ Distributed under the Boost Software License, Version 1.0. */ -#ifndef CALLABLE_TRAITS_REMOVE_TRANSACTION_SAFE_HPP -#define CALLABLE_TRAITS_REMOVE_TRANSACTION_SAFE_HPP +#ifndef BOOST_CLBL_TRTS_REMOVE_TRANSACTION_SAFE_HPP +#define BOOST_CLBL_TRTS_REMOVE_TRANSACTION_SAFE_HPP #include -CALLABLE_TRAITS_NAMESPACE_BEGIN +BOOST_CLBL_TRTS_NAMESPACE_BEGIN -CALLABLE_TRAITS_DEFINE_SFINAE_ERROR_ORIGIN(remove_transaction_safe) -CALLABLE_TRAITS_SFINAE_MSG(remove_transaction_safe, cannot_remove_transaction_safe_from_this_type) +BOOST_CLBL_TRTS_DEFINE_SFINAE_ERROR_ORIGIN(remove_transaction_safe) +BOOST_CLBL_TRTS_SFINAE_MSG(remove_transaction_safe, cannot_remove_transaction_safe_from_this_type) //[ remove_transaction_safe_hpp /*` @@ -39,7 +39,7 @@ struct remove_transaction_safe { }; //<- -CALLABLE_TRAITS_NAMESPACE_END +BOOST_CLBL_TRTS_NAMESPACE_END //-> /*` @@ -80,4 +80,4 @@ Full support on GCC 4.7.4+, Clang 3.5+, Visual Studio 2015, and XCode 6.4+. */ //] -#endif //#ifndef CALLABLE_TRAITS_REMOVE_TRANSACTION_SAFE_HPP +#endif //#ifndef BOOST_CLBL_TRTS_REMOVE_TRANSACTION_SAFE_HPP diff --git a/include/boost/callable_traits/remove_varargs.hpp b/include/boost/callable_traits/remove_varargs.hpp index dbe0750..e63f2ed 100644 --- a/include/boost/callable_traits/remove_varargs.hpp +++ b/include/boost/callable_traits/remove_varargs.hpp @@ -7,12 +7,12 @@ Distributed under the Boost Software License, Version 1.0. */ -#ifndef CALLABLE_TRAITS_REMOVE_VARARGS_HPP -#define CALLABLE_TRAITS_REMOVE_VARARGS_HPP +#ifndef BOOST_CLBL_TRTS_REMOVE_VARARGS_HPP +#define BOOST_CLBL_TRTS_REMOVE_VARARGS_HPP #include -CALLABLE_TRAITS_NAMESPACE_BEGIN +BOOST_CLBL_TRTS_NAMESPACE_BEGIN //[ remove_varargs_hpp /*` @@ -36,7 +36,7 @@ struct remove_varargs { }; //<- -CALLABLE_TRAITS_NAMESPACE_END +BOOST_CLBL_TRTS_NAMESPACE_END //-> /*` @@ -78,4 +78,4 @@ Full support on GCC 4.7.4+, Clang 3.5+, Visual Studio 2015, and XCode 6.4+. */ //] -#endif //#ifndef CALLABLE_TRAITS_REMOVE_VARARGS_HPP +#endif //#ifndef BOOST_CLBL_TRTS_REMOVE_VARARGS_HPP diff --git a/include/boost/callable_traits/replace_args.hpp b/include/boost/callable_traits/replace_args.hpp index fe18003..c9a005c 100644 --- a/include/boost/callable_traits/replace_args.hpp +++ b/include/boost/callable_traits/replace_args.hpp @@ -6,16 +6,16 @@ Distributed under the Boost Software License, Version 1.0. */ -#ifndef CALLABLE_TRAITS_REPLACE_ARGS_HPP -#define CALLABLE_TRAITS_REPLACE_ARGS_HPP +#ifndef BOOST_CLBL_TRTS_REPLACE_ARGS_HPP +#define BOOST_CLBL_TRTS_REPLACE_ARGS_HPP #include #include -CALLABLE_TRAITS_NAMESPACE_BEGIN +BOOST_CLBL_TRTS_NAMESPACE_BEGIN -CALLABLE_TRAITS_DEFINE_SFINAE_ERROR_ORIGIN(replace_args) -CALLABLE_TRAITS_SFINAE_MSG(replace_args, cannot_replace_parameters_in_this_type) +BOOST_CLBL_TRTS_DEFINE_SFINAE_ERROR_ORIGIN(replace_args) +BOOST_CLBL_TRTS_SFINAE_MSG(replace_args, cannot_replace_parameters_in_this_type) //[ replace_args_hpp /*` @@ -59,7 +59,7 @@ struct replace_args { }; //<- -CALLABLE_TRAITS_NAMESPACE_END +BOOST_CLBL_TRTS_NAMESPACE_END //-> /*` @@ -99,4 +99,4 @@ Full support on GCC 4.7.4+, Clang 3.5+, Visual Studio 2015, and XCode 6.4+. */ //] -#endif //#ifndef CALLABLE_TRAITS_REPLACE_ARGS_HPP +#endif //#ifndef BOOST_CLBL_TRTS_REPLACE_ARGS_HPP diff --git a/include/boost/callable_traits/return_type.hpp b/include/boost/callable_traits/return_type.hpp index 5b5b5b2..09110e7 100644 --- a/include/boost/callable_traits/return_type.hpp +++ b/include/boost/callable_traits/return_type.hpp @@ -7,15 +7,15 @@ Distributed under the Boost Software License, Version 1.0. */ -#ifndef CALLABLE_TRAITS_RESULT_OF_HPP -#define CALLABLE_TRAITS_RESULT_OF_HPP +#ifndef BOOST_CLBL_TRTS_RESULT_OF_HPP +#define BOOST_CLBL_TRTS_RESULT_OF_HPP #include -CALLABLE_TRAITS_NAMESPACE_BEGIN +BOOST_CLBL_TRTS_NAMESPACE_BEGIN -CALLABLE_TRAITS_DEFINE_SFINAE_ERROR_ORIGIN(return_type) -CALLABLE_TRAITS_SFINAE_MSG(return_type, unable_to_determine_return_type) +BOOST_CLBL_TRTS_DEFINE_SFINAE_ERROR_ORIGIN(return_type) +BOOST_CLBL_TRTS_SFINAE_MSG(return_type, unable_to_determine_return_type) //[ return_type_hpp /*` @@ -39,7 +39,7 @@ struct return_type { }; //<- -CALLABLE_TRAITS_NAMESPACE_END +BOOST_CLBL_TRTS_NAMESPACE_END //-> /*` @@ -78,4 +78,4 @@ Full support on GCC 4.7.4+, Clang 3.5+, Visual Studio 2015, and XCode 6.4+. */ //] -#endif //#ifndef CALLABLE_TRAITS_RESULT_OF_HPP +#endif //#ifndef BOOST_CLBL_TRTS_RESULT_OF_HPP diff --git a/scripts/wandbox_deploy.py b/scripts/wandbox_deploy.py old mode 100644 new mode 100755 diff --git a/test/add_member_const.cpp b/test/add_member_const.cpp index f1b338d..332e92a 100644 --- a/test/add_member_const.cpp +++ b/test/add_member_const.cpp @@ -15,18 +15,18 @@ struct foo {}; int main() { { - using f = void(CALLABLE_TRAITS_DEFAULT_VARARGS_CC foo::*)(...); - using l = void(CALLABLE_TRAITS_DEFAULT_VARARGS_CC foo::*)(...) LREF; - using r = void(CALLABLE_TRAITS_DEFAULT_VARARGS_CC foo::*)(...) RREF ; - using c = void(CALLABLE_TRAITS_DEFAULT_VARARGS_CC foo::*)(...) const; - using cl = void(CALLABLE_TRAITS_DEFAULT_VARARGS_CC foo::*)(...) const LREF; - using cr = void(CALLABLE_TRAITS_DEFAULT_VARARGS_CC foo::*)(...) const RREF; - using v = void(CALLABLE_TRAITS_DEFAULT_VARARGS_CC foo::*)(...) volatile; - using vl = void(CALLABLE_TRAITS_DEFAULT_VARARGS_CC foo::*)(...) volatile LREF; - using vr = void(CALLABLE_TRAITS_DEFAULT_VARARGS_CC foo::*)(...) volatile RREF; - using cv = void(CALLABLE_TRAITS_DEFAULT_VARARGS_CC foo::*)(...) const volatile; - using cvl = void(CALLABLE_TRAITS_DEFAULT_VARARGS_CC foo::*)(...) const volatile LREF; - using cvr = void(CALLABLE_TRAITS_DEFAULT_VARARGS_CC foo::*)(...) const volatile RREF; + using f = void(BOOST_CLBL_TRTS_DEFAULT_VARARGS_CC foo::*)(...); + using l = void(BOOST_CLBL_TRTS_DEFAULT_VARARGS_CC foo::*)(...) LREF; + using r = void(BOOST_CLBL_TRTS_DEFAULT_VARARGS_CC foo::*)(...) RREF ; + using c = void(BOOST_CLBL_TRTS_DEFAULT_VARARGS_CC foo::*)(...) const; + using cl = void(BOOST_CLBL_TRTS_DEFAULT_VARARGS_CC foo::*)(...) const LREF; + using cr = void(BOOST_CLBL_TRTS_DEFAULT_VARARGS_CC foo::*)(...) const RREF; + using v = void(BOOST_CLBL_TRTS_DEFAULT_VARARGS_CC foo::*)(...) volatile; + using vl = void(BOOST_CLBL_TRTS_DEFAULT_VARARGS_CC foo::*)(...) volatile LREF; + using vr = void(BOOST_CLBL_TRTS_DEFAULT_VARARGS_CC foo::*)(...) volatile RREF; + using cv = void(BOOST_CLBL_TRTS_DEFAULT_VARARGS_CC foo::*)(...) const volatile; + using cvl = void(BOOST_CLBL_TRTS_DEFAULT_VARARGS_CC foo::*)(...) const volatile LREF; + using cvr = void(BOOST_CLBL_TRTS_DEFAULT_VARARGS_CC foo::*)(...) const volatile RREF; CT_ASSERT(std::is_same>{}); CT_ASSERT(std::is_same>{}); @@ -70,7 +70,7 @@ int main() { CT_ASSERT(std::is_same>{}); } -#ifndef CALLABLE_TRAITS_DISABLE_ABOMINABLE_FUNCTIONS +#ifndef BOOST_CLBL_TRTS_DISABLE_ABOMINABLE_FUNCTIONS { using f = void(); @@ -99,5 +99,5 @@ int main() { CT_ASSERT(std::is_same>{}); CT_ASSERT(std::is_same>{}); } -#endif //#ifndef CALLABLE_TRAITS_DISABLE_ABOMINABLE_FUNCTIONS +#endif //#ifndef BOOST_CLBL_TRTS_DISABLE_ABOMINABLE_FUNCTIONS } diff --git a/test/add_member_cv.cpp b/test/add_member_cv.cpp index 7c98294..cef0601 100644 --- a/test/add_member_cv.cpp +++ b/test/add_member_cv.cpp @@ -15,18 +15,18 @@ struct foo {}; int main() { { - using f = void(CALLABLE_TRAITS_DEFAULT_VARARGS_CC foo::*)(...); - using l = void(CALLABLE_TRAITS_DEFAULT_VARARGS_CC foo::*)(...) LREF; - using r = void(CALLABLE_TRAITS_DEFAULT_VARARGS_CC foo::*)(...) RREF; - using c = void(CALLABLE_TRAITS_DEFAULT_VARARGS_CC foo::*)(...) const; - using cl = void(CALLABLE_TRAITS_DEFAULT_VARARGS_CC foo::*)(...) const LREF; - using cr = void(CALLABLE_TRAITS_DEFAULT_VARARGS_CC foo::*)(...) const RREF; - using v = void(CALLABLE_TRAITS_DEFAULT_VARARGS_CC foo::*)(...) volatile; - using vl = void(CALLABLE_TRAITS_DEFAULT_VARARGS_CC foo::*)(...) volatile LREF; - using vr = void(CALLABLE_TRAITS_DEFAULT_VARARGS_CC foo::*)(...) volatile RREF; - using cv = void(CALLABLE_TRAITS_DEFAULT_VARARGS_CC foo::*)(...) const volatile; - using cvl = void(CALLABLE_TRAITS_DEFAULT_VARARGS_CC foo::*)(...) const volatile LREF; - using cvr = void(CALLABLE_TRAITS_DEFAULT_VARARGS_CC foo::*)(...) const volatile RREF; + using f = void(BOOST_CLBL_TRTS_DEFAULT_VARARGS_CC foo::*)(...); + using l = void(BOOST_CLBL_TRTS_DEFAULT_VARARGS_CC foo::*)(...) LREF; + using r = void(BOOST_CLBL_TRTS_DEFAULT_VARARGS_CC foo::*)(...) RREF; + using c = void(BOOST_CLBL_TRTS_DEFAULT_VARARGS_CC foo::*)(...) const; + using cl = void(BOOST_CLBL_TRTS_DEFAULT_VARARGS_CC foo::*)(...) const LREF; + using cr = void(BOOST_CLBL_TRTS_DEFAULT_VARARGS_CC foo::*)(...) const RREF; + using v = void(BOOST_CLBL_TRTS_DEFAULT_VARARGS_CC foo::*)(...) volatile; + using vl = void(BOOST_CLBL_TRTS_DEFAULT_VARARGS_CC foo::*)(...) volatile LREF; + using vr = void(BOOST_CLBL_TRTS_DEFAULT_VARARGS_CC foo::*)(...) volatile RREF; + using cv = void(BOOST_CLBL_TRTS_DEFAULT_VARARGS_CC foo::*)(...) const volatile; + using cvl = void(BOOST_CLBL_TRTS_DEFAULT_VARARGS_CC foo::*)(...) const volatile LREF; + using cvr = void(BOOST_CLBL_TRTS_DEFAULT_VARARGS_CC foo::*)(...) const volatile RREF; CT_ASSERT(std::is_same>{}); CT_ASSERT(std::is_same>{}); @@ -70,7 +70,7 @@ int main() { CT_ASSERT(std::is_same>{}); } -#ifndef CALLABLE_TRAITS_DISABLE_ABOMINABLE_FUNCTIONS +#ifndef BOOST_CLBL_TRTS_DISABLE_ABOMINABLE_FUNCTIONS { using f = void(); @@ -100,5 +100,5 @@ int main() { CT_ASSERT(std::is_same>{}); } -#endif //#ifndef CALLABLE_TRAITS_DISABLE_ABOMINABLE_FUNCTIONS +#endif //#ifndef BOOST_CLBL_TRTS_DISABLE_ABOMINABLE_FUNCTIONS } diff --git a/test/add_member_lvalue_reference.cpp b/test/add_member_lvalue_reference.cpp index 02ced32..1c00cfe 100644 --- a/test/add_member_lvalue_reference.cpp +++ b/test/add_member_lvalue_reference.cpp @@ -10,7 +10,7 @@ Distributed under the Boost Software License, Version 1.0. #include #include "test.hpp" -#ifdef CALLABLE_TRAITS_DISABLE_REFERENCE_QUALIFIERS +#ifdef BOOST_CLBL_TRTS_DISABLE_REFERENCE_QUALIFIERS int main(){ return 0; } #else @@ -48,18 +48,18 @@ int main() { } { - using f = void(CALLABLE_TRAITS_DEFAULT_VARARGS_CC foo::*)(...); - using l = void(CALLABLE_TRAITS_DEFAULT_VARARGS_CC foo::*)(...) &; - using r = void(CALLABLE_TRAITS_DEFAULT_VARARGS_CC foo::*)(...) &&; - using c = void(CALLABLE_TRAITS_DEFAULT_VARARGS_CC foo::*)(...) const; - using cl = void(CALLABLE_TRAITS_DEFAULT_VARARGS_CC foo::*)(...) const &; - using cr = void(CALLABLE_TRAITS_DEFAULT_VARARGS_CC foo::*)(...) const &&; - using v = void(CALLABLE_TRAITS_DEFAULT_VARARGS_CC foo::*)(...) volatile; - using vl = void(CALLABLE_TRAITS_DEFAULT_VARARGS_CC foo::*)(...) volatile &; - using vr = void(CALLABLE_TRAITS_DEFAULT_VARARGS_CC foo::*)(...) volatile &&; - using cv = void(CALLABLE_TRAITS_DEFAULT_VARARGS_CC foo::*)(...) const volatile; - using cvl = void(CALLABLE_TRAITS_DEFAULT_VARARGS_CC foo::*)(...) const volatile &; - using cvr = void(CALLABLE_TRAITS_DEFAULT_VARARGS_CC foo::*)(...) const volatile &&; + using f = void(BOOST_CLBL_TRTS_DEFAULT_VARARGS_CC foo::*)(...); + using l = void(BOOST_CLBL_TRTS_DEFAULT_VARARGS_CC foo::*)(...) &; + using r = void(BOOST_CLBL_TRTS_DEFAULT_VARARGS_CC foo::*)(...) &&; + using c = void(BOOST_CLBL_TRTS_DEFAULT_VARARGS_CC foo::*)(...) const; + using cl = void(BOOST_CLBL_TRTS_DEFAULT_VARARGS_CC foo::*)(...) const &; + using cr = void(BOOST_CLBL_TRTS_DEFAULT_VARARGS_CC foo::*)(...) const &&; + using v = void(BOOST_CLBL_TRTS_DEFAULT_VARARGS_CC foo::*)(...) volatile; + using vl = void(BOOST_CLBL_TRTS_DEFAULT_VARARGS_CC foo::*)(...) volatile &; + using vr = void(BOOST_CLBL_TRTS_DEFAULT_VARARGS_CC foo::*)(...) volatile &&; + using cv = void(BOOST_CLBL_TRTS_DEFAULT_VARARGS_CC foo::*)(...) const volatile; + using cvl = void(BOOST_CLBL_TRTS_DEFAULT_VARARGS_CC foo::*)(...) const volatile &; + using cvr = void(BOOST_CLBL_TRTS_DEFAULT_VARARGS_CC foo::*)(...) const volatile &&; CT_ASSERT(std::is_same>{}); CT_ASSERT(std::is_same>{}); @@ -105,7 +105,7 @@ int main() { CT_ASSERT(!std::is_same>{}); } - #ifdef CALLABLE_TRAITS_ENABLE_TRANSACTION_SAFE + #ifdef BOOST_CLBL_TRTS_ENABLE_TRANSACTION_SAFE { using f = void(...) transaction_safe; using l = void(...) & transaction_safe; @@ -135,9 +135,9 @@ int main() { CT_ASSERT(!std::is_same>{}); } - #endif // #ifdef CALLABLE_TRAITS_ENABLE_TRANSACTION_SAFE + #endif // #ifdef BOOST_CLBL_TRTS_ENABLE_TRANSACTION_SAFE - #ifdef CALLABLE_TRAITS_ENABLE_NOEXCEPT_TYPES + #ifdef BOOST_CLBL_TRTS_ENABLE_NOEXCEPT_TYPES { using f = void(...) noexcept; using l = void(...) & noexcept; @@ -166,10 +166,10 @@ int main() { CT_ASSERT(!std::is_same>{}); CT_ASSERT(!std::is_same>{}); } - #endif // #ifdef CALLABLE_TRAITS_ENABLE_NOEXCEPT_TYPES + #endif // #ifdef BOOST_CLBL_TRTS_ENABLE_NOEXCEPT_TYPES - #ifdef CALLABLE_TRAITS_ENABLE_NOEXCEPT_TYPES - #ifdef CALLABLE_TRAITS_ENABLE_TRANSACTION_SAFE + #ifdef BOOST_CLBL_TRTS_ENABLE_NOEXCEPT_TYPES + #ifdef BOOST_CLBL_TRTS_ENABLE_TRANSACTION_SAFE { using f = void(...) transaction_safe noexcept; using l = void(...) & transaction_safe noexcept; @@ -198,9 +198,9 @@ int main() { CT_ASSERT(!std::is_same>{}); CT_ASSERT(!std::is_same>{}); } - #endif // #ifdef CALLABLE_TRAITS_ENABLE_TRANSACTION_SAFE - #endif // #ifdef CALLABLE_TRAITS_ENABLE_NOEXCEPT_TYPES + #endif // #ifdef BOOST_CLBL_TRTS_ENABLE_TRANSACTION_SAFE + #endif // #ifdef BOOST_CLBL_TRTS_ENABLE_NOEXCEPT_TYPES } -#endif //#ifdef CALLABLE_TRAITS_DISABLE_REFERENCE_QUALIFIERS +#endif //#ifdef BOOST_CLBL_TRTS_DISABLE_REFERENCE_QUALIFIERS diff --git a/test/add_member_rvalue_reference.cpp b/test/add_member_rvalue_reference.cpp index 80709fb..32fe166 100644 --- a/test/add_member_rvalue_reference.cpp +++ b/test/add_member_rvalue_reference.cpp @@ -10,7 +10,7 @@ Distributed under the Boost Software License, Version 1.0. #include #include "test.hpp" -#ifdef CALLABLE_TRAITS_DISABLE_REFERENCE_QUALIFIERS +#ifdef BOOST_CLBL_TRTS_DISABLE_REFERENCE_QUALIFIERS int main(){ return 0; } #else @@ -164,4 +164,4 @@ int main() { } } -#endif //#ifdef CALLABLE_TRAITS_DISABLE_REFERENCE_QUALIFIERS +#endif //#ifdef BOOST_CLBL_TRTS_DISABLE_REFERENCE_QUALIFIERS diff --git a/test/add_member_volatile.cpp b/test/add_member_volatile.cpp index 8583f5b..97cadbc 100644 --- a/test/add_member_volatile.cpp +++ b/test/add_member_volatile.cpp @@ -42,7 +42,7 @@ int main() { CT_ASSERT(std::is_same>{}); } -#ifndef CALLABLE_TRAITS_DISABLE_ABOMINABLE_FUNCTIONS +#ifndef BOOST_CLBL_TRTS_DISABLE_ABOMINABLE_FUNCTIONS { using f = foo(); diff --git a/test/add_transaction_safe.cpp b/test/add_transaction_safe.cpp index 31659a0..fbcc3be 100644 --- a/test/add_transaction_safe.cpp +++ b/test/add_transaction_safe.cpp @@ -8,7 +8,7 @@ Distributed under the Boost Software License, Version 1.0. #include -#ifndef CALLABLE_TRAITS_ENABLE_TRANSACTION_SAFE +#ifndef BOOST_CLBL_TRTS_ENABLE_TRANSACTION_SAFE int main(){} #else diff --git a/test/add_transaction_safe_constraints.cpp b/test/add_transaction_safe_constraints.cpp index 5986956..ecd0787 100644 --- a/test/add_transaction_safe_constraints.cpp +++ b/test/add_transaction_safe_constraints.cpp @@ -10,7 +10,7 @@ Distributed under the Boost Software License, Version 1.0. #include #include "test.hpp" -#ifndef CALLABLE_TRAITS_ENABLE_TRANSACTION_SAFE +#ifndef BOOST_CLBL_TRTS_ENABLE_TRANSACTION_SAFE int main(){} #else @@ -34,4 +34,4 @@ int main() { assert_sfinae(); } -#endif //#ifndef CALLABLE_TRAITS_ENABLE_TRANSACTION_SAFE +#endif //#ifndef BOOST_CLBL_TRTS_ENABLE_TRANSACTION_SAFE diff --git a/test/add_varargs.cpp b/test/add_varargs.cpp index 8fd32b4..1f23090 100644 --- a/test/add_varargs.cpp +++ b/test/add_varargs.cpp @@ -28,18 +28,18 @@ int main() { using cvl = void(foo::*)() const volatile LREF; using cvr = void(foo::*)() const volatile RREF; - using va_f = void(CALLABLE_TRAITS_DEFAULT_VARARGS_CC foo::*)(...); - using va_l = void(CALLABLE_TRAITS_DEFAULT_VARARGS_CC foo::*)(...) LREF; - using va_r = void(CALLABLE_TRAITS_DEFAULT_VARARGS_CC foo::*)(...) RREF ; - using va_c = void(CALLABLE_TRAITS_DEFAULT_VARARGS_CC foo::*)(...) const; - using va_cl = void(CALLABLE_TRAITS_DEFAULT_VARARGS_CC foo::*)(...) const LREF; - using va_cr = void(CALLABLE_TRAITS_DEFAULT_VARARGS_CC foo::*)(...) const RREF; - using va_v = void(CALLABLE_TRAITS_DEFAULT_VARARGS_CC foo::*)(...) volatile; - using va_vl = void(CALLABLE_TRAITS_DEFAULT_VARARGS_CC foo::*)(...) volatile LREF; - using va_vr = void(CALLABLE_TRAITS_DEFAULT_VARARGS_CC foo::*)(...) volatile RREF; - using va_cv = void(CALLABLE_TRAITS_DEFAULT_VARARGS_CC foo::*)(...) const volatile; - using va_cvl = void(CALLABLE_TRAITS_DEFAULT_VARARGS_CC foo::*)(...) const volatile LREF; - using va_cvr = void(CALLABLE_TRAITS_DEFAULT_VARARGS_CC foo::*)(...) const volatile RREF; + using va_f = void(BOOST_CLBL_TRTS_DEFAULT_VARARGS_CC foo::*)(...); + using va_l = void(BOOST_CLBL_TRTS_DEFAULT_VARARGS_CC foo::*)(...) LREF; + using va_r = void(BOOST_CLBL_TRTS_DEFAULT_VARARGS_CC foo::*)(...) RREF ; + using va_c = void(BOOST_CLBL_TRTS_DEFAULT_VARARGS_CC foo::*)(...) const; + using va_cl = void(BOOST_CLBL_TRTS_DEFAULT_VARARGS_CC foo::*)(...) const LREF; + using va_cr = void(BOOST_CLBL_TRTS_DEFAULT_VARARGS_CC foo::*)(...) const RREF; + using va_v = void(BOOST_CLBL_TRTS_DEFAULT_VARARGS_CC foo::*)(...) volatile; + using va_vl = void(BOOST_CLBL_TRTS_DEFAULT_VARARGS_CC foo::*)(...) volatile LREF; + using va_vr = void(BOOST_CLBL_TRTS_DEFAULT_VARARGS_CC foo::*)(...) volatile RREF; + using va_cv = void(BOOST_CLBL_TRTS_DEFAULT_VARARGS_CC foo::*)(...) const volatile; + using va_cvl = void(BOOST_CLBL_TRTS_DEFAULT_VARARGS_CC foo::*)(...) const volatile LREF; + using va_cvr = void(BOOST_CLBL_TRTS_DEFAULT_VARARGS_CC foo::*)(...) const volatile RREF; CT_ASSERT(std::is_same>{}); CT_ASSERT(std::is_same>{}); @@ -82,18 +82,18 @@ int main() { using cvl = void(foo::*)(int&, int&&) const volatile LREF; using cvr = void(foo::*)(int&, int&&) const volatile RREF; - using va_f = void(CALLABLE_TRAITS_DEFAULT_VARARGS_CC foo::*)(int&, int&&, ...); - using va_l = void(CALLABLE_TRAITS_DEFAULT_VARARGS_CC foo::*)(int&, int&&, ...) LREF; - using va_r = void(CALLABLE_TRAITS_DEFAULT_VARARGS_CC foo::*)(int&, int&&, ...) RREF ; - using va_c = void(CALLABLE_TRAITS_DEFAULT_VARARGS_CC foo::*)(int&, int&&, ...) const; - using va_cl = void(CALLABLE_TRAITS_DEFAULT_VARARGS_CC foo::*)(int&, int&&, ...) const LREF; - using va_cr = void(CALLABLE_TRAITS_DEFAULT_VARARGS_CC foo::*)(int&, int&&, ...) const RREF; - using va_v = void(CALLABLE_TRAITS_DEFAULT_VARARGS_CC foo::*)(int&, int&&, ...) volatile; - using va_vl = void(CALLABLE_TRAITS_DEFAULT_VARARGS_CC foo::*)(int&, int&&, ...) volatile LREF; - using va_vr = void(CALLABLE_TRAITS_DEFAULT_VARARGS_CC foo::*)(int&, int&&, ...) volatile RREF; - using va_cv = void(CALLABLE_TRAITS_DEFAULT_VARARGS_CC foo::*)(int&, int&&, ...) const volatile; - using va_cvl = void(CALLABLE_TRAITS_DEFAULT_VARARGS_CC foo::*)(int&, int&&, ...) const volatile LREF; - using va_cvr = void(CALLABLE_TRAITS_DEFAULT_VARARGS_CC foo::*)(int&, int&&, ...) const volatile RREF; + using va_f = void(BOOST_CLBL_TRTS_DEFAULT_VARARGS_CC foo::*)(int&, int&&, ...); + using va_l = void(BOOST_CLBL_TRTS_DEFAULT_VARARGS_CC foo::*)(int&, int&&, ...) LREF; + using va_r = void(BOOST_CLBL_TRTS_DEFAULT_VARARGS_CC foo::*)(int&, int&&, ...) RREF ; + using va_c = void(BOOST_CLBL_TRTS_DEFAULT_VARARGS_CC foo::*)(int&, int&&, ...) const; + using va_cl = void(BOOST_CLBL_TRTS_DEFAULT_VARARGS_CC foo::*)(int&, int&&, ...) const LREF; + using va_cr = void(BOOST_CLBL_TRTS_DEFAULT_VARARGS_CC foo::*)(int&, int&&, ...) const RREF; + using va_v = void(BOOST_CLBL_TRTS_DEFAULT_VARARGS_CC foo::*)(int&, int&&, ...) volatile; + using va_vl = void(BOOST_CLBL_TRTS_DEFAULT_VARARGS_CC foo::*)(int&, int&&, ...) volatile LREF; + using va_vr = void(BOOST_CLBL_TRTS_DEFAULT_VARARGS_CC foo::*)(int&, int&&, ...) volatile RREF; + using va_cv = void(BOOST_CLBL_TRTS_DEFAULT_VARARGS_CC foo::*)(int&, int&&, ...) const volatile; + using va_cvl = void(BOOST_CLBL_TRTS_DEFAULT_VARARGS_CC foo::*)(int&, int&&, ...) const volatile LREF; + using va_cvr = void(BOOST_CLBL_TRTS_DEFAULT_VARARGS_CC foo::*)(int&, int&&, ...) const volatile RREF; CT_ASSERT(std::is_same>{}); CT_ASSERT(std::is_same>{}); @@ -122,7 +122,7 @@ int main() { CT_ASSERT(std::is_same>{}); } -#ifndef CALLABLE_TRAITS_DISABLE_ABOMINABLE_FUNCTIONS +#ifndef BOOST_CLBL_TRTS_DISABLE_ABOMINABLE_FUNCTIONS { using f = void(); @@ -178,7 +178,7 @@ int main() { CT_ASSERT(std::is_same>{}); } -#endif //#ifndef CALLABLE_TRAITS_DISABLE_ABOMINABLE_FUNCTIONS +#endif //#ifndef BOOST_CLBL_TRTS_DISABLE_ABOMINABLE_FUNCTIONS { using f = void(&)(); diff --git a/test/apply_member_pointer_function.cpp b/test/apply_member_pointer_function.cpp index d7df3d9..cd92095 100644 --- a/test/apply_member_pointer_function.cpp +++ b/test/apply_member_pointer_function.cpp @@ -20,7 +20,7 @@ int main() { test_case(); -#ifndef CALLABLE_TRAITS_DISABLE_ABOMINABLE_FUNCTIONS +#ifndef BOOST_CLBL_TRTS_DISABLE_ABOMINABLE_FUNCTIONS test_case(); test_case(); test_case(); @@ -42,7 +42,7 @@ int main() { test_case(); -#ifndef CALLABLE_TRAITS_DISABLE_ABOMINABLE_FUNCTIONS +#ifndef BOOST_CLBL_TRTS_DISABLE_ABOMINABLE_FUNCTIONS test_case(); test_case(); test_case(); @@ -63,12 +63,12 @@ int main() { #endif //MSVC doesn't like varargs on abominable functions -#ifndef CALLABLE_TRAITS_MSVC +#ifndef BOOST_CLBL_TRTS_MSVC test_case(); -#ifndef CALLABLE_TRAITS_DISABLE_ABOMINABLE_FUNCTIONS +#ifndef BOOST_CLBL_TRTS_DISABLE_ABOMINABLE_FUNCTIONS test_case(); test_case(); test_case(); @@ -86,11 +86,11 @@ int main() { test_case(); test_case(); test_case(); -#endif //#ifndef CALLABLE_TRAITS_DISABLE_ABOMINABLE_FUNCTIONS +#endif //#ifndef BOOST_CLBL_TRTS_DISABLE_ABOMINABLE_FUNCTIONS test_case(); -#ifndef CALLABLE_TRAITS_DISABLE_ABOMINABLE_FUNCTIONS +#ifndef BOOST_CLBL_TRTS_DISABLE_ABOMINABLE_FUNCTIONS test_case(); test_case(); test_case(); @@ -108,7 +108,7 @@ int main() { test_case(); test_case(); test_case(); -#endif //#ifndef CALLABLE_TRAITS_DISABLE_ABOMINABLE_FUNCTIONS -#endif //#ifndef CALLABLE_TRAITS_MSVC +#endif //#ifndef BOOST_CLBL_TRTS_DISABLE_ABOMINABLE_FUNCTIONS +#endif //#ifndef BOOST_CLBL_TRTS_MSVC } diff --git a/test/args_pack_manipulations.cpp b/test/args_pack_manipulations.cpp index b374860..76cda96 100644 --- a/test/args_pack_manipulations.cpp +++ b/test/args_pack_manipulations.cpp @@ -7,19 +7,19 @@ #include "test.hpp" -CALLABLE_TRAITS_DETAIL_NAMESPACE_BEGIN +BOOST_CLBL_TRTS_DETAIL_NAMESPACE_BEGIN template struct pack { -#define CALLABLE_TRAITS_BEGIN_PACK_MANIP void( -#define CALLABLE_TRAITS_ARGS_PACK Ts -#define CALLABLE_TRAITS_END_PACK_MANIP , ... ) +#define BOOST_CLBL_TRTS_BEGIN_PACK_MANIP void( +#define BOOST_CLBL_TRTS_ARGS_PACK Ts +#define BOOST_CLBL_TRTS_END_PACK_MANIP , ... ) #include }; -CALLABLE_TRAITS_DETAIL_NAMESPACE_END +BOOST_CLBL_TRTS_DETAIL_NAMESPACE_END using namespace boost::callable_traits::detail; diff --git a/test/clear_args.cpp b/test/clear_args.cpp index 8dbb9f0..b73f127 100644 --- a/test/clear_args.cpp +++ b/test/clear_args.cpp @@ -15,14 +15,14 @@ int main() { CT_ASSERT(std::is_same::value); } -#ifndef CALLABLE_TRAITS_DISABLE_ABOMINABLE_FUNCTIONS +#ifndef BOOST_CLBL_TRTS_DISABLE_ABOMINABLE_FUNCTIONS { using f = void(int, int, int, int, int) const; using test = clear_args_t; using expect = void() const; CT_ASSERT(std::is_same::value); } -#endif // #ifndef CALLABLE_TRAITS_DISABLE_ABOMINABLE_FUNCTIONS +#endif // #ifndef BOOST_CLBL_TRTS_DISABLE_ABOMINABLE_FUNCTIONS { using f = void(*)(int, int, int, int, int); diff --git a/test/expand_args_left.cpp b/test/expand_args_left.cpp index e8790b1..a622ff7 100644 --- a/test/expand_args_left.cpp +++ b/test/expand_args_left.cpp @@ -18,14 +18,14 @@ int main() { CT_ASSERT(std::is_same::value); } -#ifndef CALLABLE_TRAITS_DISABLE_ABOMINABLE_FUNCTIONS +#ifndef BOOST_CLBL_TRTS_DISABLE_ABOMINABLE_FUNCTIONS { using f = void(N<0>, N<1>) const volatile; using test = expand_args_left_t; using expect = std::tuple< N<0>, N<1>, char, int>; CT_ASSERT(std::is_same::value); } -#endif // #ifndef CALLABLE_TRAITS_DISABLE_ABOMINABLE_FUNCTIONS +#endif // #ifndef BOOST_CLBL_TRTS_DISABLE_ABOMINABLE_FUNCTIONS { using f = void(&)(N<0>, N<1>); diff --git a/test/expand_args_right.cpp b/test/expand_args_right.cpp index 9760c4c..8691eda 100644 --- a/test/expand_args_right.cpp +++ b/test/expand_args_right.cpp @@ -18,14 +18,14 @@ int main() { CT_ASSERT(std::is_same::value); } -#ifndef CALLABLE_TRAITS_DISABLE_ABOMINABLE_FUNCTIONS +#ifndef BOOST_CLBL_TRTS_DISABLE_ABOMINABLE_FUNCTIONS { using f = void(N<0>, N<1>) const volatile; using test = expand_args_right_t; using expect = std::tuple, N<1>>; CT_ASSERT(std::is_same::value); } -#endif // #ifndef CALLABLE_TRAITS_DISABLE_ABOMINABLE_FUNCTIONS +#endif // #ifndef BOOST_CLBL_TRTS_DISABLE_ABOMINABLE_FUNCTIONS { using f = void(&)(N<0>, N<1>); diff --git a/test/has_member_qualifiers.cpp b/test/has_member_qualifiers.cpp index 3b3fbf9..399833b 100644 --- a/test/has_member_qualifiers.cpp +++ b/test/has_member_qualifiers.cpp @@ -11,7 +11,7 @@ Distributed under the Boost Software License, Version 1.0. #include "test.hpp" -#ifdef CALLABLE_TRAITS_DISABLE_REFERENCE_QUALIFIERS +#ifdef BOOST_CLBL_TRTS_DISABLE_REFERENCE_QUALIFIERS int main() { return 0; } #else @@ -86,7 +86,7 @@ int main() { assert_qualified(); } -#ifndef CALLABLE_TRAITS_DISABLE_ABOMINABLE_FUNCTIONS +#ifndef BOOST_CLBL_TRTS_DISABLE_ABOMINABLE_FUNCTIONS { using f = void(); @@ -116,7 +116,7 @@ int main() { CT_ASSERT( has_member_qualifiers()); } -#endif //#ifndef CALLABLE_TRAITS_DISABLE_ABOMINABLE_FUNCTIONS +#endif //#ifndef BOOST_CLBL_TRTS_DISABLE_ABOMINABLE_FUNCTIONS using f_ptr = void(*)(); assert_unqualified(); @@ -125,4 +125,4 @@ int main() { assert_unqualified(); } -#endif //#ifdef CALLABLE_TRAITS_DISABLE_REFERENCE_QUALIFIERS +#endif //#ifdef BOOST_CLBL_TRTS_DISABLE_REFERENCE_QUALIFIERS diff --git a/test/has_varargs.cpp b/test/has_varargs.cpp index ffb8f11..a39cfa1 100644 --- a/test/has_varargs.cpp +++ b/test/has_varargs.cpp @@ -64,18 +64,18 @@ int main() { } { - using f = void(CALLABLE_TRAITS_DEFAULT_VARARGS_CC foo::*)(...); - using l = void(CALLABLE_TRAITS_DEFAULT_VARARGS_CC foo::*)(...) LREF; - using r = void(CALLABLE_TRAITS_DEFAULT_VARARGS_CC foo::*)(...) RREF ; - using c = void(CALLABLE_TRAITS_DEFAULT_VARARGS_CC foo::*)(...) const; - using cl = void(CALLABLE_TRAITS_DEFAULT_VARARGS_CC foo::*)(...) const LREF; - using cr = void(CALLABLE_TRAITS_DEFAULT_VARARGS_CC foo::*)(...) const RREF; - using v = void(CALLABLE_TRAITS_DEFAULT_VARARGS_CC foo::*)(...) volatile; - using vl = void(CALLABLE_TRAITS_DEFAULT_VARARGS_CC foo::*)(...) volatile LREF; - using vr = void(CALLABLE_TRAITS_DEFAULT_VARARGS_CC foo::*)(...) volatile RREF; - using cv = void(CALLABLE_TRAITS_DEFAULT_VARARGS_CC foo::*)(...) const volatile; - using cvl = void(CALLABLE_TRAITS_DEFAULT_VARARGS_CC foo::*)(...) const volatile LREF; - using cvr = void(CALLABLE_TRAITS_DEFAULT_VARARGS_CC foo::*)(...) const volatile RREF; + using f = void(BOOST_CLBL_TRTS_DEFAULT_VARARGS_CC foo::*)(...); + using l = void(BOOST_CLBL_TRTS_DEFAULT_VARARGS_CC foo::*)(...) LREF; + using r = void(BOOST_CLBL_TRTS_DEFAULT_VARARGS_CC foo::*)(...) RREF ; + using c = void(BOOST_CLBL_TRTS_DEFAULT_VARARGS_CC foo::*)(...) const; + using cl = void(BOOST_CLBL_TRTS_DEFAULT_VARARGS_CC foo::*)(...) const LREF; + using cr = void(BOOST_CLBL_TRTS_DEFAULT_VARARGS_CC foo::*)(...) const RREF; + using v = void(BOOST_CLBL_TRTS_DEFAULT_VARARGS_CC foo::*)(...) volatile; + using vl = void(BOOST_CLBL_TRTS_DEFAULT_VARARGS_CC foo::*)(...) volatile LREF; + using vr = void(BOOST_CLBL_TRTS_DEFAULT_VARARGS_CC foo::*)(...) volatile RREF; + using cv = void(BOOST_CLBL_TRTS_DEFAULT_VARARGS_CC foo::*)(...) const volatile; + using cvl = void(BOOST_CLBL_TRTS_DEFAULT_VARARGS_CC foo::*)(...) const volatile LREF; + using cvr = void(BOOST_CLBL_TRTS_DEFAULT_VARARGS_CC foo::*)(...) const volatile RREF; assert_has_varargs(); assert_has_varargs(); @@ -147,7 +147,7 @@ int main() { assert_has_varargs(); } -#ifndef CALLABLE_TRAITS_DISABLE_ABOMINABLE_FUNCTIONS +#ifndef BOOST_CLBL_TRTS_DISABLE_ABOMINABLE_FUNCTIONS { using f = void(); @@ -205,7 +205,7 @@ int main() { CT_ASSERT( has_varargs()); } -#endif //#ifndef CALLABLE_TRAITS_DISABLE_ABOMINABLE_FUNCTIONS +#endif //#ifndef BOOST_CLBL_TRTS_DISABLE_ABOMINABLE_FUNCTIONS assert_not_has_varargs(); assert_has_varargs(); diff --git a/test/has_void_return.cpp b/test/has_void_return.cpp index d806ba6..ed1fda1 100644 --- a/test/has_void_return.cpp +++ b/test/has_void_return.cpp @@ -21,23 +21,23 @@ int main() { assert_void_return(); assert_void_return(); -#ifndef CALLABLE_TRAITS_DISABLE_ABOMINABLE_FUNCTIONS +#ifndef BOOST_CLBL_TRTS_DISABLE_ABOMINABLE_FUNCTIONS assert_void_return(); assert_void_return(); assert_void_return(); -#endif // #ifndef CALLABLE_TRAITS_DISABLE_ABOMINABLE_FUNCTIONS +#endif // #ifndef BOOST_CLBL_TRTS_DISABLE_ABOMINABLE_FUNCTIONS assert_void_return(); - assert_void_return(); + assert_void_return(); assert_void_return(); assert_void_return(); assert_void_return(); assert_void_return(); - assert_void_return(); + assert_void_return(); assert_void_return(); - assert_void_return(); + assert_void_return(); auto lambda = []{}; assert_void_return(); diff --git a/test/is_const_member.cpp b/test/is_const_member.cpp index 3511dc8..f4f8c15 100644 --- a/test/is_const_member.cpp +++ b/test/is_const_member.cpp @@ -81,7 +81,7 @@ int main() { assert_const_qualified(); } -#ifndef CALLABLE_TRAITS_DISABLE_ABOMINABLE_FUNCTIONS +#ifndef BOOST_CLBL_TRTS_DISABLE_ABOMINABLE_FUNCTIONS { using f = void(); diff --git a/test/is_cv_member.cpp b/test/is_cv_member.cpp index f26aa11..3eec1c4 100644 --- a/test/is_cv_member.cpp +++ b/test/is_cv_member.cpp @@ -81,7 +81,7 @@ int main() { assert_cv_qualified(); } -#ifndef CALLABLE_TRAITS_DISABLE_ABOMINABLE_FUNCTIONS +#ifndef BOOST_CLBL_TRTS_DISABLE_ABOMINABLE_FUNCTIONS { using f = void(); diff --git a/test/is_lvalue_reference_member.cpp b/test/is_lvalue_reference_member.cpp index 16f76e5..c84c498 100644 --- a/test/is_lvalue_reference_member.cpp +++ b/test/is_lvalue_reference_member.cpp @@ -11,7 +11,7 @@ Distributed under the Boost Software License, Version 1.0. #include "test.hpp" -#ifdef CALLABLE_TRAITS_DISABLE_REFERENCE_QUALIFIERS +#ifdef BOOST_CLBL_TRTS_DISABLE_REFERENCE_QUALIFIERS int main(){ return 0; } #else @@ -123,4 +123,4 @@ int main() { assert_not_lvalue_qualified(); } -#endif //#ifdef CALLABLE_TRAITS_DISABLE_REFERENCE_QUALIFIERS +#endif //#ifdef BOOST_CLBL_TRTS_DISABLE_REFERENCE_QUALIFIERS diff --git a/test/is_rvalue_reference_member.cpp b/test/is_rvalue_reference_member.cpp index c3f1710..fbad4fc 100644 --- a/test/is_rvalue_reference_member.cpp +++ b/test/is_rvalue_reference_member.cpp @@ -11,7 +11,7 @@ Distributed under the Boost Software License, Version 1.0. #include "test.hpp" -#ifdef CALLABLE_TRAITS_DISABLE_REFERENCE_QUALIFIERS +#ifdef BOOST_CLBL_TRTS_DISABLE_REFERENCE_QUALIFIERS int main(){ return 0; } #else @@ -123,4 +123,4 @@ int main() { assert_not_rvalue_qualified(); } -#endif //#ifdef CALLABLE_TRAITS_DISABLE_REFERENCE_QUALIFIERS +#endif //#ifdef BOOST_CLBL_TRTS_DISABLE_REFERENCE_QUALIFIERS diff --git a/test/is_transaction_safe.cpp b/test/is_transaction_safe.cpp index f9231b4..7249faf 100644 --- a/test/is_transaction_safe.cpp +++ b/test/is_transaction_safe.cpp @@ -7,7 +7,7 @@ Distributed under the Boost Software License, Version 1.0. #include -#ifndef CALLABLE_TRAITS_ENABLE_TRANSACTION_SAFE +#ifndef BOOST_CLBL_TRTS_ENABLE_TRANSACTION_SAFE int main(){} #else diff --git a/test/is_volatile_member.cpp b/test/is_volatile_member.cpp index 62175a4..13f2588 100644 --- a/test/is_volatile_member.cpp +++ b/test/is_volatile_member.cpp @@ -81,7 +81,7 @@ int main() { assert_volatile_qualified(); } -#ifndef CALLABLE_TRAITS_DISABLE_ABOMINABLE_FUNCTIONS +#ifndef BOOST_CLBL_TRTS_DISABLE_ABOMINABLE_FUNCTIONS { using f = void(); @@ -111,7 +111,7 @@ int main() { CT_ASSERT( is_volatile_member()); } -#endif //#ifndef CALLABLE_TRAITS_DISABLE_ABOMINABLE_FUNCTIONS +#endif //#ifndef BOOST_CLBL_TRTS_DISABLE_ABOMINABLE_FUNCTIONS using f_ptr = void(*)(); assert_not_volatile_qualified(); diff --git a/test/parent_class_of.cpp b/test/parent_class_of.cpp index 3f0779e..2009ad2 100644 --- a/test/parent_class_of.cpp +++ b/test/parent_class_of.cpp @@ -30,7 +30,7 @@ int main() { } { - using f = void(CALLABLE_TRAITS_DEFAULT_VARARGS_CC foo::*)(int, ...) const volatile; + using f = void(BOOST_CLBL_TRTS_DEFAULT_VARARGS_CC foo::*)(int, ...) const volatile; using test = parent_class_of_t; using expect = foo; CT_ASSERT(std::is_same::value); diff --git a/test/qualified_parent_class_of.cpp b/test/qualified_parent_class_of.cpp index b4055f5..502c95b 100644 --- a/test/qualified_parent_class_of.cpp +++ b/test/qualified_parent_class_of.cpp @@ -30,7 +30,7 @@ int main() { } { - using f = void(CALLABLE_TRAITS_DEFAULT_VARARGS_CC foo::*)(int, ...) const volatile; + using f = void(BOOST_CLBL_TRTS_DEFAULT_VARARGS_CC foo::*)(int, ...) const volatile; using test = qualified_parent_class_of_t; using expect = foo const volatile &; CT_ASSERT(std::is_same::value); diff --git a/test/qualifier_metafunction_constraints.cpp b/test/qualifier_metafunction_constraints.cpp index b8679db..e78f651 100644 --- a/test/qualifier_metafunction_constraints.cpp +++ b/test/qualifier_metafunction_constraints.cpp @@ -30,7 +30,7 @@ int main() { #include "qualifier_metafunction_constraints.hpp" #undef CALLABLE_TRAIT_UNDER_TEST -#ifndef CALLABLE_TRAITS_DISABLE_REFERENCE_QUALIFIERS +#ifndef BOOST_CLBL_TRTS_DISABLE_REFERENCE_QUALIFIERS #define CALLABLE_TRAIT_UNDER_TEST add_member_lvalue_reference_t #include "qualifier_metafunction_constraints.hpp" @@ -44,7 +44,7 @@ int main() { #include "qualifier_metafunction_constraints.hpp" #undef CALLABLE_TRAIT_UNDER_TEST -#endif // #ifndef CALLABLE_TRAITS_DISABLE_REFERENCE_QUALIFIERS +#endif // #ifndef BOOST_CLBL_TRTS_DISABLE_REFERENCE_QUALIFIERS } diff --git a/test/remove_member_const.cpp b/test/remove_member_const.cpp index fbfb517..3072ae3 100644 --- a/test/remove_member_const.cpp +++ b/test/remove_member_const.cpp @@ -17,18 +17,18 @@ struct foo {}; int main() { { - using f = void(CALLABLE_TRAITS_DEFAULT_VARARGS_CC foo::*)(...); - using l = void(CALLABLE_TRAITS_DEFAULT_VARARGS_CC foo::*)(...) LREF; - using r = void(CALLABLE_TRAITS_DEFAULT_VARARGS_CC foo::*)(...) RREF ; - using c = void(CALLABLE_TRAITS_DEFAULT_VARARGS_CC foo::*)(...) const; - using cl = void(CALLABLE_TRAITS_DEFAULT_VARARGS_CC foo::*)(...) const LREF; - using cr = void(CALLABLE_TRAITS_DEFAULT_VARARGS_CC foo::*)(...) const RREF; - using v = void(CALLABLE_TRAITS_DEFAULT_VARARGS_CC foo::*)(...) volatile; - using vl = void(CALLABLE_TRAITS_DEFAULT_VARARGS_CC foo::*)(...) volatile LREF; - using vr = void(CALLABLE_TRAITS_DEFAULT_VARARGS_CC foo::*)(...) volatile RREF; - using cv = void(CALLABLE_TRAITS_DEFAULT_VARARGS_CC foo::*)(...) const volatile; - using cvl = void(CALLABLE_TRAITS_DEFAULT_VARARGS_CC foo::*)(...) const volatile LREF; - using cvr = void(CALLABLE_TRAITS_DEFAULT_VARARGS_CC foo::*)(...) const volatile RREF; + using f = void(BOOST_CLBL_TRTS_DEFAULT_VARARGS_CC foo::*)(...); + using l = void(BOOST_CLBL_TRTS_DEFAULT_VARARGS_CC foo::*)(...) LREF; + using r = void(BOOST_CLBL_TRTS_DEFAULT_VARARGS_CC foo::*)(...) RREF ; + using c = void(BOOST_CLBL_TRTS_DEFAULT_VARARGS_CC foo::*)(...) const; + using cl = void(BOOST_CLBL_TRTS_DEFAULT_VARARGS_CC foo::*)(...) const LREF; + using cr = void(BOOST_CLBL_TRTS_DEFAULT_VARARGS_CC foo::*)(...) const RREF; + using v = void(BOOST_CLBL_TRTS_DEFAULT_VARARGS_CC foo::*)(...) volatile; + using vl = void(BOOST_CLBL_TRTS_DEFAULT_VARARGS_CC foo::*)(...) volatile LREF; + using vr = void(BOOST_CLBL_TRTS_DEFAULT_VARARGS_CC foo::*)(...) volatile RREF; + using cv = void(BOOST_CLBL_TRTS_DEFAULT_VARARGS_CC foo::*)(...) const volatile; + using cvl = void(BOOST_CLBL_TRTS_DEFAULT_VARARGS_CC foo::*)(...) const volatile LREF; + using cvr = void(BOOST_CLBL_TRTS_DEFAULT_VARARGS_CC foo::*)(...) const volatile RREF; CT_ASSERT(std::is_same>{}); CT_ASSERT(std::is_same>{}); @@ -72,7 +72,7 @@ int main() { CT_ASSERT(std::is_same>{}); } -#ifndef CALLABLE_TRAITS_DISABLE_ABOMINABLE_FUNCTIONS +#ifndef BOOST_CLBL_TRTS_DISABLE_ABOMINABLE_FUNCTIONS { using f = void(); diff --git a/test/remove_member_reference.cpp b/test/remove_member_reference.cpp index f00a4d3..4910283 100644 --- a/test/remove_member_reference.cpp +++ b/test/remove_member_reference.cpp @@ -10,7 +10,7 @@ Distributed under the Boost Software License, Version 1.0. #include #include "test.hpp" -#ifdef CALLABLE_TRAITS_DISABLE_REFERENCE_QUALIFIERS +#ifdef BOOST_CLBL_TRTS_DISABLE_REFERENCE_QUALIFIERS int main(){ return 0; } #else @@ -75,4 +75,4 @@ int main() { } } -#endif //#ifndef CALLABLE_TRAITS_DISABLE_REFERENCE_QUALIFIERS +#endif //#ifndef BOOST_CLBL_TRTS_DISABLE_REFERENCE_QUALIFIERS diff --git a/test/remove_member_volatile.cpp b/test/remove_member_volatile.cpp index 9650003..9c67743 100644 --- a/test/remove_member_volatile.cpp +++ b/test/remove_member_volatile.cpp @@ -42,7 +42,7 @@ int main() { CT_ASSERT(std::is_same>{}); } -#ifndef CALLABLE_TRAITS_DISABLE_ABOMINABLE_FUNCTIONS +#ifndef BOOST_CLBL_TRTS_DISABLE_ABOMINABLE_FUNCTIONS { using f = foo&&(); @@ -72,6 +72,6 @@ int main() { CT_ASSERT(std::is_same>{}); } -#endif //#ifndef CALLABLE_TRAITS_DISABLE_ABOMINABLE_FUNCTIONS +#endif //#ifndef BOOST_CLBL_TRTS_DISABLE_ABOMINABLE_FUNCTIONS } diff --git a/test/remove_transaction_safe.cpp b/test/remove_transaction_safe.cpp index 9494ac1..81154d8 100644 --- a/test/remove_transaction_safe.cpp +++ b/test/remove_transaction_safe.cpp @@ -9,7 +9,7 @@ Distributed under the Boost Software License, Version 1.0. #include "test.hpp" -#ifndef CALLABLE_TRAITS_ENABLE_TRANSACTION_SAFE +#ifndef BOOST_CLBL_TRTS_ENABLE_TRANSACTION_SAFE int main(){} #else diff --git a/test/remove_transaction_safe_constraints.cpp b/test/remove_transaction_safe_constraints.cpp index 9893391..05ce468 100644 --- a/test/remove_transaction_safe_constraints.cpp +++ b/test/remove_transaction_safe_constraints.cpp @@ -10,7 +10,7 @@ Distributed under the Boost Software License, Version 1.0. #include #include "test.hpp" -#ifndef CALLABLE_TRAITS_ENABLE_TRANSACTION_SAFE +#ifndef BOOST_CLBL_TRTS_ENABLE_TRANSACTION_SAFE int main(){} #else @@ -34,4 +34,4 @@ int main() { assert_sfinae(); } -#endif //#ifndef CALLABLE_TRAITS_ENABLE_TRANSACTION_SAFE +#endif //#ifndef BOOST_CLBL_TRTS_ENABLE_TRANSACTION_SAFE diff --git a/test/remove_varargs.cpp b/test/remove_varargs.cpp index 5ccfd43..9849e67 100644 --- a/test/remove_varargs.cpp +++ b/test/remove_varargs.cpp @@ -30,18 +30,18 @@ int main() { using cvl = void(foo::*)() const volatile LREF; using cvr = void(foo::*)() const volatile RREF; - using va_f = void(CALLABLE_TRAITS_DEFAULT_VARARGS_CC foo::*)(...); - using va_l = void(CALLABLE_TRAITS_DEFAULT_VARARGS_CC foo::*)(...) LREF; - using va_r = void(CALLABLE_TRAITS_DEFAULT_VARARGS_CC foo::*)(...) RREF ; - using va_c = void(CALLABLE_TRAITS_DEFAULT_VARARGS_CC foo::*)(...) const; - using va_cl = void(CALLABLE_TRAITS_DEFAULT_VARARGS_CC foo::*)(...) const LREF; - using va_cr = void(CALLABLE_TRAITS_DEFAULT_VARARGS_CC foo::*)(...) const RREF; - using va_v = void(CALLABLE_TRAITS_DEFAULT_VARARGS_CC foo::*)(...) volatile; - using va_vl = void(CALLABLE_TRAITS_DEFAULT_VARARGS_CC foo::*)(...) volatile LREF; - using va_vr = void(CALLABLE_TRAITS_DEFAULT_VARARGS_CC foo::*)(...) volatile RREF; - using va_cv = void(CALLABLE_TRAITS_DEFAULT_VARARGS_CC foo::*)(...) const volatile; - using va_cvl = void(CALLABLE_TRAITS_DEFAULT_VARARGS_CC foo::*)(...) const volatile LREF; - using va_cvr = void(CALLABLE_TRAITS_DEFAULT_VARARGS_CC foo::*)(...) const volatile RREF; + using va_f = void(BOOST_CLBL_TRTS_DEFAULT_VARARGS_CC foo::*)(...); + using va_l = void(BOOST_CLBL_TRTS_DEFAULT_VARARGS_CC foo::*)(...) LREF; + using va_r = void(BOOST_CLBL_TRTS_DEFAULT_VARARGS_CC foo::*)(...) RREF ; + using va_c = void(BOOST_CLBL_TRTS_DEFAULT_VARARGS_CC foo::*)(...) const; + using va_cl = void(BOOST_CLBL_TRTS_DEFAULT_VARARGS_CC foo::*)(...) const LREF; + using va_cr = void(BOOST_CLBL_TRTS_DEFAULT_VARARGS_CC foo::*)(...) const RREF; + using va_v = void(BOOST_CLBL_TRTS_DEFAULT_VARARGS_CC foo::*)(...) volatile; + using va_vl = void(BOOST_CLBL_TRTS_DEFAULT_VARARGS_CC foo::*)(...) volatile LREF; + using va_vr = void(BOOST_CLBL_TRTS_DEFAULT_VARARGS_CC foo::*)(...) volatile RREF; + using va_cv = void(BOOST_CLBL_TRTS_DEFAULT_VARARGS_CC foo::*)(...) const volatile; + using va_cvl = void(BOOST_CLBL_TRTS_DEFAULT_VARARGS_CC foo::*)(...) const volatile LREF; + using va_cvr = void(BOOST_CLBL_TRTS_DEFAULT_VARARGS_CC foo::*)(...) const volatile RREF; CT_ASSERT(std::is_same>{}); CT_ASSERT(std::is_same>{}); @@ -84,18 +84,18 @@ int main() { using cvl = void(foo::*)(int&, int&&) const volatile LREF; using cvr = void(foo::*)(int&, int&&) const volatile RREF; - using va_f = void(CALLABLE_TRAITS_DEFAULT_VARARGS_CC foo::*)(int&, int&&, ...); - using va_l = void(CALLABLE_TRAITS_DEFAULT_VARARGS_CC foo::*)(int&, int&&, ...) LREF; - using va_r = void(CALLABLE_TRAITS_DEFAULT_VARARGS_CC foo::*)(int&, int&&, ...) RREF ; - using va_c = void(CALLABLE_TRAITS_DEFAULT_VARARGS_CC foo::*)(int&, int&&, ...) const; - using va_cl = void(CALLABLE_TRAITS_DEFAULT_VARARGS_CC foo::*)(int&, int&&, ...) const LREF; - using va_cr = void(CALLABLE_TRAITS_DEFAULT_VARARGS_CC foo::*)(int&, int&&, ...) const RREF; - using va_v = void(CALLABLE_TRAITS_DEFAULT_VARARGS_CC foo::*)(int&, int&&, ...) volatile; - using va_vl = void(CALLABLE_TRAITS_DEFAULT_VARARGS_CC foo::*)(int&, int&&, ...) volatile LREF; - using va_vr = void(CALLABLE_TRAITS_DEFAULT_VARARGS_CC foo::*)(int&, int&&, ...) volatile RREF; - using va_cv = void(CALLABLE_TRAITS_DEFAULT_VARARGS_CC foo::*)(int&, int&&, ...) const volatile; - using va_cvl = void(CALLABLE_TRAITS_DEFAULT_VARARGS_CC foo::*)(int&, int&&, ...) const volatile LREF; - using va_cvr = void(CALLABLE_TRAITS_DEFAULT_VARARGS_CC foo::*)(int&, int&&, ...) const volatile RREF; + using va_f = void(BOOST_CLBL_TRTS_DEFAULT_VARARGS_CC foo::*)(int&, int&&, ...); + using va_l = void(BOOST_CLBL_TRTS_DEFAULT_VARARGS_CC foo::*)(int&, int&&, ...) LREF; + using va_r = void(BOOST_CLBL_TRTS_DEFAULT_VARARGS_CC foo::*)(int&, int&&, ...) RREF ; + using va_c = void(BOOST_CLBL_TRTS_DEFAULT_VARARGS_CC foo::*)(int&, int&&, ...) const; + using va_cl = void(BOOST_CLBL_TRTS_DEFAULT_VARARGS_CC foo::*)(int&, int&&, ...) const LREF; + using va_cr = void(BOOST_CLBL_TRTS_DEFAULT_VARARGS_CC foo::*)(int&, int&&, ...) const RREF; + using va_v = void(BOOST_CLBL_TRTS_DEFAULT_VARARGS_CC foo::*)(int&, int&&, ...) volatile; + using va_vl = void(BOOST_CLBL_TRTS_DEFAULT_VARARGS_CC foo::*)(int&, int&&, ...) volatile LREF; + using va_vr = void(BOOST_CLBL_TRTS_DEFAULT_VARARGS_CC foo::*)(int&, int&&, ...) volatile RREF; + using va_cv = void(BOOST_CLBL_TRTS_DEFAULT_VARARGS_CC foo::*)(int&, int&&, ...) const volatile; + using va_cvl = void(BOOST_CLBL_TRTS_DEFAULT_VARARGS_CC foo::*)(int&, int&&, ...) const volatile LREF; + using va_cvr = void(BOOST_CLBL_TRTS_DEFAULT_VARARGS_CC foo::*)(int&, int&&, ...) const volatile RREF; CT_ASSERT(std::is_same>{}); CT_ASSERT(std::is_same>{}); @@ -124,7 +124,7 @@ int main() { CT_ASSERT(std::is_same>{}); } -#ifndef CALLABLE_TRAITS_DISABLE_ABOMINABLE_FUNCTIONS +#ifndef BOOST_CLBL_TRTS_DISABLE_ABOMINABLE_FUNCTIONS { using f = void(); @@ -180,7 +180,7 @@ int main() { CT_ASSERT(std::is_same>{}); } -#endif //#ifndef CALLABLE_TRAITS_DISABLE_ABOMINABLE_FUNCTIONS +#endif //#ifndef BOOST_CLBL_TRTS_DISABLE_ABOMINABLE_FUNCTIONS { using f = void(&)(); diff --git a/test/test.hpp b/test/test.hpp index bd5a843..0695e58 100644 --- a/test/test.hpp +++ b/test/test.hpp @@ -16,7 +16,7 @@ using namespace boost::callable_traits; #define CT_ASSERT(...) static_assert(__VA_ARGS__, #__VA_ARGS__) #endif //CT_ASSERT -#ifdef CALLABLE_TRAITS_DISABLE_REFERENCE_QUALIFIERS +#ifdef BOOST_CLBL_TRTS_DISABLE_REFERENCE_QUALIFIERS #define LREF #define RREF #else @@ -24,8 +24,8 @@ using namespace boost::callable_traits; #define RREF && #endif -#define TX_SAFE CALLABLE_TRAITS_TRANSACTION_SAFE_SPECIFIER -#define VA_CC CALLABLE_TRAITS_DEFAULT_VARARGS_CC +#define TX_SAFE BOOST_CLBL_TRTS_TRANSACTION_SAFE_SPECIFIER +#define VA_CC BOOST_CLBL_TRTS_DEFAULT_VARARGS_CC template class, typename...> struct is_substitution_failure;