From: Wolfgang Bangerth <bangerth@math.tamu.edu>
Date: Mon, 28 Oct 2013 16:08:39 +0000 (+0000)
Subject: Cast a variable to make some newer Xcode compilers happy.
X-Git-Tag: v8.1.0~466
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=53a6683ef212c10b481f33682563b29e5b4050d1;p=dealii.git

Cast a variable to make some newer Xcode compilers happy.


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

diff --git a/deal.II/include/deal.II/lac/vector.templates.h b/deal.II/include/deal.II/lac/vector.templates.h
index b6181ffdf3..2d729e578e 100644
--- a/deal.II/include/deal.II/lac/vector.templates.h
+++ b/deal.II/include/deal.II/lac/vector.templates.h
@@ -339,7 +339,7 @@ namespace internal
         std::fill (&*(dst.begin()+begin), &*(dst.begin()+end), s);
     }
 
-    
+
     template <typename T>
     void copy_subrange (const typename dealii::Vector<T>::size_type         begin,
                         const typename dealii::Vector<T>::size_type         end,
@@ -350,7 +350,7 @@ namespace internal
              (end-begin)*sizeof(T));
     }
 
-    
+
     template <typename T, typename U>
     void copy_subrange (const typename dealii::Vector<T>::size_type         begin,
                         const typename dealii::Vector<T>::size_type         end,
@@ -374,7 +374,7 @@ namespace internal
       copy_subrange (begin, end, src, dst);
     }
 
-    
+
     template <typename T, typename U>
     void copy_vector (const dealii::Vector<T> &src,
                       dealii::Vector<U>       &dst)
@@ -1070,7 +1070,7 @@ void Vector<Number>::scale (const Vector<Number2> &s)
   Assert (vec_size == s.vec_size, ExcDimensionMismatch(vec_size, s.vec_size));
 
   for (size_type i=0; i<vec_size; ++i)
-    val[i] *= s.val[i];
+    val[i] *= Number(s.val[i]);
 }