feedc0de/boost_function
1
0
Fork 0
forked from boostorg/function
Code Pull Requests Activity

function_template.hpp:

Browse Source 
- function partial specialization now allows assignment to zero
    (for clearing) and comparison against zero (for the empty check)
    (Brad King)

function_test.cpp:
  - Check comparison against zero
  - Check assignment to zero

function_test_fail1.cpp:
function_test_fail2.cpp:
  - Make them fail for the right reasons


[SVN r15803]
This commit is contained in:
Douglas Gregor
2002-10-08 02:32:38 +00:00
parent 300fde19a1
commit 374711d2c6
4 changed files with 54 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
test/function_test.cpp
View File

@ -65,9 +65,9 @@ test_zero_args()
func_void_type v1;
BOOST_TEST(v1.empty());
// Assignment to an empty function
// Assignment to an empty function
v1 = five;
BOOST_TEST(!v1.empty());
BOOST_TEST(v1 != 0);
// Invocation of a function
global_int = 0;
@ -76,7 +76,7 @@ test_zero_args()
// clear() method
v1.clear();
BOOST_TEST(v1.empty());
BOOST_TEST(v1 == 0);
// Assignment to an empty function
v1 = three;
@ -97,13 +97,13 @@ test_zero_args()
v1();
BOOST_TEST(global_int == 5);
// clear()
v1.clear();
BOOST_TEST(v1.empty());
// clear
v1 = 0;
BOOST_TEST(0 == v1);
// Assignment to an empty function from a free function
v1 = BOOST_FUNCTION_TARGET_FIX(&) write_five;
BOOST_TEST(!v1.empty());
BOOST_TEST(0 != v1);
// Invocation
global_int = 0;
@ -210,8 +210,8 @@ test_zero_args()
// Assignment to a function from an empty function
v2 = v1;
BOOST_TEST(v2.empty());
BOOST_TEST(v2.empty());
// Assignment to a function from a function with a functor
v1 = three;
v2 = v1;
@ -245,7 +245,7 @@ test_zero_args()
global_int = 0;
v3();
BOOST_TEST(global_int == 5);
// clear() method
v3.clear();
BOOST_TEST(!v3? true : false);
@ -305,7 +305,7 @@ test_zero_args()
global_int = 0;
v4();
BOOST_TEST(global_int == 5);
// clear() method
v4.clear();
BOOST_TEST(v4.empty());
@ -365,7 +365,7 @@ test_zero_args()
global_int = 0;
v5();
BOOST_TEST(global_int == 5);
// clear() method
v5.clear();
BOOST_TEST(v5.empty());
@ -416,7 +416,7 @@ test_zero_args()
// Invocation
global_int = 0;
v5();
BOOST_TEST(global_int == 5);
BOOST_TEST(global_int == 5);
// Construction of a function from a function
func_void_type v6(&write_five);
@ -476,7 +476,7 @@ test_zero_args()
// Invocation
global_int = 0;
v6();
BOOST_TEST(global_int == 5);
BOOST_TEST(global_int == 5);
// Const vs. non-const
write_const_1_nonconst_2 one_or_two;
@ -486,7 +486,7 @@ test_zero_args()
global_int = 0;
v7();
BOOST_TEST(global_int == 2);
global_int = 0;
v8();
BOOST_TEST(global_int == 2);
@ -551,7 +551,7 @@ static void
test_two_args()
{
function<string (const string&, const string&)> cat(&string_cat);
BOOST_TEST(cat("str", "ing") == "string");
BOOST_TEST(cat("str", "ing") == "string");
function<int (short, short)> sum(&sum_ints);
BOOST_TEST(sum(2, 3) == 5);
@ -585,7 +585,7 @@ static void
test_member_functions()
{
boost::function<int (X*)> f1(&X::twice);
X one(1);
X five(5);
@ -644,7 +644,7 @@ struct counting_allocator : public allocator<T>
typedef counting_allocator<U> other;
};
T* allocate(size_t n)
{
alloc_count++;
@ -688,7 +688,7 @@ static void test_allocator()
fv.clear();
BOOST_TEST(alloc_count == 1);
BOOST_TEST(dealloc_count == 1);
alloc_count = 0;
dealloc_count = 0;
fv = &do_nothing;