upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-07 04:56:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove a few more uses of Boost type traits and enable_if

Browse Source
This commit is contained in:
Celtic Minstrel 2016-07-29 14:04:40 -04:00
parent fc97838626
commit ad7daee4a8
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/gui/auxiliary/field.hpp
View File

@ -287,7 +287,7 @@ public:
, callback_load_value_(callback_load_value)
, callback_save_value_(callback_save_value)
{
static_assert((!boost::is_same<tcontrol, W>::value), "Second template argument cannot be tcontrol");
static_assert((!std::is_same<tcontrol, W>::value), "Second template argument cannot be tcontrol");
}
/**
@ -311,7 +311,7 @@ public:
, callback_load_value_(std::function<T()>())
, callback_save_value_(std::function<void(CT)>())
{
static_assert((!boost::is_same<tcontrol, W>::value), "Second template argument cannot be tcontrol");
static_assert((!std::is_same<tcontrol, W>::value), "Second template argument cannot be tcontrol");
}
/**
@ -338,7 +338,7 @@ public:
, callback_load_value_(std::function<T()>())
, callback_save_value_(std::function<void(CT)>())
{
static_assert((boost::is_same<tcontrol, W>::value), "Second template argument must be tcontrol");
static_assert((std::is_same<tcontrol, W>::value), "Second template argument must be tcontrol");
}
/** Inherited from tfield_. */

8
src/gui/core/event/dispatcher_private.hpp
View File

@ -60,7 +60,7 @@ struct tdispatcher_implementation
* tdispatcher::tsignal<FUNCTION> \
*/ \
template <class F> \
static typename boost::enable_if<boost::is_same<F, FUNCTION>, \
static typename std::enable_if<std::is_same<F, FUNCTION>::value, \
tdispatcher::tsignal<FUNCTION> >::type& \
event_signal(tdispatcher& dispatcher, const tevent event) \
{ \
@ -81,7 +81,7 @@ struct tdispatcher_implementation
* tdispatcher::tsignal<FUNCTION> \
*/ \
template <class K> \
static typename boost::enable_if<boost::mpl::has_key<SET, K>, \
static typename std::enable_if<boost::mpl::has_key<SET, K>::value, \
tdispatcher::tsignal<FUNCTION> >::type& \
event_signal(tdispatcher& dispatcher, const tevent event) \
{ \
@ -202,7 +202,7 @@ struct find<false>
return functor.template oper<item>(event);
} else {
typedef typename boost::mpl::next<itor>::type titor;
return find<boost::is_same<titor, end>::value>::execute(
return find<std::is_same<titor, end>::value>::execute(
static_cast<titor*>(nullptr),
static_cast<end*>(nullptr),
event,
@ -239,7 +239,7 @@ inline bool find(E event, F functor)
typedef typename boost::mpl::begin<sequence>::type begin;
typedef typename boost::mpl::end<sequence>::type end;
return implementation::find<boost::is_same<begin, end>::value>::execute(
return implementation::find<std::is_same<begin, end>::value>::execute(
static_cast<begin*>(nullptr), static_cast<end*>(nullptr), event, functor);
}