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

Try to work around EC++4 bug

Browse Source 
[SVN r37471]
This commit is contained in:
Douglas Gregor
2007-04-18 12:13:53 +00:00
parent 6a3f0df553
commit 5c514ebe35
1 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -30,6 +30,14 @@
#endif #endif
#include <boost/function_equal.hpp> #include <boost/function_equal.hpp>
// Define BOOST_FUNCTION_STD_NS to the namespace that contains type_info.
#ifdef BOOST_NO_EXCEPTION_STD_NAMESPACE
// Embedded VC++ does not have type_info in namespace std
# define BOOST_FUNCTION_STD_NS
#else
# define BOOST_FUNCTION_STD_NS std
#endif
// Borrowed from Boost.Python library: determines the cases where we // Borrowed from Boost.Python library: determines the cases where we
// need to use std::type_info::name to compare instead of operator==. // need to use std::type_info::name to compare instead of operator==.
# if (defined(__GNUC__) && __GNUC__ >= 3) \ # if (defined(__GNUC__) && __GNUC__ >= 3) \
@ -215,8 +223,8 @@ namespace boost {
// DPG TBD: Since we're only storing a pointer, it's // DPG TBD: Since we're only storing a pointer, it's
// possible that the user could ask for a base class or // possible that the user could ask for a base class or
// derived class. Is that okay? // derived class. Is that okay?
const std::type_info& check_type = const BOOST_FUNCTION_STD_NS::type_info& check_type =
*static_cast<const std::type_info*>(out_buffer.const_obj_ptr); *static_cast<const BOOST_FUNCTION_STD_NS::type_info*>(out_buffer.const_obj_ptr);
if (BOOST_FUNCTION_COMPARE_TYPE_ID(check_type, typeid(F))) if (BOOST_FUNCTION_COMPARE_TYPE_ID(check_type, typeid(F)))
out_buffer.obj_ptr = in_buffer.obj_ptr; out_buffer.obj_ptr = in_buffer.obj_ptr;
else else
@ -265,8 +273,8 @@ namespace boost {
else if (op == destroy_functor_tag) else if (op == destroy_functor_tag)
out_buffer.func_ptr = 0; out_buffer.func_ptr = 0;
else /* op == check_functor_type_tag */ { else /* op == check_functor_type_tag */ {
const std::type_info& check_type = const BOOST_FUNCTION_STD_NS::type_info& check_type =
*static_cast<const std::type_info*>(out_buffer.const_obj_ptr); *static_cast<const BOOST_FUNCTION_STD_NS::type_info*>(out_buffer.const_obj_ptr);
if (BOOST_FUNCTION_COMPARE_TYPE_ID(check_type, typeid(Functor))) if (BOOST_FUNCTION_COMPARE_TYPE_ID(check_type, typeid(Functor)))
out_buffer.obj_ptr = &in_buffer.func_ptr; out_buffer.obj_ptr = &in_buffer.func_ptr;
else else
@ -287,8 +295,8 @@ namespace boost {
// 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(); reinterpret_cast<functor_type*>(&out_buffer.data)->~Functor();
} else /* op == check_functor_type_tag */ { } else /* op == check_functor_type_tag */ {
const std::type_info& check_type = const BOOST_FUNCTION_STD_NS::type_info& check_type =
*static_cast<const std::type_info*>(out_buffer.const_obj_ptr); *static_cast<const BOOST_FUNCTION_STD_NS::type_info*>(out_buffer.const_obj_ptr);
if (BOOST_FUNCTION_COMPARE_TYPE_ID(check_type, typeid(Functor))) if (BOOST_FUNCTION_COMPARE_TYPE_ID(check_type, typeid(Functor)))
out_buffer.obj_ptr = &in_buffer.data; out_buffer.obj_ptr = &in_buffer.data;
else else
@ -348,8 +356,8 @@ namespace boost {
# endif // BOOST_NO_STD_ALLOCATOR # endif // BOOST_NO_STD_ALLOCATOR
out_buffer.obj_ptr = 0; out_buffer.obj_ptr = 0;
} else /* op == check_functor_type_tag */ { } else /* op == check_functor_type_tag */ {
const std::type_info& check_type = const BOOST_FUNCTION_STD_NS::type_info& check_type =
*static_cast<const std::type_info*>(out_buffer.const_obj_ptr); *static_cast<const BOOST_FUNCTION_STD_NS::type_info*>(out_buffer.const_obj_ptr);
if (BOOST_FUNCTION_COMPARE_TYPE_ID(check_type, typeid(Functor))) if (BOOST_FUNCTION_COMPARE_TYPE_ID(check_type, typeid(Functor)))
out_buffer.obj_ptr = in_buffer.obj_ptr; out_buffer.obj_ptr = in_buffer.obj_ptr;
else else
@ -480,13 +488,13 @@ public:
/** Retrieve the type of the stored function object, or typeid(void) /** Retrieve the type of the stored function object, or typeid(void)
if this is empty. */ if this is empty. */
const std::type_info& target_type() const const BOOST_FUNCTION_STD_NS::type_info& target_type() const
{ {
if (!vtable) return typeid(void); if (!vtable) return typeid(void);
detail::function::function_buffer type; detail::function::function_buffer type;
vtable->manager(functor, type, detail::function::get_functor_type_tag); vtable->manager(functor, type, detail::function::get_functor_type_tag);
return *static_cast<const std::type_info*>(type.const_obj_ptr); return *static_cast<const BOOST_FUNCTION_STD_NS::type_info*>(type.const_obj_ptr);
} }
template<typename Functor> template<typename Functor>