From: turcksin <turcksin@0785d39b-7218-0410-832d-ea1e28bc413d>
Date: Fri, 31 Jan 2014 00:04:32 +0000 (+0000)
Subject: Add several typenames and change min to fmin, max to fmax to help Visual Studio.
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2955ca7d769c9be50616ca58c7d873cfa646ffbb;p=dealii-svn.git

Add several typenames and change min to fmin, max to fmax to help Visual Studio.

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

diff --git a/deal.II/include/deal.II/base/event.h b/deal.II/include/deal.II/base/event.h
index a62e98643d..8e7d5ad938 100644
--- a/deal.II/include/deal.II/base/event.h
+++ b/deal.II/include/deal.II/base/event.h
@@ -202,7 +202,7 @@ namespace Algorithms
 
     const unsigned int n = flags.size();
     const unsigned int m = event.flags.size();
-    const unsigned int n_min = std::min(n, m);
+    const unsigned int n_min = std::fmin(n, m);
 
     // Now, if all_true set in the
     // other, then all must be true
diff --git a/deal.II/include/deal.II/lac/sparse_matrix.h b/deal.II/include/deal.II/lac/sparse_matrix.h
index 4efc719c17..2fae863171 100644
--- a/deal.II/include/deal.II/lac/sparse_matrix.h
+++ b/deal.II/include/deal.II/lac/sparse_matrix.h
@@ -145,7 +145,7 @@ namespace SparseMatrixIterators
      * Return a reference to the matrix into which this accessor points. Note
      * that in the present case, this is a constant reference.
      */
