rebase to develop branch

d5bd007f · Praetorius, Simon · 8bf3862f · d5bd007f
Commit d5bd007f authored Mar 01, 2019 by Praetorius, Simon
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 2 deletions

src/amdis/DataTransfer.inc.hpp src/amdis/DataTransfer.inc.hpp +1 -2

No files found.
--- a/src/amdis/DataTransfer.inc.hpp
+++ b/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