From: bangerth Date: Tue, 6 Apr 2010 03:53:19 +0000 (+0000) Subject: Use std::memset, not just memset. X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d85dba2ad57a9a9ddc7521ad270937be081770d6;p=dealii-svn.git Use std::memset, not just memset. git-svn-id: https://svn.dealii.org/trunk@20939 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/lac/include/lac/vector.h b/deal.II/lac/include/lac/vector.h index 275d8437df..dddf85158b 100644 --- a/deal.II/lac/include/lac/vector.h +++ b/deal.II/lac/include/lac/vector.h @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 by the deal.II authors +// Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -21,6 +21,7 @@ #include #include +#include #include DEAL_II_NAMESPACE_OPEN @@ -1066,7 +1067,7 @@ namespace internal dealii::Vector &dst) { if (s == T()) - memset ((dst.begin()+begin),0,(end-begin)*sizeof(T)); + std::memset ((dst.begin()+begin),0,(end-begin)*sizeof(T)); else std::fill (&*(dst.begin()+begin), &*(dst.begin()+end), s); } @@ -1125,7 +1126,7 @@ Vector & Vector::operator = (const Number s) #ifdef DEAL_II_BOOST_BIND_COMPILER_BUG template <> inline -Vector > & +Vector > & Vector >::operator = (const std::complex s) { Assert (numbers::is_finite(s), @@ -1154,7 +1155,7 @@ Vector::operator = (const Vector& v) parallel::apply_to_subranges (0U, vec_size, std_cxx1x::bind(&internal::Vector::template copy_subrange, - std_cxx1x::cref(v), _1, _2, + std_cxx1x::cref(v), _1, _2, std_cxx1x::ref(*this)), internal::Vector::minimum_parallel_grain_size); else if (vec_size > 0) @@ -1177,7 +1178,7 @@ Vector::operator = (const Vector& v) parallel::apply_to_subranges (0U, vec_size, std_cxx1x::bind(&internal::Vector::template copy_subrange_ext, - std_cxx1x::cref(v), _1, _2, + std_cxx1x::cref(v), _1, _2, std_cxx1x::ref(*this)), internal::Vector::minimum_parallel_grain_size); else if (vec_size > 0) @@ -1302,7 +1303,7 @@ Vector::scale (const Number factor) (factor*boost::lambda::_1), internal::Vector::minimum_parallel_grain_size); } - + template @@ -1350,7 +1351,7 @@ Vector::add (const unsigned int n_indices, val[indices[i]] += values[i]; } } - + template