Commit eb5bd436 authored by Felix Gruber's avatar Felix Gruber

[cleanup] use std:: implementation of conditional

parent fc361da4
......@@ -351,7 +351,7 @@ namespace Dune {
flattened_reduction
>
{
typedef typename Dune::conditional<
typedef typename std::conditional<
TreePathBack<tree_path>::value == 0,
start_type,
current_type
......
......@@ -194,10 +194,10 @@ namespace Dune {
template<typename... FilterDescriptors>
struct apply
: public Dune::conditional<Filter::template apply<child,new_k,old_k>::value,
typename filter_helper<Filter,new_k+1,old_k+1,tail...>::template apply<FilterDescriptors...,FilterEntry<new_k,old_k> >,
typename filter_helper<Filter,new_k,old_k+1,tail...>::template apply<FilterDescriptors...>
>::type
: public std::conditional<Filter::template apply<child,new_k,old_k>::value,
typename filter_helper<Filter,new_k+1,old_k+1,tail...>::template apply<FilterDescriptors...,FilterEntry<new_k,old_k> >,
typename filter_helper<Filter,new_k,old_k+1,tail...>::template apply<FilterDescriptors...>
>::type
{};
};
......
......@@ -164,7 +164,7 @@ namespace Dune {
template<typename F>
struct evaluate_if_meta_function
{
typedef typename conditional<
typedef typename std::conditional<
is_base_of<meta_function,F>::value,
lazy_evaluate<F>,
lazy_identity<F>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment