Commit 5f86fbd5 authored by Praetorius, Simon's avatar Praetorius, Simon
Browse files

Merge branch 'issue/treepath' into 'develop'

corrected includes and inline specifiers in TreePath

See merge request !17
parents 428d373f 5ee07d7a
Pipeline #1081 passed with stage
in 4 minutes and 11 seconds
......@@ -2,11 +2,13 @@
#include <sstream>
#include <string>
#include <type_traits>
#include <dune/common/std/apply.hh>
#include <dune/typetree/treepath.hh>
#include <dune/typetree/typetraits.hh>
#include <amdis/common/Mpl.hpp>
namespace AMDiS
{
......@@ -79,9 +81,9 @@ namespace AMDiS
#else // DOXYGEN
auto makeTreePath(int i) { return Dune::TypeTree::hybridTreePath(std::size_t(i)); }
auto makeTreePath(std::size_t i) { return Dune::TypeTree::hybridTreePath(i); }
auto makeTreePath(RootTreePath) { return Dune::TypeTree::hybridTreePath(); }
inline auto makeTreePath(int i) { return Dune::TypeTree::hybridTreePath(std::size_t(i)); }
inline auto makeTreePath(std::size_t i) { return Dune::TypeTree::hybridTreePath(i); }
inline auto makeTreePath(RootTreePath) { return Dune::TypeTree::hybridTreePath(); }
template <int I>
......@@ -140,7 +142,7 @@ namespace AMDiS
return ss.str();
}
std::string to_string(Dune::TypeTree::HybridTreePath<> const& tp)
inline std::string to_string(Dune::TypeTree::HybridTreePath<> const& tp)
{
return "";
}
......@@ -160,7 +162,7 @@ namespace AMDiS
return Impl::toArrayImpl(tp, std::make_index_sequence<1+sizeof...(T)>{});
}
std::array<std::size_t,1> to_array(Dune::TypeTree::HybridTreePath<> const& tp)
inline std::array<std::size_t,1> to_array(Dune::TypeTree::HybridTreePath<> const& tp)
{
return {{0u}};
}
......
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