From: Wolfgang Bangerth <bangerth@math.tamu.edu>
Date: Fri, 4 Jun 2004 16:29:31 +0000 (+0000)
Subject: More fixed instantiations.
X-Git-Tag: v8.0.0~15073
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8cba8cc3f1;p=dealii.git

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 fc66399329..0358913840 100644
--- 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 9c57dc77b3..dbb20d9885 100644
--- 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 494a564ca1..46449c65ba 100644
--- 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>&);