]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Cast a variable to make some newer Xcode compilers happy.
authorWolfgang Bangerth <bangerth@math.tamu.edu>
Mon, 28 Oct 2013 16:08:39 +0000 (16:08 +0000)
committerWolfgang Bangerth <bangerth@math.tamu.edu>
Mon, 28 Oct 2013 16:08:39 +0000 (16:08 +0000)
git-svn-id: https://svn.dealii.org/trunk@31468 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/include/deal.II/lac/vector.templates.h

index b6181ffdf3f2a3330e7b9014f6e105843c80231f..2d729e578e8ba464b4a2066a700c2df232652780 100644 (file)
@@ -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]);
 }
 
 

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.