rebase to develop branch

src/amdis/DataTransfer.inc.hpp

@@ -96,8 +96,7 @@ namespace AMDiS
       }
     };
 
-    using ElementData = std::decay_t<decltype(
-      makeTreeContainer<Tree, NodeElementData>(std::declval<const Tree&>(), NodeElementData()))>;
+    using ElementData = TYPEOF(makeTreeContainer<Tree, NodeElementData>(std::declval<const Tree&>(), NodeElementData()));
 
   public:
     // Container with data that persists during grid adaptation