From 38cef1f98349968377031eee3705b4d2f973f8ce Mon Sep 17 00:00:00 2001 From: John Maddock Date: Sun, 1 Apr 2001 11:59:18 +0000 Subject: [PATCH] Added boost-wide woraround [SVN r9688] --- include/boost/type_traits/function_traits.hpp | 6 +++--- tests/is_function_test.cpp | 4 ++++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/include/boost/type_traits/function_traits.hpp b/include/boost/type_traits/function_traits.hpp index 0440429..ab49d90 100644 --- a/include/boost/type_traits/function_traits.hpp +++ b/include/boost/type_traits/function_traits.hpp @@ -140,15 +140,15 @@ struct is_function private: #if !defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) typedef typename detail::is_function_chooser< ::boost::is_reference::value>::template rebind binder; - typedef typename binder::type type; + typedef typename binder::type m_type; #else // without partial specialistaion we can't use is_reference on // function types, that leaves this template broken in the case that // T is a reference: - typedef detail::is_function_helper type; + typedef detail::is_function_helper m_type; #endif public: - BOOST_STATIC_CONSTANT(bool, value = type::value); + BOOST_STATIC_CONSTANT(bool, value = m_type::value); }; } // boost diff --git a/tests/is_function_test.cpp b/tests/is_function_test.cpp index f3f8ab4..8e4a40c 100644 --- a/tests/is_function_test.cpp +++ b/tests/is_function_test.cpp @@ -8,7 +8,11 @@ #include "boost/type_traits/type_traits_test.hpp" template +#ifndef __BORLANDC__ void is_function_test(T& foo) +#else +void is_function_test(const T& foo) +#endif { value_test(true, ::boost::is_function::value); #ifndef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION