Resolve a couple of doxygen link warnings...

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

diff --git a/deal.II/examples/step-42/step-42.cc b/deal.II/examples/step-42/step-42.cc
index 511094c4dbdf12a4ee1052e5f622a8b199dc0b95..8750d9a4b0a652845ebc9304a40fd0235933fe4f 100644 (file)
--- a/deal.II/examples/step-42/step-42.cc
+++ b/deal.II/examples/step-42/step-42.cc
@@ -1198,7 +1198,7 @@ namespace Step42
         double a = 0;
         for (unsigned int i=0; (i<10)&&(!damped); i++)
           {
-            a=pow(0.5, static_cast<double>(i));
+            a=std::pow(0.5, static_cast<double>(i));
             old_solution = tmp_vector;
             old_solution.sadd(1-a,a, distributed_solution);
 

diff --git a/deal.II/include/deal.II/dofs/dof_renumbering.h b/deal.II/include/deal.II/dofs/dof_renumbering.h
index 1595102000972b7c36ce9f0ddf3bae7b15fde0fa..07221368bd7637e374c8d6e62982b0df0e858312 100644 (file)
--- a/deal.II/include/deal.II/dofs/dof_renumbering.h
+++ b/deal.II/include/deal.II/dofs/dof_renumbering.h
@@ -1243,23 +1243,14 @@ namespace DoFRenumbering
                            const std::vector<bool> &selected_dofs);
 
   /**
-   * Sort those degrees of freedom
-   * which are tagged with @p true
-   * in the @p selected_dofs array
-   * on the level #level
-   * to the back of the DoF
-   * numbers. The sorting is
-   * stable, i.e. the relative
-   * order within the tagged
-   * degrees of freedom is
-   * preserved, as is the relative
-   * order within the untagged
-   * ones.
+   * Sort those degrees of freedom which are tagged with @p true in
+   * the @p selected_dofs array on the level @p level to the back of
+   * the DoF numbers. The sorting is stable, i.e. the relative order
+   * within the tagged degrees of freedom is preserved, as is the
+   * relative order within the untagged ones.
    *
-   * @pre The @p selected_dofs
-   * array must have as many elements as
-   * the @p dof_handler has degrees of
-   * freedom on the given level.
+   * @pre The @p selected_dofs array must have as many elements as the
+   * @p dof_handler has degrees of freedom on the given level.
    */
   template <class DH>
   void

diff --git a/deal.II/include/deal.II/lac/slepc_solver.h b/deal.II/include/deal.II/lac/slepc_solver.h
index 08d9833d0eb387d3c57acadfe62e1246802a1de6..68f72fbac1038eacca7356fabf348190df899978 100644 (file)
--- a/deal.II/include/deal.II/lac/slepc_solver.h
+++ b/deal.II/include/deal.II/lac/slepc_solver.h
@@ -352,7 +352,7 @@ namespace SLEPcWrappers
     };
 
     /**
-     * Pointer to the <code>dealii::SolverData</code> object.
+     * Pointer to the <code>SolverData</code> object.
      */
     std_cxx1x::shared_ptr<SolverData> solver_data;
   };

diff --git a/deal.II/include/deal.II/lac/sparse_ilu.h b/deal.II/include/deal.II/lac/sparse_ilu.h
index 8ad744ede8ab448612070665994b53ced8d307ea..ff12933dd70c55549ec67f4975bc7bd8253185a0 100644 (file)
--- a/deal.II/include/deal.II/lac/sparse_ilu.h
+++ b/deal.II/include/deal.II/lac/sparse_ilu.h
@@ -118,10 +118,8 @@ public:
                    const AdditionalData &parameters = AdditionalData());
 
   /**
-   * @deprecate This method is deprecated, and
-   * left for backward
-   * compability. It will be
-   * removed in later versions.
+   * @deprecated This method is deprecated, and left for backward
+   * compability. It will be removed in later versions.
    */
   template <typename somenumber>
   void decompose (const SparseMatrix<somenumber> &matrix,

diff --git a/deal.II/include/deal.II/lac/sparse_mic.h b/deal.II/include/deal.II/lac/sparse_mic.h
index b250b3fb45365b2915ea61a05003469b9c1affdd..d3a963e685f698406443e94b313d97a7be662b68 100644 (file)
--- a/deal.II/include/deal.II/lac/sparse_mic.h
+++ b/deal.II/include/deal.II/lac/sparse_mic.h
@@ -49,12 +49,10 @@ public:
   SparseMIC ();
 
   /**
-   * @deprecated This method is deprecated, and
-   * left for backward
-   * compatibility. It will be removed
-   * in later versions.
-   * Instead, pass the sparsity pattern that you want used for
-   * the decomposition in the AdditionalData structure.
+   * @deprecated This method is deprecated, and left for backward
+   * compatibility. It will be removed in later versions.  Instead,
+   * pass the sparsity pattern that you want used for the
+   * decomposition in the AdditionalData structure.
    */
   SparseMIC (const SparsityPattern &sparsity) DEAL_II_DEPRECATED;
 
@@ -125,10 +123,9 @@ public:
                    const AdditionalData &parameters = AdditionalData());
 
   /**
-   * @deprecate This method is deprecated, and
-   * left for backward
-   * compability. It will be
-   * removed in later versions. Use initialize() instead.
+   * @deprecated This method is deprecated, and left for backward
+   * compability. It will be removed in later versions. Use
+   * initialize() instead.
    */
   template <typename somenumber>
   void decompose (const SparseMatrix<somenumber> &matrix,