Be consistent in what we deprecate and if it's deprecated in a comment then do so...

git-svn-id: https://svn.dealii.org/trunk@28504 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/deal.II/include/deal.II/base/logstream.h b/deal.II/include/deal.II/base/logstream.h
index d4d47ef84bdd37ee57332e24c4492fe4ca1ae1c4..22250dd1468be0af8706dfdaee727253627bda5b 100644 (file)
--- a/deal.II/include/deal.II/base/logstream.h
+++ b/deal.II/include/deal.II/base/logstream.h
@@ -208,8 +208,6 @@ public:
   const std::string &get_prefix () const;
 
   /**
-   * @deprecated Use Prefix instead
-   *
    * Push another prefix on the
    * stack. Prefixes are
    * automatically separated by a
@@ -219,8 +217,6 @@ public:
   void push (const std::string &text);
 
   /**
-   * @deprecated Use Prefix instead
-   *
    * Remove the last prefix.
    */
   void pop ();

diff --git a/deal.II/include/deal.II/base/thread_management.h b/deal.II/include/deal.II/base/thread_management.h
index c97ad381a58781b7d19ee3f295aaa65c491da659..9aa238ad484a32e46ea0e69d23983afce1559a23 100644 (file)
--- a/deal.II/include/deal.II/base/thread_management.h
+++ b/deal.II/include/deal.II/base/thread_management.h
@@ -1,7 +1,7 @@
 //---------------------------------------------------------------------------
 //    $Id$
 //
-//    Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 by the deal.II authors
+//    Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 by the deal.II authors
 //
 //    This file is subject to QPL and may not be  distributed
 //    without copyright and license information. Please refer
@@ -2192,8 +2192,14 @@ namespace Threads
    * non-member or static member
    * functions with no arguments.
    *
-   * @deprecated
+   * @deprecated Use new_thread() instead.
    */
+  template <typename RT>
+  inline
+  internal::fun_encapsulator<RT,std_cxx1x::tuple<>,0>
+  spawn (RT (*fun_ptr)()) DEAL_II_DEPRECATED;
+
+
   template <typename RT>
   inline
   internal::fun_encapsulator<RT,std_cxx1x::tuple<>,0>
@@ -2208,8 +2214,14 @@ namespace Threads
    * function for member functions with
    * no arguments.
    *
-   * @deprecated
+   * @deprecated Use new_thread() instead.
    */
+  template <typename RT, typename C>
+  inline
+  internal::fun_encapsulator<RT,std_cxx1x::tuple<>,0>
+  spawn (C &c, RT (C::*fun_ptr)()) DEAL_II_DEPRECATED;
+
+
   template <typename RT, typename C>
   inline
   internal::fun_encapsulator<RT,std_cxx1x::tuple<>,0>
@@ -2225,8 +2237,14 @@ namespace Threads
    * const member functions with no
    * arguments.
    *
-   * @deprecated
+   * @deprecated Use new_thread() instead.
    */
+  template <typename RT, typename C>
+  inline
+  internal::fun_encapsulator<RT,std_cxx1x::tuple<>,0>
+  spawn (const C &c, RT (C::*fun_ptr)() const) DEAL_II_DEPRECATED;
+
+
   template <typename RT, typename C>
   inline
   internal::fun_encapsulator<RT,std_cxx1x::tuple<>,0>
@@ -2247,8 +2265,14 @@ namespace Threads
    * non-member or static member
    * functions with 1 argument.
    *
-   * @deprecated
+   * @deprecated Use new_thread() instead.
    */
+  template <typename RT, typename Arg1>
+  inline
+  internal::fun_encapsulator<RT,std_cxx1x::tuple<Arg1>,1>
+  spawn (RT (*fun_ptr)(Arg1)) DEAL_II_DEPRECATED;
+
+
   template <typename RT, typename Arg1>
   inline
   internal::fun_encapsulator<RT,std_cxx1x::tuple<Arg1>,1>
@@ -2264,8 +2288,14 @@ namespace Threads
    * function for member functions with
    * 1 argument.
    *
-   * @deprecated
+   * @deprecated Use new_thread() instead.
    */
+  template <typename RT, typename C, typename Arg1>
+  inline
+  internal::fun_encapsulator<RT,std_cxx1x::tuple<Arg1>,1>
+  spawn (C &c, RT (C::*fun_ptr)(Arg1)) DEAL_II_DEPRECATED;
+
+
   template <typename RT, typename C, typename Arg1>
   inline
   internal::fun_encapsulator<RT,std_cxx1x::tuple<Arg1>,1>
@@ -2281,8 +2311,14 @@ namespace Threads
    * const member functions with 1
    * argument.
    *
-   * @deprecated
+   * @deprecated Use new_thread() instead.
    */
