From 81dcf64b03c7e2f02547e587c3981af1fa8ca794 Mon Sep 17 00:00:00 2001
From: Felix Schindler <felix.schindler@wwu.de>
Date: Thu, 15 Jan 2015 22:16:43 +0100
Subject: [PATCH] [...block] fixes neccessary needed bc. of pr #30
---
dune/gdt/playground/mapper/block.hh | 9 ++++-----
dune/gdt/playground/spaces/block.hh | 17 ++++++++---------
2 files changed, 12 insertions(+), 14 deletions(-)
diff --git a/dune/gdt/playground/mapper/block.hh b/dune/gdt/playground/mapper/block.hh
index 92a8e77f6..06dc33511 100644
--- a/dune/gdt/playground/mapper/block.hh
+++ b/dune/gdt/playground/mapper/block.hh
@@ -34,11 +34,10 @@ namespace internal {
template <class LocalSpaceType>
class BlockTraits
{
- static_assert(
- std::is_base_of<SpaceInterface<typename LocalSpaceType::Traits, typename LocalSpaceType::dimDomain,
- typename LocalSpaceType::dimRange, typename LocalSpaceType::dimRangeCols>,
- LocalSpaceType>::value,
- "LocalSpaceType has to be derived from SpaceInterface!");
+ static_assert(std::is_base_of<SpaceInterface<typename LocalSpaceType::Traits, LocalSpaceType::dimDomain,
+ LocalSpaceType::dimRange, LocalSpaceType::dimRangeCols>,
+ LocalSpaceType>::value,
+ "LocalSpaceType has to be derived from SpaceInterface!");
public:
typedef Block<LocalSpaceType> derived_type;
diff --git a/dune/gdt/playground/spaces/block.hh b/dune/gdt/playground/spaces/block.hh
index c5ba57b1b..c6571ab14 100644
--- a/dune/gdt/playground/spaces/block.hh
+++ b/dune/gdt/playground/spaces/block.hh
@@ -34,11 +34,10 @@ namespace internal {
template <class LocalSpaceType>
class BlockTraits
{
- static_assert(
- std::is_base_of<SpaceInterface<typename LocalSpaceType::Traits, typename LocalSpaceType::dimDomain,
- typename LocalSpaceType::dimRange, typename LocalSpaceType::dimRangeCols>,
- LocalSpaceType>::value,
- "LocalSpaceType has to be derived from SpaceInterface!");
+ static_assert(std::is_base_of<SpaceInterface<typename LocalSpaceType::Traits, LocalSpaceType::dimDomain,
+ LocalSpaceType::dimRange, LocalSpaceType::dimRangeCols>,
+ LocalSpaceType>::value,
+ "LocalSpaceType has to be derived from SpaceInterface!");
typedef grid::Multiscale::Default<typename LocalSpaceType::GridViewType::Grid> MsGridType;
public:
@@ -65,11 +64,11 @@ public:
* be enough to hold a copy of the global grid view in this space (if the ms_grid is not needed elsewhere)
*/
template <class LocalSpaceImp>
-class Block : public SpaceInterface<internal::BlockTraits<LocalSpaceImp>, typename LocalSpaceImp::dimDomain,
- typename LocalSpaceImp::dimRange, typename LocalSpaceImp::dimRangeCols>
+class Block : public SpaceInterface<internal::BlockTraits<LocalSpaceImp>, LocalSpaceImp::dimDomain,
+ LocalSpaceImp::dimRange, LocalSpaceImp::dimRangeCols>
{
- typedef SpaceInterface<internal::BlockTraits<LocalSpaceImp>, typename LocalSpaceImp::dimDomain,
- typename LocalSpaceImp::dimRange, typename LocalSpaceImp::dimRangeCols> BaseType;
+ typedef SpaceInterface<internal::BlockTraits<LocalSpaceImp>, LocalSpaceImp::dimDomain, LocalSpaceImp::dimRange,
+ LocalSpaceImp::dimRangeCols> BaseType;
typedef Block<LocalSpaceImp> ThisType;
public:
--
GitLab