Skip to content
Snippets Groups Projects
Commit bd05a082 authored by Praetorius, Simon's avatar Praetorius, Simon
Browse files

Merge branch 'issue/result-of-t' into 'master'

Replaced result of t by invoke result t

See merge request !33
parents ce567e76 bec9ade9
No related branches found
No related tags found
1 merge request!33Replaced result of t by invoke result t
Pipeline #12959 failed
...@@ -48,7 +48,7 @@ public: ...@@ -48,7 +48,7 @@ public:
using ctype = typename Geometry::ctype; using ctype = typename Geometry::ctype;
using Domain = typename Geometry::GlobalCoordinate; using Domain = typename Geometry::GlobalCoordinate;
using RangeType = std::result_of_t<Functor(Domain)>; using RangeType = std::invoke_result_t<Functor,Domain>;
template <int degree> template <int degree>
using DerivativeRange = typename Impl::DerivativeRangeType<RangeType(Domain), degree, Functions::DefaultDerivativeTraits>::type; using DerivativeRange = typename Impl::DerivativeRangeType<RangeType(Domain), degree, Functions::DefaultDerivativeTraits>::type;
...@@ -228,7 +228,7 @@ public: ...@@ -228,7 +228,7 @@ public:
using EntitySet = GridEntitySet<Grid,0>; using EntitySet = GridEntitySet<Grid,0>;
using Domain = typename EntitySet::GlobalCoordinate; using Domain = typename EntitySet::GlobalCoordinate;
using Range = std::result_of_t<Functor(Domain)>; using Range = std::invoke_result_t<Functor,Domain>;
using Signature = Range(Domain); using Signature = Range(Domain);
public: public:
......
...@@ -58,7 +58,7 @@ int main(int argc, char** argv) ...@@ -58,7 +58,7 @@ int main(int argc, char** argv)
GridFactory<GridType> factory; GridFactory<GridType> factory;
GridCreator creator(factory); GridCreator creator(factory);
VtkReader reader(creator); Vtk::VtkReader reader(creator);
reader.read("sphere_order3.vtu"); reader.read("sphere_order3.vtu");
std::unique_ptr grid = reader.createGrid(); std::unique_ptr grid = reader.createGrid();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment