Commit 84334e43 authored by Praetorius, Simon's avatar Praetorius, Simon

merged origin/develop

parent c9ad5da6
...@@ -97,19 +97,7 @@ namespace AMDiS ...@@ -97,19 +97,7 @@ namespace AMDiS
return Dune::TypeTree::hybridTreePath(); return Dune::TypeTree::hybridTreePath();
} }
<<<<<<< HEAD
template <class... T>
auto makeDynamicTreePath(Dune::TypeTree::HybridTreePath<T...> const& tp)
{
auto tmp = Dune::TypeTree::MakeableDynamicTreePath<sizeof...(T)>().mutablePath();
forEach(range_<0,sizeof...(T)>, [&tp,&tmp](auto _i) mutable {
tmp.push_back(std::size_t(std::get<_i>(tp._data)));
});
return tmp.view();
}
=======
#endif // DOXYGEN #endif // DOXYGEN
>>>>>>> 076a7e1479a879871f8599eade9f911c41ca09a8
namespace Impl namespace Impl
......
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