Remove deprecated function PointValueHistory::mark_locations().

diff --git a/include/deal.II/numerics/point_value_history.h b/include/deal.II/numerics/point_value_history.h
index f698a997e1a879b3a06bf48b8ca03756f13205bf..dac6fb6ee088877f230c8df9cc45f0edef22ce10 100644 (file)
--- a/include/deal.II/numerics/point_value_history.h
+++ b/include/deal.II/numerics/point_value_history.h
@@ -446,18 +446,6 @@ public:
    */
   Vector<double> mark_support_locations();
 
-
-  /**
-   * @deprecated
-   *
-   * This function only exists for backward compatibility as this is the
-   * interface provided by previous versions of the library. The function
-   * mark_support_locations replaces it and reflects the fact that the
-   * locations marked are actually the support points.
-   */
-  Vector<double> mark_locations() DEAL_II_DEPRECATED;
-
-
   /**
    * Stores the actual location of each support point selected by the @p
    * add_point(s) method.  This can be used to compare with the point

diff --git a/source/numerics/point_value_history.cc b/source/numerics/point_value_history.cc
index 3d38533795244573f28503e0595e96ecff6866d5..da6944ba5ba1e7270a3ec3f693b3faa7ffab6c27 100644 (file)
--- a/source/numerics/point_value_history.cc
+++ b/source/numerics/point_value_history.cc
@@ -1073,14 +1073,6 @@ Vector<double> PointValueHistory<dim>
 }
 
 
-template <int dim>
-Vector<double> PointValueHistory<dim>
-::mark_locations ()
-{
-  return mark_support_locations ();
-}
-
-
 template <int dim>
 void PointValueHistory<dim>
 ::get_support_locations (std::vector <std::vector<Point <dim> > > &locations)

diff --git a/tests/deal.II/point_value_history_01.cc b/tests/deal.II/point_value_history_01.cc
index d0fefa4b17d03e77f7cb0dfd32abfa07476400c1..32be72f5209d4c8b47140adf1ae1852500c04520 100644 (file)
--- a/tests/deal.II/point_value_history_01.cc
+++ b/tests/deal.II/point_value_history_01.cc
@@ -1,6 +1,6 @@
 // ---------------------------------------------------------------------
 //
-// Copyright (C) 2009 - 2013 by the deal.II authors
+// Copyright (C) 2009 - 2014 by the deal.II authors
 //
 // This file is part of the deal.II library.
 //
@@ -156,7 +156,7 @@ void TestPointValueHistory<dim>::run()
   test_copy.add_field_name("Solution");
   std::vector < std::vector <Point <dim> > > selected_locations;
   test_copy.get_points(selected_locations);
-  test_copy.mark_locations();
+  test_copy.mark_support_locations();
   test_copy.close();
   test_copy.start_new_dataset(0.1);
   test_copy.evaluate_field("Solution", solution);
@@ -191,7 +191,7 @@ void TestPointValueHistory<dim>::run()
     std::vector < std::vector <Point <dim> > > selected_locations;
     node_monitor.get_points(selected_locations);
     // write output to a file
-    Vector<double> node_locations = node_monitor.mark_locations();
+    Vector<double> node_locations = node_monitor.mark_support_locations();
     // write output to a file
   }