From: Martin Kronbichler <kronbichler@lnm.mw.tum.de>
Date: Wed, 30 Dec 2015 13:45:14 +0000 (+0100)
Subject: Add instantiations
X-Git-Tag: v8.4.0-rc2~120^2
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bd3cfef9146007ee44b2cf8f032d0ca76aa66edd;p=dealii.git

Add instantiations
---

diff --git a/include/deal.II/lac/vector.templates.h b/include/deal.II/lac/vector.templates.h
index 478f64f534..8a3bc24aa5 100644
--- a/include/deal.II/lac/vector.templates.h
+++ b/include/deal.II/lac/vector.templates.h
@@ -603,7 +603,7 @@ Vector<Number>::Vector (const Vector<OtherNumber> &v)
   if (vec_size != 0)
     {
       allocate();
-      std::copy (v.begin(), v.end(), begin());
+      *this = v;
     }
 }
 #endif
@@ -795,9 +795,11 @@ namespace internal
                         const dealii::Vector<T> &src,
                         dealii::Vector<U>       &dst)
     {
+      const T *src_ptr = src.begin();
+      U *dst_ptr = dst.begin();
       DEAL_II_OPENMP_SIMD_PRAGMA
-      for (unsigned int i=begin; i<end; ++i)
-        dst.begin()[i] = src.begin()[i];
+      for (typename dealii::Vector<T>::size_type i=begin; i<end; ++i)
+        dst_ptr[i] = src_ptr[i];
     }
 
 
diff --git a/source/lac/vector.inst.in b/source/lac/vector.inst.in
index 949a95c3fc..014de81d5a 100644
--- a/source/lac/vector.inst.in
+++ b/source/lac/vector.inst.in
@@ -66,3 +66,14 @@ for (S1, S2 : COMPLEX_SCALARS)
     template
       void Vector<S1>::reinit<S2>(const Vector<S2>&, const bool);
   }
+
+for (S1: REAL_SCALARS; S2: COMPLEX_SCALARS)
+  {
+    namespace internal
+    \{
+      namespace Vector
+      \{
+      template void copy_vector<S1,S2> (const dealii::Vector<S1>&,
+                                        dealii::Vector<S2>&);
+      \}
+    \}