More fixed instantiations.

git-svn-id: https://svn.dealii.org/trunk@9386 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/deal.II/lac/source/block_vector.cc b/deal.II/lac/source/block_vector.cc
index fc6639932914fab6b1289fda9c78a0f2aa9fd84c..03589138404030e8d07c3bad567e334412d4710b 100644 (file)
--- a/deal.II/lac/source/block_vector.cc
+++ b/deal.II/lac/source/block_vector.cc
@@ -17,6 +17,11 @@
 template class BlockVector<double>;
 template class BlockVector<float>;
 
+#ifndef DEAL_II_EXPLICIT_CONSTRUCTOR_BUG    
+template BlockVector<double>::BlockVector (const BlockVector<float> &);
+template BlockVector<float>::BlockVector (const BlockVector<double> &);
+#endif
+
 template void BlockVector<double>::reinit<double>(const BlockVector<double>&,
                                                  const bool);
 template void BlockVector<double>::reinit<float>(const BlockVector<float>&,

diff --git a/deal.II/lac/source/vector.cc b/deal.II/lac/source/vector.cc
index 9c57dc77b34d22391434a31f32572ecafbf2aac6..dbb20d9885dfb04a8aab98dd2ec0b51cc029c4bb 100644 (file)
--- a/deal.II/lac/source/vector.cc
+++ b/deal.II/lac/source/vector.cc
@@ -17,7 +17,9 @@
 // explicit instantiations
 template class Vector<double>;
 
+#ifndef DEAL_II_EXPLICIT_CONSTRUCTOR_BUG    
 template Vector<double>::Vector (const Vector<float> &);
+#endif
 
 template Vector<double>& Vector<double>::DEAL_II_MEMBER_OP_TEMPLATE_INST operator=<float>(const Vector<float>&);
 template bool Vector<double>::DEAL_II_MEMBER_OP_TEMPLATE_INST operator==<double>(const Vector<double>&) const;
@@ -33,7 +35,9 @@ template void Vector<double>::scale<float>(const Vector<float>&);
 
 template class Vector<float>;
 
+#ifndef DEAL_II_EXPLICIT_CONSTRUCTOR_BUG    
 template Vector<float>::Vector (const Vector<double> &);
+#endif
 
 template Vector<float>& Vector<float>::DEAL_II_MEMBER_OP_TEMPLATE_INST operator=<double>(const Vector<double>&);
 template bool Vector<float>::DEAL_II_MEMBER_OP_TEMPLATE_INST operator==<double>(const Vector<double>&) const;

diff --git a/deal.II/lac/source/vector.long_double.cc b/deal.II/lac/source/vector.long_double.cc
index 494a564ca14061f0e3d6f5ec8c1536aba6a38632..46449c65ba8b0232424a23ec93fa6dd492ffaa8c 100644 (file)
--- a/deal.II/lac/source/vector.long_double.cc
+++ b/deal.II/lac/source/vector.long_double.cc
@@ -17,11 +17,13 @@
 // explicit instantiations
 template class Vector<long double>;
 
+#ifndef DEAL_II_EXPLICIT_CONSTRUCTOR_BUG    
 template Vector<long double>::Vector (const Vector<double> &);
 template Vector<long double>::Vector (const Vector<float> &);
 
 template Vector<double>::Vector (const Vector<long double> &);
 template Vector<float>::Vector (const Vector<long double> &);
+#endif
 
 template Vector<long double>& Vector<long double>::DEAL_II_MEMBER_OP_TEMPLATE_INST operator=<double>(const Vector<double>&);
 template Vector<long double>& Vector<long double>::DEAL_II_MEMBER_OP_TEMPLATE_INST operator=<float>(const Vector<float>&);