Bug 853988 - Replace uses of Conditional<..., TrueType, FalseType>::Type with IntegralConstant<bool, ...>. r=froydnj

--HG--
extra : rebase_source : 1c2deaac32b2ddefa67bb935f961a182aad31ad2
This commit is contained in:
Jeff Walden 2013-03-25 11:11:55 -07:00
Родитель 9aa7c64cc8
Коммит c7a586f0b2
1 изменённых файлов: 2 добавлений и 5 удалений

Просмотреть файл

@ -159,9 +159,6 @@ struct BaseOfTester<Type, const Type> : TrueType {};
} /* namespace detail */
template<bool Condition, typename A, typename B>
struct Conditional;
/*
* IsBaseOf allows to know whether a given class is derived from another.
*
@ -176,7 +173,7 @@ struct Conditional;
*/
template<class Base, class Derived>
struct IsBaseOf
: Conditional<detail::BaseOfTester<Base, Derived>::value, TrueType, FalseType>::Type
: IntegralConstant<bool, detail::BaseOfTester<Base, Derived>::value>
{};
namespace detail {
@ -223,7 +220,7 @@ struct ConvertibleTester
*/
template<typename From, typename To>
struct IsConvertible
: Conditional<detail::ConvertibleTester<From, To>::value, TrueType, FalseType>::Type
: IntegralConstant<bool, detail::ConvertibleTester<From, To>::value>
{};
/* 20.9.7 Transformations between types */