+  template <typename RT, typename C, typename Arg1>
+  inline
+  internal::fun_encapsulator<RT,std_cxx1x::tuple<Arg1>,1>
+  spawn (const C &c, RT (C::*fun_ptr)(Arg1) const) DEAL_II_DEPRECATED;
+
+
   template <typename RT, typename C, typename Arg1>
   inline
   internal::fun_encapsulator<RT,std_cxx1x::tuple<Arg1>,1>
@@ -2301,8 +2337,14 @@ namespace Threads
    * non-member or static member
    * functions with 2 arguments.
    *
-   * @deprecated
+   * @deprecated Use new_thread() instead.
    */
+  template <typename RT, typename Arg1, typename Arg2>
+  inline
+  internal::fun_encapsulator<RT,std_cxx1x::tuple<Arg1, Arg2>,2>
+  spawn (RT (*fun_ptr)(Arg1,Arg2)) DEAL_II_DEPRECATED;
+
+
   template <typename RT, typename Arg1, typename Arg2>
   inline
   internal::fun_encapsulator<RT,std_cxx1x::tuple<Arg1, Arg2>,2>
@@ -2318,8 +2360,14 @@ namespace Threads
    * function for member functions with
    * 2 arguments.
    *
-   * @deprecated
+   * @deprecated Use new_thread() instead.
    */
+  template <typename RT, typename C, typename Arg1, typename Arg2>
+  inline
+  internal::fun_encapsulator<RT,std_cxx1x::tuple<Arg1, Arg2>,2>
+  spawn (C &c, RT (C::*fun_ptr)(Arg1,Arg2)) DEAL_II_DEPRECATED;
+
+
   template <typename RT, typename C, typename Arg1, typename Arg2>
   inline
   internal::fun_encapsulator<RT,std_cxx1x::tuple<Arg1, Arg2>,2>
@@ -2335,8 +2383,14 @@ namespace Threads
    * const member functions with 2
    * arguments.
    *
-   * @deprecated
+   * @deprecated Use new_thread() instead.
    */
+  template <typename RT, typename C, typename Arg1, typename Arg2>
+  inline
+  internal::fun_encapsulator<RT,std_cxx1x::tuple<Arg1, Arg2>,2>
+  spawn (const C &c, RT (C::*fun_ptr)(Arg1,Arg2) const) DEAL_II_DEPRECATED;
+
+
   template <typename RT, typename C, typename Arg1, typename Arg2>
   inline
   internal::fun_encapsulator<RT,std_cxx1x::tuple<Arg1, Arg2>,2>
@@ -2355,8 +2409,15 @@ namespace Threads
    * non-member or static member
    * functions with 3 arguments.
    *
-   * @deprecated
+   * @deprecated Use new_thread() instead.
    */
+  template <typename RT,
+           typename Arg1, typename Arg2, typename Arg3>
+  inline
+  internal::fun_encapsulator<RT,std_cxx1x::tuple<Arg1, Arg2, Arg3>,3>
+  spawn (RT (*fun_ptr)(Arg1,Arg2,Arg3)) DEAL_II_DEPRECATED;
+
+
   template <typename RT,
            typename Arg1, typename Arg2, typename Arg3>
   inline
@@ -2373,8 +2434,15 @@ namespace Threads
    * function for member functions with
    * 3 arguments.
    *
-   * @deprecated
+   * @deprecated Use new_thread() instead.
    */
+  template <typename RT, typename C,
+           typename Arg1, typename Arg2, typename Arg3>
+  inline
+  internal::fun_encapsulator<RT,std_cxx1x::tuple<Arg1, Arg2, Arg3>,3>
+  spawn (C &c, RT (C::*fun_ptr)(Arg1,Arg2,Arg3)) DEAL_II_DEPRECATED;
+
+
   template <typename RT, typename C,
            typename Arg1, typename Arg2, typename Arg3>
   inline
@@ -2391,8 +2459,15 @@ namespace Threads
    * const member functions with 3
    * arguments.
    *
-   * @deprecated
+   * @deprecated Use new_thread() instead.
    */
+  template <typename RT, typename C,
+           typename Arg1, typename Arg2, typename Arg3>
+  inline
+  internal::fun_encapsulator<RT,std_cxx1x::tuple<Arg1, Arg2, Arg3>,3>
+  spawn (const C &c, RT (C::*fun_ptr)(Arg1,Arg2,Arg3) const) DEAL_II_DEPRECATED;
+
+
   template <typename RT, typename C,
            typename Arg1, typename Arg2, typename Arg3>
   inline
@@ -2413,8 +2488,15 @@ namespace Threads
    * non-member or static member
    * functions with 4 arguments.
    *
-   * @deprecated
+   * @deprecated Use new_thread() instead.
    */
+  template <typename RT,
+           typename Arg1, typename Arg2, typename Arg3, typename Arg4>
+  inline
+  internal::fun_encapsulator<RT,std_cxx1x::tuple<Arg1, Arg2, Arg3, Arg4>,4>
+  spawn (RT (*fun_ptr)(Arg1,Arg2,Arg3,Arg4)) DEAL_II_DEPRECATED;
+
+
   template <typename RT,
            typename Arg1, typename Arg2, typename Arg3, typename Arg4>
   inline
