Commit 2e05323e authored by Felix Gruber's avatar Felix Gruber

[cleanup] use integral_constant from std::

parent 122c4d37
......@@ -62,7 +62,7 @@ namespace Dune {
const bool visit = Visitor::template VisitChild<Node,C,ChildTreePath>::value;
// beforeChild() gets called regardless of the value of visit
v.beforeChild(std::forward<N>(n),n.template child<count-inverse_k>(),tp,integral_constant<std::size_t,count-inverse_k>());
v.beforeChild(std::forward<N>(n),n.template child<count-inverse_k>(),tp,std::integral_constant<std::size_t,count-inverse_k>());
// traverse to child
ApplyToTree<Visitor::treePathType,typename C::NodeTag,visit>::apply(n.template child<count-inverse_k>(),
......@@ -70,7 +70,7 @@ namespace Dune {
ChildTreePath());
// afterChild() gets called regardless of the value of visit
v.afterChild(std::forward<N>(n),n.template child<count-inverse_k>(),tp,integral_constant<std::size_t,count-inverse_k>());
v.afterChild(std::forward<N>(n),n.template child<count-inverse_k>(),tp,std::integral_constant<std::size_t,count-inverse_k>());
// we are not at the last child (that is specialized), so call infix visitor callback
v.in(std::forward<N>(n),tp);
......@@ -97,11 +97,11 @@ namespace Dune {
typedef typename Node::template Child<count-1>::Type C;
typedef typename TreePathPushBack<TreePath,count-1>::type ChildTreePath;
const bool visit = Visitor::template VisitChild<Node,C,ChildTreePath>::value;
v.beforeChild(std::forward<N>(n),n.template child<count-1>(),tp,integral_constant<std::size_t,count-1>());
v.beforeChild(std::forward<N>(n),n.template child<count-1>(),tp,std::integral_constant<std::size_t,count-1>());
ApplyToTree<Visitor::treePathType,typename C::NodeTag,visit>::apply(n.template child<count-1>(),
std::forward<V>(v),
ChildTreePath());
v.afterChild(std::forward<N>(n),n.template child<count-1>(),tp,integral_constant<std::size_t,count-1>());
v.afterChild(std::forward<N>(n),n.template child<count-1>(),tp,std::integral_constant<std::size_t,count-1>());
}
};
......
......@@ -49,7 +49,7 @@ namespace Dune {
ChildTreePath>::value;
v.beforeChild(std::forward<N1>(n1),n1.template child<count-inverse_k>(),
std::forward<N2>(n2),n2.template child<count-inverse_k>(),
tp,integral_constant<std::size_t,count-inverse_k>());
tp,std::integral_constant<std::size_t,count-inverse_k>());
ApplyToTreePair<std::remove_reference<V>::type::treePathType,
typename C1::NodeTag,
typename C2::NodeTag,
......@@ -59,7 +59,7 @@ namespace Dune {
ChildTreePath());
v.afterChild(std::forward<N1>(n1),n1.template child<count-inverse_k>(),
std::forward<N2>(n2),n2.template child<count-inverse_k>(),
tp,integral_constant<std::size_t,count-inverse_k>());
tp,std::integral_constant<std::size_t,count-inverse_k>());
v.in(std::forward<N1>(n1),std::forward<N2>(n2),tp);
apply_to_children_pair_fully_static<inverse_k-1,count>::apply(std::forward<N1>(n1),
std::forward<N2>(n2),
......@@ -89,7 +89,7 @@ namespace Dune {
ChildTreePath>::value;
v.beforeChild(std::forward<N1>(n1),n1.template child<count-1>(),
std::forward<N2>(n2),n2.template child<count-1>(),
tp,integral_constant<std::size_t,count-1>());
tp,std::integral_constant<std::size_t,count-1>());
ApplyToTreePair<std::remove_reference<V>::type::treePathType,
typename C1::NodeTag,
typename C2::NodeTag,
......@@ -99,7 +99,7 @@ namespace Dune {
ChildTreePath());
v.afterChild(std::forward<N1>(n1),n1.template child<count-1>(),
std::forward<N2>(n2),n2.template child<count-1>(),
tp,integral_constant<std::size_t,count-1>());
tp,std::integral_constant<std::size_t,count-1>());
}
};
......
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