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

function_base.hpp:

Browse Source 
- Don't try to implicitly convert a function pointer to a data pointer

stateless_test.cpp:
  - Don't use the deprecated syntax


[SVN r15499]
This commit is contained in:
Douglas Gregor
2002-09-24 17:28:58 +00:00
parent f9ae459b2d
commit 8b6f154891
2 changed files with 36 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -63,28 +63,28 @@ namespace boost {
void* obj_ptr; void* obj_ptr;
const void* const_obj_ptr; const void* const_obj_ptr;
void (*func_ptr)(); void (*func_ptr)();
char data[1]; char data[1];
}; };
any_pointer make_any_pointer(void* o) any_pointer make_any_pointer(void* o)
{ {
any_pointer p; any_pointer p;
p.obj_ptr = o; p.obj_ptr = o;
return p; return p;
} }
any_pointer make_any_pointer(const void* o) any_pointer make_any_pointer(const void* o)
{ {
any_pointer p; any_pointer p;
p.const_obj_ptr = o; p.const_obj_ptr = o;
return p; return p;
} }
any_pointer make_any_pointer(void (*f)()) any_pointer make_any_pointer(void (*f)())
{ {
any_pointer p; any_pointer p;
p.obj_ptr = f; p.func_ptr = f;
return p; return p;
} }
/** /**

2
test/stateless_test.cpp
View File

@ -40,7 +40,7 @@ namespace boost {
int test_main(int, char*[]) int test_main(int, char*[])
{ {
boost::function<int, int, int> f; boost::function2<int, int, int> f;
f = stateless_integer_add(); f = stateless_integer_add();
return 0; return 0;