@@ -2431,8 +2513,15 @@ namespace Threads
    * function for member functions with
    * 4 arguments.
    *
-   * @deprecated
+   * @deprecated Use new_thread() instead.
    */
+  template <typename RT, typename C,
+           typename Arg1, typename Arg2, typename Arg3, typename Arg4>
+  inline
+  internal::fun_encapsulator<RT,std_cxx1x::tuple<Arg1, Arg2, Arg3, Arg4>,4>
+  spawn (C &c, RT (C::*fun_ptr)(Arg1,Arg2,Arg3,Arg4)) DEAL_II_DEPRECATED;
+
+
   template <typename RT, typename C,
            typename Arg1, typename Arg2, typename Arg3, typename Arg4>
   inline
@@ -2449,8 +2538,15 @@ namespace Threads
    * const member functions with 4
    * arguments.
    *
-   * @deprecated
+   * @deprecated Use new_thread() instead.
    */
+  template <typename RT, typename C,
+           typename Arg1, typename Arg2, typename Arg3, typename Arg4>
+  inline
+  internal::fun_encapsulator<RT,std_cxx1x::tuple<Arg1, Arg2, Arg3, Arg4>,4>
+  spawn (const C &c, RT (C::*fun_ptr)(Arg1,Arg2,Arg3,Arg4) const) DEAL_II_DEPRECATED;
+
+
   template <typename RT, typename C,
            typename Arg1, typename Arg2, typename Arg3, typename Arg4>
   inline
@@ -2470,8 +2566,16 @@ namespace Threads
    * non-member or static member
    * functions with 5 arguments.
    *
-   * @deprecated
+   * @deprecated Use new_thread() instead.
    */
+  template <typename RT,
+           typename Arg1, typename Arg2, typename Arg3,
+           typename Arg4, typename Arg5>
+  inline
+  internal::fun_encapsulator<RT,std_cxx1x::tuple<Arg1, Arg2, Arg3, Arg4, Arg5>,5>
+  spawn (RT (*fun_ptr)(Arg1,Arg2,Arg3,Arg4,Arg5)) DEAL_II_DEPRECATED;
+
+
   template <typename RT,
            typename Arg1, typename Arg2, typename Arg3,
            typename Arg4, typename Arg5>
@@ -2489,8 +2593,16 @@ namespace Threads
    * function for member functions with
    * 5 arguments.
    *
-   * @deprecated
+   * @deprecated Use new_thread() instead.
    */
+  template <typename RT, typename C,
+           typename Arg1, typename Arg2, typename Arg3,
+           typename Arg4, typename Arg5>
+  inline
+  internal::fun_encapsulator<RT,std_cxx1x::tuple<Arg1, Arg2, Arg3, Arg4, Arg5>,5>
+  spawn (C &c, RT (C::*fun_ptr)(Arg1,Arg2,Arg3,Arg4,Arg5)) DEAL_II_DEPRECATED;
+
+
   template <typename RT, typename C,
            typename Arg1, typename Arg2, typename Arg3,
            typename Arg4, typename Arg5>
@@ -2508,8 +2620,16 @@ namespace Threads
    * const member functions with 5
    * arguments.
    *
-   * @deprecated
+   * @deprecated Use new_thread() instead.
    */
+  template <typename RT, typename C,
+           typename Arg1, typename Arg2, typename Arg3,
+           typename Arg4, typename Arg5>
+  inline
+  internal::fun_encapsulator<RT,std_cxx1x::tuple<Arg1, Arg2, Arg3, Arg4, Arg5>,5>
+  spawn (const C &c, RT (C::*fun_ptr)(Arg1,Arg2,Arg3,Arg4,Arg5) const) DEAL_II_DEPRECATED;
+
+
   template <typename RT, typename C,
            typename Arg1, typename Arg2, typename Arg3,
            typename Arg4, typename Arg5>
@@ -2530,8 +2650,16 @@ namespace Threads
    * non-member or static member
    * functions with 6 arguments.
    *
-   * @deprecated
+   * @deprecated Use new_thread() instead.
    */
+  template <typename RT,
+           typename Arg1, typename Arg2, typename Arg3,
+           typename Arg4, typename Arg5, typename Arg6>
+  inline
+  internal::fun_encapsulator<RT,std_cxx1x::tuple<Arg1, Arg2, Arg3, Arg4, Arg5, Arg6>,6>
+  spawn (RT (*fun_ptr)(Arg1,Arg2,Arg3,Arg4,Arg5,Arg6)) DEAL_II_DEPRECATED;
+
+
   template <typename RT,
            typename Arg1, typename Arg2, typename Arg3,
            typename Arg4, typename Arg5, typename Arg6>
@@ -2549,8 +2677,16 @@ namespace Threads
    * function for member functions with
    * 6 arguments.
    *
