[Boost-commit] svn:boost r52790 - sandbox/boost0x/boost/function

Subject: [Boost-commit] svn:boost r52790 - sandbox/boost0x/boost/function
From: gordon_at_[hidden]
Date: 2009-05-05 19:36:23

Author: gordon.woodhull
Date: 2009-05-05 19:36:22 EDT (Tue, 05 May 2009)
New Revision: 52790
URL: http://svn.boost.org/trac/boost/changeset/52790

Log:
macro free\!
Text files modified: 
   sandbox/boost0x/boost/function/function_variadic_vtable.hpp |     6 ------                                  
   1 files changed, 0 insertions(+), 6 deletions(-)

Modified: sandbox/boost0x/boost/function/function_variadic_vtable.hpp
==============================================================================
--- sandbox/boost0x/boost/function/function_variadic_vtable.hpp	(original)
+++ sandbox/boost0x/boost/function/function_variadic_vtable.hpp	2009-05-05 19:36:22 EDT (Tue, 05 May 2009)
@@ -12,11 +12,7 @@
       template<typename R, typename ... Args>
       struct basic_vtable
       {
-#ifndef BOOST_NO_VOID_RETURNS
-        typedef R         result_type;
-#else
         typedef typename function_return_type<R>::type result_type;
-#endif // BOOST_NO_VOID_RETURNS
 
         typedef result_type (*invoker_type)(function_buffer&, Args...);
 
@@ -63,7 +59,6 @@
         }
 
         // Member pointers
-#if BOOST_FUNCTION_NUM_ARGS > 0
         template<typename MemberPtr>
         bool assign_to(MemberPtr f, function_buffer& functor, member_ptr_tag)
         {
@@ -90,7 +85,6 @@
             return false;
           }
         }
-#endif // BOOST_FUNCTION_NUM_ARGS > 0
 
         // Function objects
         // Assign to a function object using the small object optimization