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

Fixes for MSVC

Browse Source 
[SVN r11363]
This commit is contained in:
Douglas Gregor
2001-10-08 13:49:02 +00:00
parent a81c30d130
commit e00d8f0afb
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -32,7 +32,7 @@
#ifndef BOOST_NO_STD_ALLOCATOR #ifndef BOOST_NO_STD_ALLOCATOR
# define BOOST_FUNCTION_DEFAULT_ALLOCATOR std::allocator<function_base> # define BOOST_FUNCTION_DEFAULT_ALLOCATOR std::allocator<function_base>
#else #else
# define BOOST_FUNCTION_DEFAULT_ALLOCATOR void # define BOOST_FUNCTION_DEFAULT_ALLOCATOR int
#endif // BOOST_NO_STD_ALLOCATOR #endif // BOOST_NO_STD_ALLOCATOR
namespace boost { namespace boost {
@ -660,7 +660,7 @@ namespace boost {
} }
template<typename To> template<typename To>
To& cast(To* = 0) To& cast(To* dummy = 0)
{ {
assert(typeid(To) != typeid(void)); assert(typeid(To) != typeid(void));
assert(typeid(To) == this->target_type()); assert(typeid(To) == this->target_type());
@ -670,14 +670,14 @@ namespace boost {
#ifdef BOOST_FUNCTION_USE_VIRTUAL_FUNCTIONS #ifdef BOOST_FUNCTION_USE_VIRTUAL_FUNCTIONS
impl_type* i = reinterpret_cast<impl_type*>(impl); impl_type* i = reinterpret_cast<impl_type*>(impl);
return cast_helper<To>(i->pointer(), tag()); return cast_helper(i->pointer(), tag(), dummy);
#else #else
return cast_helper<To>(functor, tag()); return cast_helper(functor, tag(), dummy);
#endif // BOOST_FUNCTION_USE_VIRTUAL_FUNCTIONS #endif // BOOST_FUNCTION_USE_VIRTUAL_FUNCTIONS
} }
template<typename To> template<typename To>
const To& cast(To* = 0) const const To& cast(To* dummy = 0) const
{ {
assert(typeid(To) != typeid(void)); assert(typeid(To) != typeid(void));
assert(typeid(To) == this->target_type()); assert(typeid(To) == this->target_type());
@ -687,9 +687,9 @@ namespace boost {
#ifdef BOOST_FUNCTION_USE_VIRTUAL_FUNCTIONS #ifdef BOOST_FUNCTION_USE_VIRTUAL_FUNCTIONS
impl_type* i = reinterpret_cast<impl_type*>(impl); impl_type* i = reinterpret_cast<impl_type*>(impl);
return cast_helper<To>(i->pointer(), tag()); return cast_helper(i->pointer(), tag(), dummy);
#else #else
return cast_helper<To>(functor, tag()); return cast_helper(functor, tag(), dummy);
#endif // BOOST_FUNCTION_USE_VIRTUAL_FUNCTIONS #endif // BOOST_FUNCTION_USE_VIRTUAL_FUNCTIONS
} }
@ -850,9 +850,9 @@ namespace boost {
Mixin, Mixin,
Allocator Allocator
>& f, >& f,
To* = 0) To* dummy = 0)
{ {
return f.template cast<To>(); return f.cast(dummy);
} }
template<typename To, typename R template<typename To, typename R
@ -865,9 +865,9 @@ namespace boost {
Mixin, Mixin,
Allocator Allocator
>& f, >& f,
To* = 0) To* dummy = 0)
{ {
return f.template cast<To>(); return f.cast(dummy);
} }
} }