-   * @deprecated
+   * @deprecated Use new_thread() instead.
    */
+  template <typename RT, typename C,
+           typename Arg1, typename Arg2, typename Arg3,
+           typename Arg4, typename Arg5, typename Arg6>
+  inline
+  internal::fun_encapsulator<RT,std_cxx1x::tuple<Arg1, Arg2, Arg3, Arg4, Arg5, Arg6>,6>
+  spawn (C &c, RT (C::*fun_ptr)(Arg1,Arg2,Arg3,Arg4,Arg5,Arg6)) DEAL_II_DEPRECATED;
+
+
   template <typename RT, typename C,
            typename Arg1, typename Arg2, typename Arg3,
            typename Arg4, typename Arg5, typename Arg6>
@@ -2568,8 +2704,17 @@ namespace Threads
    * const member functions with 6
    * arguments.
    *
-   * @deprecated
+   * @deprecated Use new_thread() instead.
    */
+  template <typename RT, typename C,
+           typename Arg1, typename Arg2, typename Arg3,
+           typename Arg4, typename Arg5, typename Arg6>
+  inline
+  internal::fun_encapsulator<RT,
+           std_cxx1x::tuple<Arg1, Arg2, Arg3, Arg4, Arg5, Arg6>,6>
+  spawn (const C &c, RT (C::*fun_ptr)(Arg1,Arg2,Arg3,Arg4,Arg5,Arg6) const) DEAL_II_DEPRECATED;
+
+
   template <typename RT, typename C,
            typename Arg1, typename Arg2, typename Arg3,
            typename Arg4, typename Arg5, typename Arg6>
@@ -2591,8 +2736,18 @@ namespace Threads
    * non-member or static member
    * functions with 7 arguments.
    *
-   * @deprecated
+   * @deprecated Use new_thread() instead.
    */
+  template <typename RT,
+  typename Arg1, typename Arg2, typename Arg3,
+  typename Arg4, typename Arg5, typename Arg6,
+  typename Arg7>
+  inline
+  internal::fun_encapsulator<RT,std_cxx1x::tuple<Arg1, Arg2, Arg3,
+           Arg4, Arg5, Arg6, Arg7>,7>
+  spawn (RT (*fun_ptr)(Arg1,Arg2,Arg3,Arg4,Arg5,Arg6,Arg7)) DEAL_II_DEPRECATED;
+
+
   template <typename RT,
   typename Arg1, typename Arg2, typename Arg3,
   typename Arg4, typename Arg5, typename Arg6,
@@ -2612,8 +2767,18 @@ namespace Threads
    * function for member functions with
    * 7 arguments.
    *
-   * @deprecated
+   * @deprecated Use new_thread() instead.
    */
+  template <typename RT, typename C,
+  typename Arg1, typename Arg2, typename Arg3,
+  typename Arg4, typename Arg5, typename Arg6,
+  typename Arg7>
+  inline
+  internal::fun_encapsulator<RT,std_cxx1x::tuple<Arg1, Arg2, Arg3,
+           Arg4, Arg5, Arg6, Arg7>,7>
+  spawn (C &c, RT (C::*fun_ptr)(Arg1,Arg2,Arg3,Arg4,Arg5,Arg6,Arg7)) DEAL_II_DEPRECATED;
+
+
   template <typename RT, typename C,
   typename Arg1, typename Arg2, typename Arg3,
   typename Arg4, typename Arg5, typename Arg6,
@@ -2633,8 +2798,19 @@ namespace Threads
    * const member functions with 7
    * arguments.
    *
-   * @deprecated
+   * @deprecated Use new_thread() instead.
    */
+  template <typename RT, typename C,
+  typename Arg1, typename Arg2, typename Arg3,
+  typename Arg4, typename Arg5, typename Arg6,
+  typename Arg7>
+  inline
+  internal::fun_encapsulator<RT,
+           std_cxx1x::tuple<Arg1, Arg2, Arg3,
+           Arg4, Arg5, Arg6, Arg7>,7>
+  spawn (const C &c, RT (C::*fun_ptr)(Arg1,Arg2,Arg3,Arg4,Arg5,Arg6,Arg7) const) DEAL_II_DEPRECATED;
+
+
   template <typename RT, typename C,
   typename Arg1, typename Arg2, typename Arg3,
   typename Arg4, typename Arg5, typename Arg6,
@@ -2658,8 +2834,20 @@ namespace Threads
    * non-member or static member
    * functions with 8 arguments.
    *
-   * @deprecated
+   * @deprecated Use new_thread() instead.
    */
+  template <typename RT,
+  typename Arg1, typename Arg2, typename Arg3,
+  typename Arg4, typename Arg5, typename Arg6,
+  typename Arg7, typename Arg8>
+  inline
+  internal::fun_encapsulator<RT,std_cxx1x::tuple<Arg1, Arg2, Arg3,
+           Arg4, Arg5, Arg6,
+           Arg7, Arg8>,8>
+           spawn (RT (*fun_ptr)(Arg1,Arg2,Arg3,Arg4,Arg5,
+                                Arg6,Arg7,Arg8)) DEAL_II_DEPRECATED;
+
+
   template <typename RT,
   typename Arg1, typename Arg2, typename Arg3,
   typename Arg4, typename Arg5, typename Arg6,
