From e3b5ae936c75332549c006c768252720e03952a5 Mon Sep 17 00:00:00 2001
From: Wolfgang Bangerth <bangerth@math.tamu.edu>
Date: Sun, 4 Jan 2015 15:38:09 -0600
Subject: [PATCH] Remove deprecated function
 Triangulation::clear_user_pointers.

---
 doc/news/changes.h            | 1 +
 include/deal.II/grid/tria.h   | 8 --------
 source/grid/tria.cc           | 9 ---------
 tests/deal.II/user_data_01.cc | 6 +++---
 4 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/doc/news/changes.h b/doc/news/changes.h
index 71f82d7464..e793cde2bf 100644
--- a/doc/news/changes.h
+++ b/doc/news/changes.h
@@ -101,6 +101,7 @@ inconvenience this causes.
 - Deprecated members of namespace types.
 - Namespace deal_II_numbers.
 - Triangulation::distort_random.
+- Triangulation::clear_user_pointers.
 
 <!-- ----------- GENERAL IMPROVEMENTS ----------------- -->
 
diff --git a/include/deal.II/grid/tria.h b/include/deal.II/grid/tria.h
index 92126bf269..891f9a9164 100644
--- a/include/deal.II/grid/tria.h
+++ b/include/deal.II/grid/tria.h
@@ -2096,14 +2096,6 @@ public:
    */
   void clear_user_data ();
 
-  /**
-   * @deprecated User clear_user_data() instead.
-   *
-   * Clear all user pointers.  See also
-   * @ref GlossUserData.
-   */
-  void clear_user_pointers () DEAL_II_DEPRECATED;
-
   /**
    * Save all user indices. The output vector is resized if necessary. See
    * also
diff --git a/source/grid/tria.cc b/source/grid/tria.cc
index e79cb9fa4e..d7ab4f648a 100644
--- a/source/grid/tria.cc
+++ b/source/grid/tria.cc
@@ -9438,15 +9438,6 @@ void Triangulation<dim,spacedim>::clear_user_flags ()
 
 
 
-template <int dim, int spacedim>
-void Triangulation<dim,spacedim>::clear_user_pointers ()
-{
-  clear_user_data();
-}
-
-
-
-
 template <int dim, int spacedim>
 void Triangulation<dim, spacedim>::save_user_flags (std::ostream &out) const
 {
diff --git a/tests/deal.II/user_data_01.cc b/tests/deal.II/user_data_01.cc
index 962901eb6e..0651ab7b79 100644
--- a/tests/deal.II/user_data_01.cc
+++ b/tests/deal.II/user_data_01.cc
@@ -1,6 +1,6 @@
 // ---------------------------------------------------------------------
 //
-// Copyright (C) 2007 - 2013 by the deal.II authors
+// Copyright (C) 2007 - 2013, 2015 by the deal.II authors
 //
 // This file is part of the deal.II library.
 //
@@ -139,7 +139,7 @@ user_pointers(Triangulation<dim> &tr)
   // Fill user pointers with some
   // nonsense. clear them first
   Triangulation<dim> *p = &tr;
-  tr.clear_user_pointers();
+  tr.clear_user_data();
   for (typename Triangulation<dim>::cell_iterator it = tr.begin();
        it != tr.end(); ++it)
     it->set_user_pointer(p++);
@@ -279,7 +279,7 @@ void check()
   tr.refine_global(2);
 
   user_pointers(tr);
-  tr.clear_user_pointers();
+  tr.clear_user_data();
   user_indices(tr);
 }
 
-- 
2.39.5