function_base.hpp:

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

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


[SVN r15499]

include/boost/function/function_base.hpp

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

test/stateless_test.cpp

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