@@ -2681,8 +2869,20 @@ namespace Threads
    * function for member functions with
    * 8 arguments.
    *
-   * @deprecated
+   * @deprecated Use new_thread() instead.
    */
+  template <typename RT, typename C,
+  typename Arg1, typename Arg2, typename Arg3,
+  typename Arg4, typename Arg5, typename Arg6,
+  typename Arg7, typename Arg8>
+  inline
+  internal::fun_encapsulator<RT,std_cxx1x::tuple<Arg1, Arg2, Arg3,
+           Arg4, Arg5, Arg6,
+           Arg7, Arg8>,8>
+           spawn (C &c, RT (C::*fun_ptr)(Arg1,Arg2,Arg3,Arg4,Arg5,
+                                         Arg6,Arg7,Arg8)) DEAL_II_DEPRECATED;
+
+
   template <typename RT, typename C,
   typename Arg1, typename Arg2, typename Arg3,
   typename Arg4, typename Arg5, typename Arg6,
@@ -2704,8 +2904,21 @@ namespace Threads
    * const member functions with 8
    * arguments.
    *
-   * @deprecated
+   * @deprecated Use new_thread() instead.
    */
+  template <typename RT, typename C,
+  typename Arg1, typename Arg2, typename Arg3,
+  typename Arg4, typename Arg5, typename Arg6,
+  typename Arg7, typename Arg8>
+  inline
+  internal::fun_encapsulator<RT,
+           std_cxx1x::tuple<Arg1, Arg2, Arg3,
+           Arg4, Arg5, Arg6,
+           Arg7, Arg8>,8>
+           spawn (const C &c, RT (C::*fun_ptr)(Arg1,Arg2,Arg3,Arg4,Arg5,
+                                               Arg6,Arg7,Arg8) const) DEAL_II_DEPRECATED;
+
+
   template <typename RT, typename C,
   typename Arg1, typename Arg2, typename Arg3,
   typename Arg4, typename Arg5, typename Arg6,
@@ -2731,8 +2944,20 @@ namespace Threads
    * non-member or static member
    * functions with 9 arguments.
    *
-   * @deprecated
+   * @deprecated Use new_thread() instead.
    */
+  template <typename RT,
+  typename Arg1, typename Arg2, typename Arg3,
+  typename Arg4, typename Arg5, typename Arg6,
+  typename Arg7, typename Arg8, typename Arg9>
+  inline
+  internal::fun_encapsulator<RT,std_cxx1x::tuple<Arg1, Arg2, Arg3,
+           Arg4, Arg5, Arg6,
+           Arg7, Arg8, Arg9>,9>
+           spawn (RT (*fun_ptr)(Arg1,Arg2,Arg3,Arg4,Arg5,
+                                Arg6,Arg7,Arg8,Arg9)) DEAL_II_DEPRECATED;
+
+
   template <typename RT,
   typename Arg1, typename Arg2, typename Arg3,
   typename Arg4, typename Arg5, typename Arg6,
@@ -2754,8 +2979,20 @@ namespace Threads
    * function for member functions with
    * 9 arguments.
    *
-   * @deprecated
+   * @deprecated Use new_thread() instead.
    */
+  template <typename RT, typename C,
+  typename Arg1, typename Arg2, typename Arg3,
+  typename Arg4, typename Arg5, typename Arg6,
+  typename Arg7, typename Arg8, typename Arg9>
+  inline
+  internal::fun_encapsulator<RT,std_cxx1x::tuple<Arg1, Arg2, Arg3,
+           Arg4, Arg5, Arg6,
+           Arg7, Arg8, Arg9>,9>
+           spawn (C &c, RT (C::*fun_ptr)(Arg1,Arg2,Arg3,Arg4,Arg5,
+                                         Arg6,Arg7,Arg8,Arg9)) DEAL_II_DEPRECATED;
+
+
   template <typename RT, typename C,
   typename Arg1, typename Arg2, typename Arg3,
   typename Arg4, typename Arg5, typename Arg6,
@@ -2777,8 +3014,21 @@ namespace Threads
    * const member functions with 9
    * arguments.
    *
-   * @deprecated
+   * @deprecated Use new_thread() instead.
    */
