forked from boostorg/function
Remove BOOST_FUNCTION_TARGET_FIX workarounds
This commit is contained in:
1 parent
f86ddb0bb9
commit
18e8bf458c
2 files changed
+5
-8
No files matched your search
@@ -40,11 +40,8 @@
|
|||||||
# pragma warning( disable : 4127 ) // "conditional expression is constant"
|
# pragma warning( disable : 4127 ) // "conditional expression is constant"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(__ICL) && __ICL <= 600 || defined(__MWERKS__) && __MWERKS__ < 0x2406 && !defined(BOOST_STRICT_CONFIG)
|
// retained because used in a test
|
||||||
# define BOOST_FUNCTION_TARGET_FIX(x) x
|
|
||||||
#else
|
|
||||||
#define BOOST_FUNCTION_TARGET_FIX(x)
|
#define BOOST_FUNCTION_TARGET_FIX(x)
|
||||||
#endif // __ICL etc
|
|
||||||
|
|
||||||
# define BOOST_FUNCTION_ENABLE_IF_NOT_INTEGRAL(Functor,Type) \
|
# define BOOST_FUNCTION_ENABLE_IF_NOT_INTEGRAL(Functor,Type) \
|
||||||
typename ::boost::enable_if_< \
|
typename ::boost::enable_if_< \
|
||||||
|
|||||||
@@ -697,7 +697,7 @@ namespace boost {
|
|||||||
// MSVC chokes if the following two constructors are collapsed into
|
// MSVC chokes if the following two constructors are collapsed into
|
||||||
// one with a default parameter.
|
// one with a default parameter.
|
||||||
template<typename Functor>
|
template<typename Functor>
|
||||||
BOOST_FUNCTION_FUNCTION(Functor BOOST_FUNCTION_TARGET_FIX(const &) f
|
BOOST_FUNCTION_FUNCTION(Functor f
|
||||||
#ifndef BOOST_NO_SFINAE
|
#ifndef BOOST_NO_SFINAE
|
||||||
,typename boost::enable_if_<
|
,typename boost::enable_if_<
|
||||||
!(is_integral<Functor>::value),
|
!(is_integral<Functor>::value),
|
||||||
@@ -709,7 +709,7 @@ namespace boost {
|
|||||||
this->assign_to(f);
|
this->assign_to(f);
|
||||||
}
|
}
|
||||||
template<typename Functor,typename Allocator>
|
template<typename Functor,typename Allocator>
|
||||||
BOOST_FUNCTION_FUNCTION(Functor BOOST_FUNCTION_TARGET_FIX(const &) f, Allocator a
|
BOOST_FUNCTION_FUNCTION(Functor f, Allocator a
|
||||||
#ifndef BOOST_NO_SFINAE
|
#ifndef BOOST_NO_SFINAE
|
||||||
,typename boost::enable_if_<
|
,typename boost::enable_if_<
|
||||||
!(is_integral<Functor>::value),
|
!(is_integral<Functor>::value),
|
||||||
@@ -766,7 +766,7 @@ namespace boost {
|
|||||||
#else
|
#else
|
||||||
BOOST_FUNCTION_FUNCTION&
|
BOOST_FUNCTION_FUNCTION&
|
||||||
#endif
|
#endif
|
||||||
operator=(Functor BOOST_FUNCTION_TARGET_FIX(const &) f)
|
operator=(Functor f)
|
||||||
{
|
{
|
||||||
this->clear();
|
this->clear();
|
||||||
BOOST_TRY {
|
BOOST_TRY {
|
||||||
@@ -779,7 +779,7 @@ namespace boost {
|
|||||||
return *this;
|
return *this;
|
||||||
}
|
}
|
||||||
template<typename Functor,typename Allocator>
|
template<typename Functor,typename Allocator>
|
||||||
void assign(Functor BOOST_FUNCTION_TARGET_FIX(const &) f, Allocator a)
|
void assign(Functor f, Allocator a)
|
||||||
{
|
{
|
||||||
this->clear();
|
this->clear();
|
||||||
BOOST_TRY{
|
BOOST_TRY{
|
||||||
|
|||||||
Reference in new issue
Block a user