From 82226cb9d63f29c6ef3b29c7d1a3ba4c450dd00f Mon Sep 17 00:00:00 2001 From: Douglas Gregor Date: Wed, 10 Apr 2002 04:10:06 +0000 Subject: [PATCH] Changed IF to ct_if because IF is sometimes used as a macro (ewww) [SVN r13420] --- include/boost/function/function_base.hpp | 12 ++++++------ include/boost/function/function_template.hpp | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/include/boost/function/function_base.hpp b/include/boost/function/function_base.hpp index a4ea4bf..9130cee 100644 --- a/include/boost/function/function_base.hpp +++ b/include/boost/function/function_base.hpp @@ -37,7 +37,7 @@ namespace boost { template struct truth {}; /* - * The IF implementation is temporary code. When a Boost metaprogramming + * The ct_if implementation is temporary code. When a Boost metaprogramming * library is introduced, Boost.Function will use it instead. */ namespace intimate { @@ -73,7 +73,7 @@ namespace boost { } // end namespace intimate template - struct IF + struct ct_if { typedef typename intimate::Selector::type select; typedef typename select::template Result::type type; @@ -137,20 +137,20 @@ namespace boost { template class get_function_tag { - typedef typename IF<(is_pointer::value), + typedef typename ct_if<(is_pointer::value), function_ptr_tag, function_obj_tag>::type ptr_or_obj_tag; - typedef typename IF<(is_member_pointer::value), + typedef typename ct_if<(is_member_pointer::value), member_ptr_tag, ptr_or_obj_tag>::type ptr_or_obj_or_mem_tag; - typedef typename IF<(is_reference_wrapper::value), + typedef typename ct_if<(is_reference_wrapper::value), function_obj_ref_tag, ptr_or_obj_or_mem_tag>::type or_ref_tag; public: - typedef typename IF<(is_stateless::value), + typedef typename ct_if<(is_stateless::value), stateless_function_obj_tag, or_ref_tag>::type type; }; diff --git a/include/boost/function/function_template.hpp b/include/boost/function/function_template.hpp index 6055eeb..c49c297 100644 --- a/include/boost/function/function_template.hpp +++ b/include/boost/function/function_template.hpp @@ -168,7 +168,7 @@ namespace boost { > struct BOOST_FUNCTION_GET_FUNCTION_INVOKER { - typedef typename IF<(is_void::value), + typedef typename ct_if<(is_void::value), BOOST_FUNCTION_VOID_FUNCTION_INVOKER< FunctionPtr, R BOOST_FUNCTION_COMMA @@ -189,7 +189,7 @@ namespace boost { > struct BOOST_FUNCTION_GET_FUNCTION_OBJ_INVOKER { - typedef typename IF<(is_void::value), + typedef typename ct_if<(is_void::value), BOOST_FUNCTION_VOID_FUNCTION_OBJ_INVOKER< FunctionObj, R BOOST_FUNCTION_COMMA @@ -210,7 +210,7 @@ namespace boost { > struct BOOST_FUNCTION_GET_STATELESS_FUNCTION_OBJ_INVOKER { - typedef typename IF<(is_void::value), + typedef typename ct_if<(is_void::value), BOOST_FUNCTION_STATELESS_VOID_FUNCTION_OBJ_INVOKER< FunctionObj, R BOOST_FUNCTION_COMMA