From edd487c88e31295cdbfc1a77e35bff6d07157f7c Mon Sep 17 00:00:00 2001 From: young Date: Fri, 18 Jan 2013 20:27:55 +0000 Subject: [PATCH] Resolve a couple of doxygen link warnings... git-svn-id: https://svn.dealii.org/trunk@28137 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/examples/step-42/step-42.cc | 2 +- .../include/deal.II/dofs/dof_renumbering.h | 23 ++++++------------- deal.II/include/deal.II/lac/slepc_solver.h | 2 +- deal.II/include/deal.II/lac/sparse_ilu.h | 6 ++--- deal.II/include/deal.II/lac/sparse_mic.h | 17 ++++++-------- 5 files changed, 18 insertions(+), 32 deletions(-) diff --git a/deal.II/examples/step-42/step-42.cc b/deal.II/examples/step-42/step-42.cc index 511094c4db..8750d9a4b0 100644 --- 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(i)); + a=std::pow(0.5, static_cast(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 1595102000..07221368bd 100644 --- 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 &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 void diff --git a/deal.II/include/deal.II/lac/slepc_solver.h b/deal.II/include/deal.II/lac/slepc_solver.h index 08d9833d0e..68f72fbac1 100644 --- 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 dealii::SolverData object. + * Pointer to the SolverData object. */ std_cxx1x::shared_ptr 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 8ad744ede8..ff12933dd7 100644 --- 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 ¶meters = 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 void decompose (const SparseMatrix &matrix, diff --git a/deal.II/include/deal.II/lac/sparse_mic.h b/deal.II/include/deal.II/lac/sparse_mic.h index b250b3fb45..d3a963e685 100644 --- 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 ¶meters = 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 void decompose (const SparseMatrix &matrix, -- 2.39.5