+  template <typename RT, typename C,
+  typename Arg1, typename Arg2, typename Arg3,
+  typename Arg4, typename Arg5, typename Arg6,
+  typename Arg7, typename Arg8, typename Arg9>
+  inline
+  internal::fun_encapsulator<RT,
+           std_cxx1x::tuple<Arg1, Arg2, Arg3,
+           Arg4, Arg5, Arg6,
+           Arg7, Arg8, Arg9>,9>
+           spawn (const C &c, RT (C::*fun_ptr)(Arg1,Arg2,Arg3,Arg4,Arg5,
+                                               Arg6,Arg7,Arg8,Arg9) const) DEAL_II_DEPRECATED;
+
+
   template <typename RT, typename C,
   typename Arg1, typename Arg2, typename Arg3,
   typename Arg4, typename Arg5, typename Arg6,

diff --git a/deal.II/include/deal.II/dofs/dof_accessor.h b/deal.II/include/deal.II/dofs/dof_accessor.h
index b0793d734d023b15754a0875af17aff284cd0ffe..55735bd088fa0bd9b5d5db984273feea6e583a1a 100644 (file)
--- a/deal.II/include/deal.II/dofs/dof_accessor.h
+++ b/deal.II/include/deal.II/dofs/dof_accessor.h
@@ -2141,6 +2141,7 @@ public:
    * @deprecated Currently, this function can also be called for non-active cells, if all degrees of freedom of the FiniteElement are located in vertices. This functionality will vanish in a future release.
    */
   void get_dof_indices (std::vector<unsigned int> &dof_indices) const;
+
   /**
    * @deprecated Use get_active_or_mg_dof_indices() with level_cell_iterator returned from begin_mg().
    *

diff --git a/deal.II/include/deal.II/grid/grid_out.h b/deal.II/include/deal.II/grid/grid_out.h
index 4e478cec99345a471eb68c76d8fc365c989d0fe5..910f47494ca4831b69bca7ea96f8b6335695005a 100644 (file)
--- a/deal.II/include/deal.II/grid/grid_out.h
+++ b/deal.II/include/deal.II/grid/grid_out.h
@@ -640,15 +640,14 @@ namespace GridOutFlags
     } color_by;
 
     /**
-     * @deprecated Use the color_by enum instead. If color_by is different
-     * from material_id, this flag is ignored.
+     * @deprecated Use the color_by enum instead.
      *
      * Change color depending on
      * level. Default is false, therefore,
      * color is coded by material or
      * boundary id.
      */
-    bool level_color;
+    bool level_color DEAL_II_DEPRECATED;
 
     /**
      * Code level to depth. Default is

diff --git a/deal.II/include/deal.II/lac/parallel_vector.h b/deal.II/include/deal.II/lac/parallel_vector.h
index a99f840b488312e75662a853a4d95f1430fc9194..67ab3926381e82f3fef77b48f2c67ce8a0bf8845 100644 (file)
--- a/deal.II/include/deal.II/lac/parallel_vector.h
+++ b/deal.II/include/deal.II/lac/parallel_vector.h
@@ -751,7 +751,7 @@ namespace parallel
        * Scale each element of the
        * vector by the given factor.
        *
-       * This function is deprecated
+       * @deprecated This function is deprecated
        * and will be removed in a
        * future version. Use
        * <tt>operator *=</tt> and

diff --git a/deal.II/include/deal.II/lac/precondition.h b/deal.II/include/deal.II/lac/precondition.h
index a2603c8498d75302781be79a1901fd2fe08dfe19..e1d7f3dd2d2a37001eab6132df40e936b9355ebe 100644 (file)
--- a/deal.II/include/deal.II/lac/precondition.h
+++ b/deal.II/include/deal.II/lac/precondition.h
@@ -809,7 +809,7 @@ private:
    * The preconditioner to use.
    */
   SmartPointer<const PRECONDITION,PreconditionLACSolver<SOLVER,MATRIX,PRECONDITION> > precondition;
-};
+} DEAL_II_DEPRECATED;
 
 
 
@@ -870,7 +870,7 @@ private:
    * Memory pool for vectors.
    */
   VectorMemory<VECTOR> &mem;
-};
+} DEAL_II_DEPRECATED;
 
 
 

diff --git a/deal.II/include/deal.II/lac/solver_selector.h b/deal.II/include/deal.II/lac/solver_selector.h
index a5a4c9ebd04b2c8872682b95415bb998d354f4ef..87cc26e6a65c5a241533d857dd2d02e00364a4d5 100644 (file)
--- a/deal.II/include/deal.II/lac/solver_selector.h
+++ b/deal.II/include/deal.II/lac/solver_selector.h
@@ -103,8 +103,8 @@ public:
   SolverSelector ();
 
   /**
-   * @deprecated Use deafult
-   * constructor and select.
+   * @deprecated Use the default
+   * constructor, set_control() and select().
    *
    * Constructor. Use the arguments
    * to initialize actual solver
@@ -113,7 +113,7 @@ public:
    */
   SolverSelector (const std::string    &solvername,
                   SolverControl        &control,
-                  VectorMemory<VECTOR> &vector_memory);
+                  VectorMemory<VECTOR> &vector_memory) DEAL_II_DEPRECATED;
 
   /**
    * Destructor

diff --git a/deal.II/include/deal.II/lac/sparse_ilu.h b/deal.II/include/deal.II/lac/sparse_ilu.h
index ff12933dd70c55549ec67f4975bc7bd8253185a0..ba745ccbbfb43ede877bd85072ba005f4aabcf99 100644 (file)
--- a/deal.II/include/deal.II/lac/sparse_ilu.h
+++ b/deal.II/include/deal.II/lac/sparse_ilu.h
@@ -126,9 +126,9 @@ public:
                   const double                    strengthen_diagonal=0.) DEAL_II_DEPRECATED;
 
   /**
-   * This method is deprecated, and
+   * @deprecated This method is deprecated, and
    * left for backward
-   * compability. It will be
+   * compatibility. It will be
    * removed in later versions.
    */
   template <typename somenumber>

