]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Remove a cycle in header files by undoing a MSVC hack. 18083/head
authorWolfgang Bangerth <bangerth@colostate.edu>
Tue, 4 Feb 2025 14:24:20 +0000 (07:24 -0700)
committerWolfgang Bangerth <bangerth@colostate.edu>
Tue, 4 Feb 2025 17:48:40 +0000 (10:48 -0700)
include/deal.II/lac/la_parallel_block_vector.h
source/lac/la_parallel_block_vector.cc

index 838f44b5efb9c5ebae2e31aaa0b5bfa12ba3be67..1ffede99de0bdae78da6a825ef6728002d34d00a 100644 (file)
@@ -837,8 +837,4 @@ struct is_serial_vector<LinearAlgebra::distributed::BlockVector<Number>>
 
 DEAL_II_NAMESPACE_CLOSE
 
-#ifdef DEAL_II_MSVC
-#  include <deal.II/lac/la_parallel_block_vector.templates.h>
-#endif
-
 #endif
index 8d3c8bbbe232cd5945d20bd58aadf8791df22016..d38ab1982bf4102b6c94c5d66879b9e94dfbc8b3 100644 (file)
 
 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"
+#include "la_parallel_block_vector.inst"
 
 // do a few functions that currently don't fit the scheme because they have
 // two template arguments that need to be different (the case of same
@@ -35,17 +30,15 @@ namespace LinearAlgebra
 {
   namespace distributed
   {
-#  define TEMPL_COPY_CONSTRUCTOR(S1, S2)                 \
-    template BlockVector<S1> &BlockVector<S1>::operator= \
-      <S2>(const BlockVector<S2> &)
+#define TEMPL_COPY_CONSTRUCTOR(S1, S2)                 \
+  template BlockVector<S1> &BlockVector<S1>::operator= \
+    <S2>(const BlockVector<S2> &)
 
     TEMPL_COPY_CONSTRUCTOR(double, float);
     TEMPL_COPY_CONSTRUCTOR(float, double);
 
-#  undef TEMPL_COPY_CONSTRUCTOR
+#undef TEMPL_COPY_CONSTRUCTOR
   } // namespace distributed
 } // namespace LinearAlgebra
 
-#endif // ! DEAL_II_MSVC
-
 DEAL_II_NAMESPACE_CLOSE

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.