restrict order to functions

amdis/common/Order.hpp

@@ -9,7 +9,7 @@ namespace AMDiS
   /// polynomial order of functions
   template <class F>
   auto order(F const& f)
-    -> decltype(f.order())
+    -> decltype(&F::operator(), f.order())
   {
     return f.order();
   }

amdis/functions/Order.hpp

 #pragma once
 
-#include <cmath>
-
-#include <dune/common/typetraits.hh>
-#include <dune/typetree/nodetags.hh>
-
 #include <amdis/Output.hpp>
 #include <amdis/common/Math.hpp>
 #include <amdis/common/Apply.hpp>

amdis/gridfunctions/DiscreteLocalFunction.inc.hpp

@@ -5,6 +5,7 @@
 #include <amdis/common/FieldMatVec.hpp>
 #include <amdis/common/Math.hpp>
 #include <amdis/functions/NodeIndices.hpp>
+#include <amdis/functions/Order.hpp>
 #include <amdis/typetree/FiniteElementType.hpp>
 #include <amdis/utility/LocalBasisCache.hpp>
 #include <amdis/utility/LocalToGlobalAdapter.hpp>
@@ -133,11 +134,11 @@ public:
   }
 
   /// \brief The polynomial degree of the LocalFunctions basis-functions
-  int order() const
+  auto order() const
+    -> decltype(AMDiS::order(std::declval<SubTree>()))
   {
-    using AMDiS::order;
     assert( bound_ );
-    return order(*subTree_);
+    return AMDiS::order(*subTree_);
   }
 
   /// \brief Return the bound element
@@ -211,11 +212,10 @@ public:
   }
 
   auto order() const
-    -> decltype(order(std::declval<SubTree>()))
+    -> decltype(AMDiS::order(std::declval<SubTree>()))
   {
-    using AMDiS::order;
     assert( bound_ );
-    return std::max(0, order(*subTree_)-1);
+    return std::max(0, AMDiS::order(*subTree_)-1);
   }
 
   /// Return the bound element