-    MatrixType &get_matrix () const;
+    const MatrixType &get_matrix () const;
 
   private:
     /**
@@ -2086,7 +2086,7 @@ namespace SparseMatrixIterators
 
   template <typename number>
   inline
-  typename Accessor<number, true>::MatrixType &
+  const typename Accessor<number, true>::MatrixType &
   Accessor<number, true>::get_matrix () const
   {
     return *matrix;
diff --git a/deal.II/include/deal.II/matrix_free/matrix_free.h b/deal.II/include/deal.II/matrix_free/matrix_free.h
index 5df978520e..dfdc478210 100644
--- a/deal.II/include/deal.II/matrix_free/matrix_free.h
+++ b/deal.II/include/deal.II/matrix_free/matrix_free.h
@@ -1463,7 +1463,7 @@ void MatrixFree<dim,Number>::
 reinit(const DH               &dof_handler,
        const ConstraintMatrix &constraints_in,
        const Quad             &quad,
-       const MatrixFree<dim,Number>::AdditionalData additional_data)
+       const typename MatrixFree<dim,Number>::AdditionalData additional_data)
 {
   MappingQ1<dim>                       mapping;
   std::vector<const DH *>               dof_handlers;
@@ -1490,7 +1490,7 @@ reinit(const Mapping<dim>     &mapping,
        const DH               &dof_handler,
        const ConstraintMatrix &constraints_in,
        const Quad             &quad,
-       const MatrixFree<dim,Number>::AdditionalData additional_data)
+       const typename MatrixFree<dim,Number>::AdditionalData additional_data)
 {
   std::vector<const DH *>               dof_handlers;
   std::vector<const ConstraintMatrix *> constraints;
@@ -1515,7 +1515,7 @@ void MatrixFree<dim,Number>::
 reinit(const std::vector<const DH *>               &dof_handler,
        const std::vector<const ConstraintMatrix *> &constraint,
        const std::vector<Quad>                    &quad,
-       const MatrixFree<dim,Number>::AdditionalData additional_data)
+       const typename MatrixFree<dim,Number>::AdditionalData additional_data)
 {
   MappingQ1<dim> mapping;
   std::vector<IndexSet> locally_owned_set =
@@ -1534,7 +1534,7 @@ void MatrixFree<dim,Number>::
 reinit(const std::vector<const DH *>               &dof_handler,
        const std::vector<const ConstraintMatrix *> &constraint,
        const Quad                                 &quad,
-       const MatrixFree<dim,Number>::AdditionalData additional_data)
+       const typename MatrixFree<dim,Number>::AdditionalData additional_data)
 {
   MappingQ1<dim> mapping;
   std::vector<Quad> quads;
@@ -1555,7 +1555,7 @@ reinit(const Mapping<dim>                         &mapping,
        const std::vector<const DH *>               &dof_handler,
        const std::vector<const ConstraintMatrix *> &constraint,
        const Quad                                 &quad,
-       const MatrixFree<dim,Number>::AdditionalData additional_data)
+       const typename MatrixFree<dim,Number>::AdditionalData additional_data)
 {
   std::vector<Quad> quads;
   quads.push_back(quad);
@@ -1575,7 +1575,7 @@ reinit(const Mapping<dim>                         &mapping,
        const std::vector<const DH *>  &dof_handler,
        const std::vector<const ConstraintMatrix *> &constraint,
        const std::vector<Quad>              &quad,
-       const MatrixFree<dim,Number>::AdditionalData additional_data)
+       const typename MatrixFree<dim,Number>::AdditionalData additional_data)
 {
   std::vector<IndexSet> locally_owned_set =
     internal::MatrixFree::extract_locally_owned_index_sets
@@ -1626,7 +1626,7 @@ reinit(const Mapping<dim>                         &mapping,
        const std::vector<const ConstraintMatrix *> &constraint,
        const std::vector<IndexSet>                &locally_owned_set,
        const std::vector<Quad>                    &quad,
-       const MatrixFree<dim,Number>::AdditionalData additional_data)
+       const typename MatrixFree<dim,Number>::AdditionalData additional_data)
 {
   // find out whether we use a hp Quadrature or a standard quadrature
   std::vector<hp::QCollection<1> > quad_hp;
diff --git a/deal.II/include/deal.II/matrix_free/matrix_free.templates.h b/deal.II/include/deal.II/matrix_free/matrix_free.templates.h
index 359deb1d8f..25dab92538 100644
--- a/deal.II/include/deal.II/matrix_free/matrix_free.templates.h
+++ b/deal.II/include/deal.II/matrix_free/matrix_free.templates.h
@@ -109,7 +109,7 @@ internal_reinit(const Mapping<dim>                          &mapping,
                 const std::vector<const ConstraintMatrix *> &constraint,
                 const std::vector<IndexSet>                 &locally_owned_set,
                 const std::vector<hp::QCollection<1> >      &quad,
-                const MatrixFree<dim,Number>::AdditionalData additional_data)
+                const typename MatrixFree<dim,Number>::AdditionalData additional_data)
 {
   if (additional_data.initialize_indices == true)
     {
@@ -231,7 +231,7 @@ internal_reinit(const Mapping<dim>                            &mapping,
                 const std::vector<const ConstraintMatrix *>    &constraint,
                 const std::vector<IndexSet>                   &locally_owned_set,
                 const std::vector<hp::QCollection<1> >        &quad,
-                const MatrixFree<dim,Number>::AdditionalData additional_data)
+                const typename MatrixFree<dim,Number>::AdditionalData additional_data)
 {
   if (additional_data.initialize_indices == true)
     {
diff --git a/deal.II/source/base/quadrature_lib.cc b/deal.II/source/base/quadrature_lib.cc
index bd328b4e00..c0c5095e1c 100644
--- a/deal.II/source/base/quadrature_lib.cc
+++ b/deal.II/source/base/quadrature_lib.cc
@@ -128,7 +128,7 @@ QGauss<1>::QGauss (const unsigned int n)
   const long double tolerance
     = (runtime_one + long_double_eps != runtime_one
        ?
-       std::max (double_eps / 100, long_double_eps * 5)
+       std::fmax (double_eps / 100, long_double_eps * 5)
        :
        double_eps * 5
       );
@@ -215,7 +215,7 @@ compute_quadrature_points(const unsigned int q,
   const long double tolerance
     = (runtime_one + long_double_eps != runtime_one
        ?
-       std::max (double_eps / 100, long_double_eps * 5)
+       std::fmax (double_eps / 100, long_double_eps * 5)
        :
        double_eps * 5
       );
diff --git a/deal.II/source/fe/mapping_q1.cc b/deal.II/source/fe/mapping_q1.cc
index 24c1fc8c8b..05269088ad 100644
--- a/deal.II/source/fe/mapping_q1.cc
+++ b/deal.II/source/fe/mapping_q1.cc
@@ -1902,7 +1902,7 @@ transform_real_to_unit_cell_internal_codim1
 (const typename Triangulation<dim_,dim_ + 1>::cell_iterator &cell,
  const Point<dim_ + 1>                                      &p,
  const Point<dim_ >                                         &initial_p_unit,
- MappingQ1<dim,spacedim>::InternalData                      &mdata) const
+ typename MappingQ1<dim,spacedim>::InternalData                      &mdata) const
 {
   const unsigned int spacedim1 = dim_+1;
   const unsigned int dim1 = dim_;