From: bangerth Date: Fri, 11 Jan 2013 00:40:50 +0000 (+0000) Subject: Avoid a deprecated function. X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=01001093474d6a805366f2dd3677d27f01cfa300;p=dealii-svn.git Avoid a deprecated function. git-svn-id: https://svn.dealii.org/trunk@28010 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/include/deal.II/lac/parallel_vector.h b/deal.II/include/deal.II/lac/parallel_vector.h index a10ad71f34..5a86258671 100644 --- a/deal.II/include/deal.II/lac/parallel_vector.h +++ b/deal.II/include/deal.II/lac/parallel_vector.h @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2011, 2012 by deal.II authors +// Copyright (C) 2011, 2012, 2013 by deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -1220,7 +1220,7 @@ namespace parallel vector_view.template operator != (v.vector_view) : 0 ); - unsigned int result = + unsigned int result = partitioner->n_mpi_processes() > 1 ? Utilities::MPI::max(local_result, partitioner->get_communicator()) @@ -1769,7 +1769,7 @@ namespace parallel // but this might happen on some processors // for parallel implementation if (local_size()>0) - vector_view.scale (factor); + vector_view *= factor; }