Make two variables const and thus Intel C++ compiler more happy.

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

diff --git a/deal.II/base/source/data_out_base.cc b/deal.II/base/source/data_out_base.cc
index abe50d9fb99b49dd0c5a0dbff40f265f681a41dd..6567017092d155cb0bd3864eb760b3bcc0516e5d 100644 (file)
--- a/deal.II/base/source/data_out_base.cc
+++ b/deal.II/base/source/data_out_base.cc
@@ -2245,9 +2245,11 @@ void DataOutInterface<dim,spacedim>::write_vtk (std::ostream &out) const
 
 
 template <int dim, int spacedim>
-void DataOutInterface<dim,spacedim>::write (std::ostream &out,
-                                           OutputFormat output_format) const
+void
+DataOutInterface<dim,spacedim>::write (std::ostream &out,
+                                      const OutputFormat output_format_) const
 {
+  OutputFormat output_format = output_format_;
   if (output_format == default_format)
     output_format = default_fmt;
   
@@ -2285,7 +2287,7 @@ void DataOutInterface<dim,spacedim>::write (std::ostream &out,
 
 
 template <int dim, int spacedim>
-void DataOutInterface<dim,spacedim>::set_default_format(OutputFormat fmt)
+void DataOutInterface<dim,spacedim>::set_default_format(const OutputFormat fmt)
 {
   Assert(fmt != default_format, ExcNotImplemented());
   default_fmt = fmt;
@@ -2342,8 +2344,10 @@ void DataOutInterface<dim,spacedim>::set_flags (const VtkFlags &flags)
 
 
 template <int dim, int spacedim>
-std::string DataOutInterface<dim,spacedim>::default_suffix (OutputFormat output_format) const
+std::string
+DataOutInterface<dim,spacedim>::default_suffix (const OutputFormat output_format_) const
 {
+  OutputFormat output_format = output_format_;
   if (output_format == default_format)
     output_format = default_fmt;
   

diff --git a/deal.II/deal.II/include/grid/geometry_info.h b/deal.II/deal.II/include/grid/geometry_info.h
index 2146aec2694c0549de54e9d1f84e307f9457e3fc..72b42ee7d94eb6a3e4f25c33508e2fb3bf90b777 100644 (file)
--- a/deal.II/deal.II/include/grid/geometry_info.h
+++ b/deal.II/deal.II/include/grid/geometry_info.h
@@ -168,8 +168,8 @@ struct GeometryInfo
                                      * laid down in the documentation of
                                      * the @ref{Triangulation} class.
                                      */
-    static unsigned int child_cell_on_face (unsigned int face,
-                                           unsigned int subface);
+    static unsigned int child_cell_on_face (const unsigned int face,
+                                           const unsigned int subface);
 };