feedc0de/boost_bind
1
0
Fork 0
forked from boostorg/bind
Code Pull Requests Activity

Revert "Simplify multi-component ifdefs containing BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION"

Browse Source 
This reverts commit 0f66412487.
This commit is contained in:
Peter Dimov
2013-12-07 18:51:53 +02:00
parent aa8a94273d
commit ce0fc0f69a
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/boost/bind/bind.hpp
View File

@@ -60,7 +60,7 @@ template<class R, class F> struct result_traits
typedef R type;
};
#if !defined(BOOST_NO_FUNCTION_TEMPLATE_ORDERING)
#if !defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) && !defined(BOOST_NO_FUNCTION_TEMPLATE_ORDERING)
struct unspecified {};
@@ -1432,7 +1432,7 @@ template<class R, class F, class A1, class A2, class A3, class A4, class A5, cla
return _bi::bind_t<R, F, list_type>(f, list_type(a1, a2, a3, a4, a5, a6, a7, a8, a9));
}
#if !defined(BOOST_NO_FUNCTION_TEMPLATE_ORDERING)
#if !defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) && !defined(BOOST_NO_FUNCTION_TEMPLATE_ORDERING)
// adaptable function objects
@@ -1516,7 +1516,7 @@ template<class F, class A1, class A2, class A3, class A4, class A5, class A6, cl
return _bi::bind_t<_bi::unspecified, F, list_type>(f, list_type(a1, a2, a3, a4, a5, a6, a7, a8, a9));
}
#endif // !defined(BOOST_NO_FUNCTION_TEMPLATE_ORDERING)
#endif // !defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) && !defined(BOOST_NO_FUNCTION_TEMPLATE_ORDERING)
// function pointers

2
include/boost/bind/storage.hpp
View File

@@ -49,7 +49,7 @@ template<class A1> struct storage1
A1 a1_;
};
#if !defined( __BORLANDC__ )
#if !defined( BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION ) && !defined( __BORLANDC__ )
template<int I> struct storage1< boost::arg<I> >
{