From ffc258da8e9cb953efb1860d4d472be55edf4cb6 Mon Sep 17 00:00:00 2001 From: Timo Heister Date: Thu, 26 Nov 2015 18:55:34 -0500 Subject: [PATCH] MSVC fixes --- CMakeLists.txt | 3 +-- include/deal.II/grid/tria.h | 4 ++-- include/deal.II/lac/relaxation_block.templates.h | 3 ++- tests/run_testsuite.cmake | 10 ++++++++-- 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 375ee33e1c..b425ee1f48 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -152,8 +152,7 @@ ADD_SUBDIRECTORY(cmake/config) # has to be included after source ADD_SUBDIRECTORY(contrib) # has to be included after source ADD_SUBDIRECTORY(examples) -# Do not automatically include the testsuite subproject on Windows. -IF(DEAL_II_HAVE_TESTS_DIRECTORY AND NOT DEAL_II_MSVC) +IF(DEAL_II_HAVE_TESTS_DIRECTORY) ADD_SUBDIRECTORY(tests) ENDIF() diff --git a/include/deal.II/grid/tria.h b/include/deal.II/grid/tria.h index 1e1e54f780..abe2993c30 100644 --- a/include/deal.II/grid/tria.h +++ b/include/deal.II/grid/tria.h @@ -1936,7 +1936,7 @@ public: * functions below. It takes an iterator range and returns the sum of values. */ template - struct sum + struct CellWeightSum { typedef T result_type; @@ -2063,7 +2063,7 @@ public: */ boost::signals2::signal::sum > cell_weight; + CellWeightSum > cell_weight; }; /** diff --git a/include/deal.II/lac/relaxation_block.templates.h b/include/deal.II/lac/relaxation_block.templates.h index 513f14b7b3..ce4174f01d 100644 --- a/include/deal.II/lac/relaxation_block.templates.h +++ b/include/deal.II/lac/relaxation_block.templates.h @@ -43,7 +43,8 @@ std::size_t RelaxationBlock::AdditionalData::memory_consumption() const { std::size_t result = sizeof(*this) - + - sizeof(block_list) + block_list.memory_consumption(); + + block_list.memory_consumption() + - sizeof(block_list); for (unsigned int i=0; i