diff --git a/deal.II/include/deal.II/lac/sparse_mic.h b/deal.II/include/deal.II/lac/sparse_mic.h
index d3a963e685f698406443e94b313d97a7be662b68..fca18fafd6104559931e5940a7f9d27c0c32662b 100644 (file)
--- a/deal.II/include/deal.II/lac/sparse_mic.h
+++ b/deal.II/include/deal.II/lac/sparse_mic.h
@@ -80,9 +80,9 @@ public:
   AdditionalData;
 
   /**
-   * This method is deprecated, and
+   * @deprecated This method is deprecated, and
    * left for backward
-   * compability. It will be
+   * compatibility. It will be
    * removed in later versions.
    */
   void reinit (const SparsityPattern &sparsity) DEAL_II_DEPRECATED;

diff --git a/deal.II/include/deal.II/lac/vector.h b/deal.II/include/deal.II/lac/vector.h
index bb109a84fb537cef9b797e6f4375b36b276ad33e..7f3aa0508e49f499331a554c443ab1f860273999 100644 (file)
--- a/deal.II/include/deal.II/lac/vector.h
+++ b/deal.II/include/deal.II/lac/vector.h
@@ -802,7 +802,7 @@ public:
    * Scale each element of the
    * vector by the given factor.
    *
-   * This function is deprecated
+   * @deprecated This function is deprecated
    * and will be removed in a
    * future version. Use
    * <tt>operator *=</tt> and

diff --git a/deal.II/include/deal.II/meshworker/loop.h b/deal.II/include/deal.II/meshworker/loop.h
index 188606252247351b8098552df17e5add07c8a773..c8b9aac55feb73fcd1f96e54d5b5f1cec87894a2 100644 (file)
--- a/deal.II/include/deal.II/meshworker/loop.h
+++ b/deal.II/include/deal.II/meshworker/loop.h
@@ -1,7 +1,7 @@
 //---------------------------------------------------------------------------
 //    $Id$
 //
-//    Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 by the deal.II authors
+//    Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 by the deal.II authors
 //
 //    This file is subject to QPL and may not be  distributed
 //    without copyright and license information. Please refer
@@ -291,6 +291,20 @@ namespace MeshWorker
    * @ingroup MeshWorker
    * @author Guido Kanschat, 2009
    */
+  template<int dim, int spacedim, class ITERATOR, class ASSEMBLER>
+  void integration_loop(ITERATOR begin,
+                        typename identity<ITERATOR>::type end,
+                        DoFInfo<dim, spacedim> &dof_info,
+                        IntegrationInfoBox<dim, spacedim> &box,
+                        const std_cxx1x::function<void (DoFInfo<dim>&, IntegrationInfo<dim, spacedim>&)> &cell_worker,
+                        const std_cxx1x::function<void (DoFInfo<dim>&, IntegrationInfo<dim, spacedim>&)> &boundary_worker,
+                        const std_cxx1x::function<void (DoFInfo<dim> &, DoFInfo<dim> &,
+                                                        IntegrationInfo<dim, spacedim> &,
+                                                        IntegrationInfo<dim, spacedim> &)> &face_worker,
+                        ASSEMBLER &assembler,
+                        bool cells_first = true) DEAL_II_DEPRECATED;
+
+
   template<int dim, int spacedim, class ITERATOR, class ASSEMBLER>
   void integration_loop(ITERATOR begin,
                         typename identity<ITERATOR>::type end,

diff --git a/deal.II/include/deal.II/multigrid/mg_dof_handler.h b/deal.II/include/deal.II/multigrid/mg_dof_handler.h
index 37353b526d977fbcc8d51bc241117e638d9dce13..24aa9000d6116c5460c8bd4a5952aa7214e5294f 100644 (file)
--- a/deal.II/include/deal.II/multigrid/mg_dof_handler.h
+++ b/deal.II/include/deal.II/multigrid/mg_dof_handler.h
@@ -148,7 +148,7 @@ public:
 
   //@}
 
-};
+} DEAL_II_DEPRECATED;
 
 /*@}*/
 

