Avoid a number of warnings we get with doxygen 1.5.5.

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

diff --git a/deal.II/base/include/base/flow_function.h b/deal.II/base/include/base/flow_function.h
index fea9f485f8b05d139b80cba519c8c2cf1ffb8dca..1631851d4a80711fe70516dd426f8974fe5b3a53 100644 (file)
--- a/deal.II/base/include/base/flow_function.h
+++ b/deal.II/base/include/base/flow_function.h
@@ -244,23 +244,23 @@ namespace Functions
     private:
                                       /// The auxiliary function Psi.
       double Psi(double phi) const;
-                                      /// The derivative of #Psi
+                                      /// The derivative of Psi()
       double Psi_1(double phi) const;
-                                      /// The 2nd derivative of #Psi
+                                      /// The 2nd derivative of Psi()
       double Psi_2(double phi) const;
-                                      /// The 3rd derivative of #Psi
+                                      /// The 3rd derivative of Psi()
       double Psi_3(double phi) const;
-                                      /// The 4th derivative of #Psi
+                                      /// The 4th derivative of Psi()
       double Psi_4(double phi) const;
                                       /// The angle of the reentrant corner
       const double omega;
                                       /// The exponent of the radius
       static const double lambda;
-                                      /// Cosine of #lambda times #omega
+                                      /// Cosine of lambda times omega
       const double coslo;
-                                      /// Auxiliary variable 1+#lambda
+                                      /// Auxiliary variable 1+lambda
       const double lp;
-                                      /// Auxiliary variable 1-#lambda
+                                      /// Auxiliary variable 1-lambda
       const double lm;
   };
   

diff --git a/deal.II/deal.II/include/grid/grid_in.h b/deal.II/deal.II/include/grid/grid_in.h
index ee7f9201d096618e5d1dec2a363cb9dfde26c288..dfe30c48a22c7613986792894c71e7dfece7dd1e 100644 (file)
--- a/deal.II/deal.II/include/grid/grid_in.h
+++ b/deal.II/deal.II/include/grid/grid_in.h
@@ -212,7 +212,7 @@ class GridIn
                                      */
     enum Format
     {
-                                          /// Use #default_format stored in this object
+                                          /// Use GridIn::default_format stored in this object
          Default,
                                           /// Use read_ucd()
          ucd,