From 0272ea0ea5dfa89a9d42e75ffb142c1db6e25fca Mon Sep 17 00:00:00 2001
From: Peter Dimov <pdimov@pdimov.com>
Date: Tue, 18 Sep 2018 22:30:50 +0300
Subject: [PATCH] Revert "Revert "Use enable_if from type_traits""

This reverts commit ca68b08511f9b4f42124eeafd38dbceab2cf286e.
---
 include/boost/system/error_code.hpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/include/boost/system/error_code.hpp b/include/boost/system/error_code.hpp
index 199f45c..c0d513c 100644
--- a/include/boost/system/error_code.hpp
+++ b/include/boost/system/error_code.hpp
@@ -15,7 +15,7 @@
 #include <boost/system/config.hpp>
 #include <boost/cstdint.hpp>
 #include <boost/noncopyable.hpp>
-#include <boost/utility/enable_if.hpp>
+#include <boost/type_traits/enable_if.hpp>
 #include <ostream>
 #include <string>
 #include <stdexcept>
@@ -538,7 +538,7 @@ inline const error_category & generic_category() BOOST_SYSTEM_NOEXCEPT
 
       template <class ErrorConditionEnum>
         error_condition(ErrorConditionEnum e,
-          typename boost::enable_if<is_error_condition_enum<ErrorConditionEnum> >::type*
+          typename boost::enable_if_<is_error_condition_enum<ErrorConditionEnum>::value>::type*
             = 0) BOOST_SYSTEM_NOEXCEPT
       {
         *this = make_error_condition(e);
@@ -553,7 +553,7 @@ inline const error_category & generic_category() BOOST_SYSTEM_NOEXCEPT
       }
 
       template<typename ErrorConditionEnum>
-        typename boost::enable_if<is_error_condition_enum<ErrorConditionEnum>,
+        typename boost::enable_if_<is_error_condition_enum<ErrorConditionEnum>::value,
           error_condition>::type &
           operator=( ErrorConditionEnum val ) BOOST_SYSTEM_NOEXCEPT
       {
@@ -648,7 +648,7 @@ inline const error_category & generic_category() BOOST_SYSTEM_NOEXCEPT
 
       template <class ErrorCodeEnum>
         error_code(ErrorCodeEnum e,
-          typename boost::enable_if<is_error_code_enum<ErrorCodeEnum> >::type* = 0)
+          typename boost::enable_if_<is_error_code_enum<ErrorCodeEnum>::value>::type* = 0)
           BOOST_SYSTEM_NOEXCEPT
       {
         *this = make_error_code(e);
@@ -662,7 +662,7 @@ inline const error_category & generic_category() BOOST_SYSTEM_NOEXCEPT
       }
 
       template<typename ErrorCodeEnum>
-        typename boost::enable_if<is_error_code_enum<ErrorCodeEnum>, error_code>::type &
+        typename boost::enable_if_<is_error_code_enum<ErrorCodeEnum>::value, error_code>::type &
           operator=( ErrorCodeEnum val ) BOOST_SYSTEM_NOEXCEPT
       {
         *this = make_error_code(val);