Cleaned up one remaining use of HAVE_CXX14 and removed the macro alto…

…gether
wesnoth · Mar 18, 2018 · aa09dec · aa09dec
1 parent c1fcba1
commit aa09dec
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 9 deletions.
diff --git a/src/global.hpp b/src/global.hpp
@@ -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)

diff --git a/src/utils/functional.hpp b/src/utils/functional.hpp
@@ -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...);