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

This commit was manufactured by cvs2svn to create tag

Browse Source 
'merged_to_RC_1_34_0'.

[SVN r37938]
This commit is contained in:
nobody
2007-06-07 20:53:46 +00:00
parent 6a3f0df553
commit c047140b5f
4 changed files with 3 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/boost/function.hpp
View File

@ -10,8 +10,6 @@
// William Kempf, Jesse Jones and Karl Nelson were all very helpful in the // William Kempf, Jesse Jones and Karl Nelson were all very helpful in the
// design of this library. // design of this library.
#include <functional> // unary_function, binary_function
#include <boost/preprocessor/iterate.hpp> #include <boost/preprocessor/iterate.hpp>
#include <boost/detail/workaround.hpp> #include <boost/detail/workaround.hpp>

1
include/boost/function/detail/prologue.hpp
View File

@ -11,7 +11,6 @@
#define BOOST_FUNCTION_PROLOGUE_HPP #define BOOST_FUNCTION_PROLOGUE_HPP
# include <cassert> # include <cassert>
# include <algorithm> # include <algorithm>
# include <functional> // unary_function, binary_function
# include <boost/throw_exception.hpp> # include <boost/throw_exception.hpp>
# include <boost/config.hpp> # include <boost/config.hpp>
# include <boost/function/function_base.hpp> # include <boost/function/function_base.hpp>

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

@ -284,8 +284,10 @@ namespace boost {
reinterpret_cast<const functor_type*>(&in_buffer.data); reinterpret_cast<const functor_type*>(&in_buffer.data);
new ((void*)&out_buffer.data) functor_type(*in_functor); new ((void*)&out_buffer.data) functor_type(*in_functor);
} else if (op == destroy_functor_tag) { } else if (op == destroy_functor_tag) {
functor_type* out_functor =
reinterpret_cast<functor_type*>(&out_buffer.data);
// Some compilers (Borland, vc6, ...) are unhappy with ~functor_type. // Some compilers (Borland, vc6, ...) are unhappy with ~functor_type.
reinterpret_cast<functor_type*>(&out_buffer.data)->~Functor(); out_functor->~Functor();
} else /* op == check_functor_type_tag */ { } else /* op == check_functor_type_tag */ {
const std::type_info& check_type = const std::type_info& check_type =
*static_cast<const std::type_info*>(out_buffer.const_obj_ptr); *static_cast<const std::type_info*>(out_buffer.const_obj_ptr);

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

@ -446,17 +446,6 @@ namespace boost {
typename Allocator = BOOST_FUNCTION_DEFAULT_ALLOCATOR typename Allocator = BOOST_FUNCTION_DEFAULT_ALLOCATOR
> >
class BOOST_FUNCTION_FUNCTION : public function_base class BOOST_FUNCTION_FUNCTION : public function_base
#if BOOST_FUNCTION_NUM_ARGS == 1
, public std::unary_function<T0,R>
#elif BOOST_FUNCTION_NUM_ARGS == 2
, public std::binary_function<T0,T1,R>
#endif
{ {
public: public:
#ifndef BOOST_NO_VOID_RETURNS #ifndef BOOST_NO_VOID_RETURNS