Cleaned up one remaining use of HAVE_CXX14 and removed the macro altogether
This commit is contained in:
parent
c1fcba17b7
commit
aa09dec0f3
2 changed files with 1 additions and 9 deletions
|
@ -35,13 +35,10 @@
|
|||
|
||||
#define UNUSED(x) ((void)(x)) /* to avoid warnings */
|
||||
|
||||
// To allow using some optional C++14 and C++17 features
|
||||
#if __cplusplus >= 201402L
|
||||
#define HAVE_CXX14
|
||||
// To allow using some optional C++17 features
|
||||
#if __cplusplus >= 201703L
|
||||
#define HAVE_CXX17
|
||||
#endif
|
||||
#endif
|
||||
|
||||
// Some C++11 features are not available on all supported platforms
|
||||
#if defined(_MSC_VER)
|
||||
|
|
|
@ -92,11 +92,6 @@ namespace detail {
|
|||
|
||||
template<typename F, typename... P>
|
||||
auto bind_void(F fcn, P... bindings)
|
||||
#ifndef HAVE_CXX14
|
||||
-> decltype(
|
||||
std::bind(detail::make_apply(std::function<typename detail::function_base<F>::type>(fcn)), bindings...)
|
||||
)
|
||||
#endif
|
||||
{
|
||||
using T = typename detail::function_base<F>::type;
|
||||
return std::bind(detail::make_apply(std::function<T>(fcn)), bindings...);
|
||||
|
|
Loading…
Add table
Reference in a new issue