diff --git a/deal.II/include/deal.II/multigrid/mg_smoother.h b/deal.II/include/deal.II/multigrid/mg_smoother.h
index 866beb447e6474e086e4a5b037a8032d4b6b1883..bbfbfcedff69061d66f2a4368984c5c088c71a93 100644 (file)
--- a/deal.II/include/deal.II/multigrid/mg_smoother.h
+++ b/deal.II/include/deal.II/multigrid/mg_smoother.h
@@ -157,7 +157,6 @@ protected:
    * Memory for auxiliary vectors.
    */
   SmartPointer<VectorMemory<VECTOR>, MGSmoother<VECTOR> > mem;
-
 };
 
 
@@ -354,15 +353,26 @@ template<class MATRIX, class RELAX, class VECTOR>
 class MGSmootherRelaxation : public MGSmoother<VECTOR>
 {
 public:
+  /**
+   * Constructor. Sets smoothing parameters.
+   */
+  MGSmootherRelaxation(const unsigned int steps = 1,
+                       const bool variable = false,
+                       const bool symmetric = false,
+                       const bool transpose = false);
+
   /**
    * Constructor. Sets memory and
    * smoothing parameters.
+   *
+   * @deprecated Use the constructor without the vector memory
+   * object
    */
   MGSmootherRelaxation(VectorMemory<VECTOR> &mem,
                        const unsigned int steps = 1,
                        const bool variable = false,
                        const bool symmetric = false,
-                       const bool transpose = false);
+                       const bool transpose = false) DEAL_II_DEPRECATED;
 
   /**
    * Initialize for matrices. This
@@ -523,15 +533,26 @@ template<class MATRIX, class PRECONDITIONER, class VECTOR>
 class MGSmootherPrecondition : public MGSmoother<VECTOR>
 {
 public:
+  /**
+   * Constructor. Sets smoothing parameters.
+   */
+  MGSmootherPrecondition(const unsigned int steps = 1,
+                         const bool variable = false,
+                         const bool symmetric = false,
+                         const bool transpose = false);
+
   /**
    * Constructor. Sets memory and
    * smoothing parameters.
+   *
+   * @deprecated Use the constructor without the vector memory
+   * object
    */
   MGSmootherPrecondition(VectorMemory<VECTOR> &mem,
                          const unsigned int steps = 1,
                          const bool variable = false,
                          const bool symmetric = false,
-                         const bool transpose = false);
+                         const bool transpose = false) DEAL_II_DEPRECATED;
 
   /**
    * Initialize for matrices. This
@@ -866,6 +887,20 @@ MGSmootherRelaxation<MATRIX, RELAX, VECTOR>::MGSmootherRelaxation(
 {}
 
 
+
+template <class MATRIX, class RELAX, class VECTOR>
+inline
+MGSmootherRelaxation<MATRIX, RELAX, VECTOR>::MGSmootherRelaxation(
+  const unsigned int steps,
+  const bool variable,
+  const bool symmetric,
+  const bool transpose)
+  :
+  MGSmoother<VECTOR>(steps, variable, symmetric, transpose)
+{}
+
+
+
 template <class MATRIX, class RELAX, class VECTOR>
 inline void
 MGSmootherRelaxation<MATRIX, RELAX, VECTOR>::clear ()
@@ -1035,6 +1070,19 @@ MGSmootherPrecondition<MATRIX, PRECONDITIONER, VECTOR>::MGSmootherPrecondition(
 
 
 
+template <class MATRIX, class PRECONDITIONER, class VECTOR>
+inline
+MGSmootherPrecondition<MATRIX, PRECONDITIONER, VECTOR>::MGSmootherPrecondition(
+  const unsigned int steps,
+  const bool variable,
+  const bool symmetric,
+  const bool transpose)
+  :
+  MGSmoother<VECTOR>(steps, variable, symmetric, transpose)
+{}
+
+
+
 template <class MATRIX, class PRECONDITIONER, class VECTOR>
 inline void
 MGSmootherPrecondition<MATRIX, PRECONDITIONER, VECTOR>::clear ()

diff --git a/deal.II/include/deal.II/multigrid/mg_tools.h b/deal.II/include/deal.II/multigrid/mg_tools.h
index a359d7139b07bcc1d9ab0b7c0518b3b0450b7902..27df82e897a1424c5dd9713bbc49365116a183e5 100644 (file)
--- a/deal.II/include/deal.II/multigrid/mg_tools.h
+++ b/deal.II/include/deal.II/multigrid/mg_tools.h
@@ -249,7 +249,7 @@ namespace MGTools
                       const ComponentMask               &component_mask = ComponentMask());
 
   /**
-   * Maybe no longer needed.
+   * @deprecated
    */
   template <typename number>
   void
@@ -258,6 +258,9 @@ namespace MGTools
                          const bool preserve_symmetry,
                          const bool ignore_zeros = false) DEAL_II_DEPRECATED;
 
+  /**
+   * @deprecated
+   */
   template <typename number>
   void
   apply_boundary_values (const std::set<unsigned int> &boundary_dofs,