From: Timo Heister Date: Mon, 22 Aug 2016 16:46:08 +0000 (-0400) Subject: disable LA [block]vector instantiations for MSVC X-Git-Tag: v8.5.0-rc1~743^2~1 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5061f0304adcbbf0508e1cb23eb6f922aa295702;p=dealii.git disable LA [block]vector instantiations for MSVC --- diff --git a/include/deal.II/lac/la_parallel_block_vector.h b/include/deal.II/lac/la_parallel_block_vector.h index 0b24efa02d..2d325cf4ae 100644 --- a/include/deal.II/lac/la_parallel_block_vector.h +++ b/include/deal.II/lac/la_parallel_block_vector.h @@ -596,4 +596,8 @@ void swap (LinearAlgebra::distributed::BlockVector &u, DEAL_II_NAMESPACE_CLOSE +#ifdef DEAL_II_MSVC +#include +#endif + #endif diff --git a/include/deal.II/lac/la_vector.h b/include/deal.II/lac/la_vector.h index 73cdb8390f..5d82fcbbad 100644 --- a/include/deal.II/lac/la_vector.h +++ b/include/deal.II/lac/la_vector.h @@ -383,4 +383,8 @@ namespace LinearAlgebra DEAL_II_NAMESPACE_CLOSE +#ifdef DEAL_II_MSVC +#include +#endif + #endif diff --git a/source/base/job_identifier.cc b/source/base/job_identifier.cc index 320bfc2e90..c59f8ae212 100644 --- a/source/base/job_identifier.cc +++ b/source/base/job_identifier.cc @@ -20,7 +20,7 @@ # include #endif -#ifdef DEAM_II_MSVC +#ifdef DEAL_II_MSVC # include #endif diff --git a/source/lac/la_parallel_block_vector.cc b/source/lac/la_parallel_block_vector.cc index bbabfc3e7a..f7be61300e 100644 --- a/source/lac/la_parallel_block_vector.cc +++ b/source/lac/la_parallel_block_vector.cc @@ -18,6 +18,11 @@ DEAL_II_NAMESPACE_OPEN + +// disable instantiation for MSVC for now because of a compiler bug, +// see https://github.com/dealii/dealii/issues/2875 +#ifndef DEAL_II_MSVC + #include "la_parallel_block_vector.inst" // do a few functions that currently don't fit the scheme because they have @@ -42,5 +47,6 @@ namespace LinearAlgebra } } +#endif // ! DEAL_II_MSVC DEAL_II_NAMESPACE_CLOSE diff --git a/source/lac/la_vector.cc b/source/lac/la_vector.cc index 10f4e73e48..37d70f768b 100644 --- a/source/lac/la_vector.cc +++ b/source/lac/la_vector.cc @@ -17,6 +17,10 @@ DEAL_II_NAMESPACE_OPEN +// disable instantiation for MSVC for now because of a compiler bug, +// see https://github.com/dealii/dealii/issues/2875 +#ifndef DEAL_II_MSVC + namespace LinearAlgebra { #include "la_vector.inst" @@ -42,4 +46,6 @@ namespace LinearAlgebra #undef TEMPL_COPY_CONSTRUCTOR } +#endif // ! DEAL_II_MSVC + DEAL_II_NAMESPACE_CLOSE