]> https://gitweb.dealii.org/ - dealii.git/commitdiff
disable LA [block]vector instantiations for MSVC
authorTimo Heister <timo.heister@gmail.com>
Mon, 22 Aug 2016 16:46:08 +0000 (12:46 -0400)
committerTimo Heister <timo.heister@gmail.com>
Tue, 23 Aug 2016 12:43:43 +0000 (08:43 -0400)
include/deal.II/lac/la_parallel_block_vector.h
include/deal.II/lac/la_vector.h
source/base/job_identifier.cc
source/lac/la_parallel_block_vector.cc
source/lac/la_vector.cc

index 0b24efa02df2de660019cfc4b82825282e9287e1..2d325cf4ae95bcc2bd02c3ef63a63d391f890746 100644 (file)
@@ -596,4 +596,8 @@ void swap (LinearAlgebra::distributed::BlockVector<Number> &u,
 
 DEAL_II_NAMESPACE_CLOSE
 
+#ifdef DEAL_II_MSVC
+#include <deal.II/lac/la_parallel_block_vector.templates.h>
+#endif
+
 #endif
index 73cdb8390fdc324a5259d1a3f17cf7e1afd2e184..5d82fcbbade6559eb83206d70837af187545b438 100644 (file)
@@ -383,4 +383,8 @@ namespace LinearAlgebra
 
 DEAL_II_NAMESPACE_CLOSE
 
+#ifdef DEAL_II_MSVC
+#include <deal.II/lac/la_vector.templates.h>
+#endif
+
 #endif
index 320bfc2e90d5bfaf6c51c422f642a8f01dcec355..c59f8ae2128b35aa3d8b2e4a4d9adb34d4829741 100644 (file)
@@ -20,7 +20,7 @@
 # include <unistd.h>
 #endif
 
-#ifdef DEAM_II_MSVC
+#ifdef DEAL_II_MSVC
 #  include <WinSock2.h>
 #endif
 
index bbabfc3e7ad3a54b7f0d88f84a48a2ac3d2c4c3b..f7be61300ee9c3dcdb58bd94951e30ec9634311b 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"
 
 // 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
index 10f4e73e48afcb353357e440ecd889135e871b15..37d70f768b03c76307e5e9d757b55547c1efab51 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
+
 namespace LinearAlgebra
 {
 #include "la_vector.inst"
@@ -42,4 +46,6 @@ namespace LinearAlgebra
 #undef TEMPL_COPY_CONSTRUCTOR
 }
 
+#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.