boostorg/function
1
0
Fork 1
mirror of https://github.com/boostorg/function.git synced 2025-07-17 14:42:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

"contains" -> "target"

Browse Source 
[SVN r21845]
This commit is contained in:
Douglas Gregor
2004-01-20 18:07:13 +00:00
parent 7d30d98efd
commit cb1bcd5410
3 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/boost/function/function_base.hpp
View File

@ -330,7 +330,7 @@ namespace boost {
bool bool
compare_equal(const Function& f, const Functor& g, mpl::bool_<false>) compare_equal(const Function& f, const Functor& g, mpl::bool_<false>)
{ {
if (const Functor* fp = f.template contains<Functor>()) if (const Functor* fp = f.template target<Functor>())
return *fp == g; return *fp == g;
else return false; else return false;
} }
@ -340,7 +340,7 @@ namespace boost {
compare_not_equal(const Function& f, const Functor& g, compare_not_equal(const Function& f, const Functor& g,
mpl::bool_<false>) mpl::bool_<false>)
{ {
if (const Functor* fp = f.template contains<Functor>()) if (const Functor* fp = f.template target<Functor>())
return *fp != g; return *fp != g;
else return true; else return true;
} }
@ -366,7 +366,7 @@ public:
bool empty() const { return !manager; } bool empty() const { return !manager; }
template<typename Functor> template<typename Functor>
Functor* contains() Functor* target()
{ {
if (!manager) return 0; if (!manager) return 0;
@ -381,7 +381,7 @@ public:
} }
template<typename Functor> template<typename Functor>
const Functor* contains() const const Functor* target() const
{ {
if (!manager) return 0; if (!manager) return 0;

8
include/boost/function/function_template.hpp
View File

@ -648,7 +648,7 @@ template<typename R BOOST_FUNCTION_COMMA BOOST_FUNCTION_TEMPLATE_PARMS ,
Allocator>& f, Allocator>& f,
Functor g) Functor g)
{ {
if (const Functor* fp = f.template contains<Functor>()) return *fp == g; if (const Functor* fp = f.template target<Functor>()) return *fp == g;
else return false; else return false;
} }
@ -661,7 +661,7 @@ template<typename R BOOST_FUNCTION_COMMA BOOST_FUNCTION_TEMPLATE_PARMS ,
BOOST_FUNCTION_TEMPLATE_ARGS , BOOST_FUNCTION_TEMPLATE_ARGS ,
Allocator>& f) Allocator>& f)
{ {
if (const Functor* fp = f.template contains<Functor>()) return g == *fp; if (const Functor* fp = f.template target<Functor>()) return g == *fp;
else return false; else return false;
} }
@ -674,7 +674,7 @@ template<typename R BOOST_FUNCTION_COMMA BOOST_FUNCTION_TEMPLATE_PARMS ,
Allocator>& f, Allocator>& f,
Functor g) Functor g)
{ {
if (const Functor* fp = f.template contains<Functor>()) return *fp != g; if (const Functor* fp = f.template target<Functor>()) return *fp != g;
else return true; else return true;
} }
@ -687,7 +687,7 @@ template<typename R BOOST_FUNCTION_COMMA BOOST_FUNCTION_TEMPLATE_PARMS ,
BOOST_FUNCTION_TEMPLATE_ARGS , BOOST_FUNCTION_TEMPLATE_ARGS ,
Allocator>& f) Allocator>& f)
{ {
if (const Functor* fp = f.template contains<Functor>()) return g != *fp; if (const Functor* fp = f.template target<Functor>()) return g != *fp;
else return true; else return true;
} }
#undef BOOST_FUNCTION_ENABLE_IF_NOT_INTEGRAL #undef BOOST_FUNCTION_ENABLE_IF_NOT_INTEGRAL

18
test/contains_test.cpp
View File

@ -31,23 +31,23 @@ bool operator==(const ReturnInt& x, const ReturnInt& y)
bool operator!=(const ReturnInt& x, const ReturnInt& y) bool operator!=(const ReturnInt& x, const ReturnInt& y)
{ return x.value != y.value; } { return x.value != y.value; }
static void contains_test() static void target_test()
{ {
boost::function0<int> f; boost::function0<int> f;
f = &forty_two; f = &forty_two;
BOOST_TEST(*f.contains<int (*)()>() == &forty_two); BOOST_TEST(*f.target<int (*)()>() == &forty_two);
BOOST_TEST(!f.contains<Seventeen>()); BOOST_TEST(!f.target<Seventeen>());
f = Seventeen(); f = Seventeen();
BOOST_TEST(!f.contains<int (*)()>()); BOOST_TEST(!f.target<int (*)()>());
BOOST_TEST(f.contains<Seventeen>()); BOOST_TEST(f.target<Seventeen>());
Seventeen this_seventeen; Seventeen this_seventeen;
f = boost::ref(this_seventeen); f = boost::ref(this_seventeen);
BOOST_TEST(!f.contains<int (*)()>()); BOOST_TEST(!f.target<int (*)()>());
BOOST_TEST(f.contains<Seventeen>()); BOOST_TEST(f.target<Seventeen>());
BOOST_TEST(f.contains<Seventeen>() == &this_seventeen); BOOST_TEST(f.target<Seventeen>() == &this_seventeen);
} }
static void equal_test() static void equal_test()
@ -89,7 +89,7 @@ static void equal_test()
int test_main(int, char*[]) int test_main(int, char*[])
{ {
contains_test(); target_test();
equal_test(); equal_test();
return 0; return 0;