From c9a0b5cea30efbaddf99a6d59470f70db88a94f2 Mon Sep 17 00:00:00 2001
From: Wolfgang Bangerth <bangerth@math.tamu.edu>
Date: Thu, 8 Jan 2015 16:31:41 -0600
Subject: [PATCH] Remove deprecated function Vector::scale.

---
 doc/news/changes.h                         |  1 +
 include/deal.II/lac/eigen.h                |  6 +++---
 include/deal.II/lac/vector.h               | 11 -----------
 tests/base/polynomial_lagrange_ops.cc      |  2 +-
 tests/lac/block_vector_iterator.cc         |  4 ++--
 tests/lac/complex_block_vector_iterator.cc |  4 ++--
 tests/lac/vector-vector.cc                 |  4 ++--
 7 files changed, 11 insertions(+), 21 deletions(-)

diff --git a/doc/news/changes.h b/doc/news/changes.h
index 48ddc448aa..7e155f1eda 100644
--- a/doc/news/changes.h
+++ b/doc/news/changes.h
@@ -116,6 +116,7 @@ inconvenience this causes.
   the <code>cell_normal_vector</code> functions were replaced by
   <code>normal_vector</code> ones. In all cases, the new functions
   have been around for a while.
+- Vector::scale.
 
 <!-- ----------- GENERAL IMPROVEMENTS ----------------- -->
 
diff --git a/include/deal.II/lac/eigen.h b/include/deal.II/lac/eigen.h
index b6489b0c3c..d3868669ae 100644
--- a/include/deal.II/lac/eigen.h
+++ b/include/deal.II/lac/eigen.h
@@ -1,6 +1,6 @@
 // ---------------------------------------------------------------------
 //
-// Copyright (C) 2000 - 2013 by the deal.II authors
+// Copyright (C) 2000 - 2013, 2015 by the deal.II authors
 //
 // This file is part of the deal.II library.
 //
@@ -248,7 +248,7 @@ EigenPower<VECTOR>::solve (double       &value,
 
   double length = x.l2_norm ();
   double old_length = 0.;
-  x.scale(1./length);
+  x *= 1./length;
 
   A.vmult (y,x);
 
@@ -356,7 +356,7 @@ EigenInverse<VECTOR>::solve (double       &value,
   double length = x.l2_norm ();
   double old_value = value;
 
-  x.scale(1./length);
+  x *= 1./length;
 
   // Main loop
   double res = -std::numeric_limits<double>::max();
diff --git a/include/deal.II/lac/vector.h b/include/deal.II/lac/vector.h
index 176a752464..0b14aac125 100644
--- a/include/deal.II/lac/vector.h
+++ b/include/deal.II/lac/vector.h
@@ -705,17 +705,6 @@ public:
              const Number          c,
              const Vector<Number> &X);
 
-  /**
-   * Scale each element of the vector by the given factor.
-   *
-   * @deprecated This function is deprecated and will be removed in a future
-   * version. Use <tt>operator *=</tt> and <tt>operator /=</tt> instead.
-   */
-  void scale (const Number factor) DEAL_II_DEPRECATED
-  {
-    this->operator *= (factor);
-  }
-
   /**
    * Scale each element of the vector by a constant value.
    *
diff --git a/tests/base/polynomial_lagrange_ops.cc b/tests/base/polynomial_lagrange_ops.cc
index 8440b752e5..553160c699 100644
--- a/tests/base/polynomial_lagrange_ops.cc
+++ b/tests/base/polynomial_lagrange_ops.cc
@@ -1,6 +1,6 @@
 // ---------------------------------------------------------------------
 //
-// Copyright (C) 2011 - 2013 by the deal.II authors
+// Copyright (C) 2011 - 2013, 2015 by the deal.II authors
 //
 // This file is part of the deal.II library.
 //
diff --git a/tests/lac/block_vector_iterator.cc b/tests/lac/block_vector_iterator.cc
index 15f8f67ccb..50e3bd99f0 100644
--- a/tests/lac/block_vector_iterator.cc
+++ b/tests/lac/block_vector_iterator.cc
@@ -1,6 +1,6 @@
 // ---------------------------------------------------------------------
 //
-// Copyright (C) 2000 - 2013 by the deal.II authors
+// Copyright (C) 2000 - 2013, 2015 by the deal.II authors
 //
 // This file is part of the deal.II library.
 //
@@ -178,7 +178,7 @@ void test ()
       std::transform (v1.begin(), v1.end(), v2.begin(),
                       std::bind2nd (std::multiplies<double>(),
                                     2.0));
-      v2.scale (1./2.);
+      v2 *= 1./2;
       deallog << "Check 7: " << (v1 == v2 ? "true" : "false") << std::endl;
 
 
diff --git a/tests/lac/complex_block_vector_iterator.cc b/tests/lac/complex_block_vector_iterator.cc
index ea2db8150e..06c9cda637 100644
--- a/tests/lac/complex_block_vector_iterator.cc
+++ b/tests/lac/complex_block_vector_iterator.cc
@@ -1,6 +1,6 @@
 // ---------------------------------------------------------------------
 //
-// Copyright (C) 2000 - 2013 by the deal.II authors
+// Copyright (C) 2000 - 2013, 2015 by the deal.II authors
 //
 // This file is part of the deal.II library.
 //
@@ -178,7 +178,7 @@ void test ()
       std::transform (v1.begin(), v1.end(), v2.begin(),
                       std::bind2nd (std::multiplies<std::complex<double> >(),
                                     2.0));
-      v2.scale (std::complex<double>(1./2.));
+      v2 *= std::complex<double>(1./2.);
       deallog << "Check 7: " << (v1 == v2 ? "true" : "false") << std::endl;
 
 
diff --git a/tests/lac/vector-vector.cc b/tests/lac/vector-vector.cc
index 788b16974c..ad40cbc574 100644
--- a/tests/lac/vector-vector.cc
+++ b/tests/lac/vector-vector.cc
@@ -1,6 +1,6 @@
 // ---------------------------------------------------------------------
 //
-// Copyright (C) 1998 - 2013 by the deal.II authors
+// Copyright (C) 1998 - 2013, 2015 by the deal.II authors
 //
 // This file is part of the deal.II library.
 //
@@ -137,7 +137,7 @@ void check_vectors (Vector<number1> &d1, Vector<number2> &d2)
   d1.sadd (2, 2, d2, 2, d3);
   print (d1);
 
-  d1.scale (4.);
+  d1 *= 4.;
   print (d1);
 
   deallog << "equ" << std::endl;
-- 
2.39.5