Part II of: Convert a bunch of bare 'unsigned's into 'unsigned int's to make the...

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

diff --git a/deal.II/source/base/logstream.cc b/deal.II/source/base/logstream.cc
index 94729e15f624179981b114e3b011b47a3d09114f..98f06e51ddd89cdafdd86136224f4d8170ee5676 100644 (file)
--- a/deal.II/source/base/logstream.cc
+++ b/deal.II/source/base/logstream.cc
@@ -255,7 +255,7 @@ void LogStream::pop ()
 
 
 unsigned int
-LogStream::depth_console (const unsigned n)
+LogStream::depth_console (const unsigned int n)
 {
   Threads::ThreadMutex::ScopedLock lock(log_lock);
   const unsigned int h = std_depth;
@@ -265,7 +265,7 @@ LogStream::depth_console (const unsigned n)
 
 
 unsigned int
-LogStream::depth_file (const unsigned n)
+LogStream::depth_file (const unsigned int n)
 {
   Threads::ThreadMutex::ScopedLock lock(log_lock);
   const unsigned int h = file_depth;

diff --git a/deal.II/source/base/thread_management.cc b/deal.II/source/base/thread_management.cc
index 033bb2df5cee5ce91029d7052cf57a4ab460c63e..7549689b4827ca483a588ca15f91083ebfd2dcfc 100644 (file)
--- a/deal.II/source/base/thread_management.cc
+++ b/deal.II/source/base/thread_management.cc
@@ -154,7 +154,7 @@ namespace Threads
     const pid_t this_id = getpid();
 #else
 #  ifdef DEAL_II_MSVC
-    const unsigned this_id = 0;
+    const unsigned int this_id = 0;
 #  else
     const pid_t this_id = 0;
 #  endif

diff --git a/deal.II/source/distributed/tria.cc b/deal.II/source/distributed/tria.cc
index a75cad3012bfc0141e458a2f77802ec9c581f886..9499c5548fefbd65b1f7e6df8aab93e4e668aeb7 100644 (file)
--- a/deal.II/source/distributed/tria.cc
+++ b/deal.II/source/distributed/tria.cc
@@ -164,7 +164,7 @@ namespace internal
                                                        long *length);
 
         static
-        unsigned (&checksum) (types<2>::forest * p4est);
+        unsigned int (&checksum) (types<2>::forest * p4est);
 
         static
         void (&vtk_write_file) (types<2>::forest * p4est,
@@ -286,7 +286,7 @@ namespace internal
                                         long *length)
     = p4est_connectivity_load;
 
-    unsigned (&functions<2>::checksum) (types<2>::forest * p4est)
+    unsigned int (&functions<2>::checksum) (types<2>::forest * p4est)
     = p4est_checksum;
 
     void (&functions<2>::vtk_write_file) (types<2>::forest * p4est,
@@ -412,7 +412,7 @@ namespace internal
                                                        long *length);
 
         static
-        unsigned (&checksum) (types<3>::forest * p8est);
+        unsigned int (&checksum) (types<3>::forest * p8est);
 
         static
         void (&vtk_write_file) (types<3>::forest * p8est,
@@ -537,7 +537,7 @@ namespace internal
                                         long *length)
     = p8est_connectivity_load;
 
-    unsigned (&functions<3>::checksum) (types<3>::forest * p8est)
+    unsigned int (&functions<3>::checksum) (types<3>::forest * p8est)
     = p8est_checksum;
 
     void (&functions<3>::vtk_write_file) (types<3>::forest * p8est,
@@ -831,7 +831,7 @@ namespace
                     if (f>cell->neighbor_of_neighbor (f))
                       smaller_idx = 1;
 
-                    unsigned larger_idx = (smaller_idx+1) % 2;
+                    unsigned int larger_idx = (smaller_idx+1) % 2;
                                                      //smaller = *_list[smaller_idx]
                                                      //larger = *_list[larger_idx]
 

diff --git a/deal.II/source/fe/fe.cc b/deal.II/source/fe/fe.cc
index 15fe75d4cacbbf507b71cefd59b59d18efc37e24..8bfce1e4fb919e96d5a0463e2f0039377e47fca4 100644 (file)
--- a/deal.II/source/fe/fe.cc
+++ b/deal.II/source/fe/fe.cc
@@ -756,7 +756,7 @@ FiniteElement<dim,spacedim>::has_generalized_support_points () const
 
 template <int dim, int spacedim>
 Point<dim>
-FiniteElement<dim,spacedim>::unit_support_point (const unsigned index) const
+FiniteElement<dim,spacedim>::unit_support_point (const unsigned int index) const
 {
   Assert (index < this->dofs_per_cell,
           ExcIndexRange (index, 0, this->dofs_per_cell));
@@ -818,7 +818,7 @@ FiniteElement<dim,spacedim>::has_generalized_face_support_points () const
 
 template <int dim, int spacedim>
 Point<dim-1>
-FiniteElement<dim,spacedim>::unit_face_support_point (const unsigned index) const
+FiniteElement<dim,spacedim>::unit_face_support_point (const unsigned int index) const
 {
   Assert (index < this->dofs_per_face,
           ExcIndexRange (index, 0, this->dofs_per_face));
@@ -1159,7 +1159,7 @@ FiniteElement<dim,spacedim>::get_subface_data (const UpdateFlags        flags,
 
 template <int dim, int spacedim>
 const FiniteElement<dim,spacedim>&
-FiniteElement<dim,spacedim>::base_element(const unsigned index) const
+FiniteElement<dim,spacedim>::base_element(const unsigned int index) const
 {
   Assert (index==0, ExcIndexRange(index,0,1));
                                    // This function should not be

diff --git a/deal.II/source/fe/fe_abf.cc b/deal.II/source/fe/fe_abf.cc
index 296a00749cd468260a5c2c164f238fb4fe33927d..fd1459541db6fb18b6b885faa7f8000c604a6d79 100644 (file)
--- a/deal.II/source/fe/fe_abf.cc
+++ b/deal.II/source/fe/fe_abf.cc
@@ -590,15 +590,15 @@ FE_ABF<dim>::interpolate(
                          * values[face*n_face_points+k](GeometryInfo<dim>::unit_normal_direction[face]+offset);
       }
 
-  const unsigned start_cell_dofs = GeometryInfo<dim>::faces_per_cell*this->dofs_per_face;
-  const unsigned start_cell_points = GeometryInfo<dim>::faces_per_cell*n_face_points;
+  const unsigned int start_cell_dofs = GeometryInfo<dim>::faces_per_cell*this->dofs_per_face;
+  const unsigned int start_cell_points = GeometryInfo<dim>::faces_per_cell*n_face_points;
 
   for (unsigned int k=0;k<interior_weights.size(0);++k)
     for (unsigned int i=0;i<interior_weights.size(1);++i)
       for (unsigned int d=0;d<dim;++d)
         local_dofs[start_cell_dofs+i*dim+d] += interior_weights(k,i,d) * values[k+start_cell_points](d+offset);
 
-  const unsigned start_abf_dofs = start_cell_dofs + interior_weights.size(1) * dim;
+  const unsigned int start_abf_dofs = start_cell_dofs + interior_weights.size(1) * dim;
 
   // Cell integral of ABF terms
   for (unsigned int k=0;k<interior_weights_abf.size(0);++k)
@@ -650,15 +650,15 @@ FE_ABF<dim>::interpolate(
                          * values[GeometryInfo<dim>::unit_normal_direction[face]][face*n_face_points+k];
       }
 
-  const unsigned start_cell_dofs = GeometryInfo<dim>::faces_per_cell*this->dofs_per_face;
-  const unsigned start_cell_points = GeometryInfo<dim>::faces_per_cell*n_face_points;
+  const unsigned int start_cell_dofs = GeometryInfo<dim>::faces_per_cell*this->dofs_per_face;
+  const unsigned int start_cell_points = GeometryInfo<dim>::faces_per_cell*n_face_points;
 
   for (unsigned int k=0;k<interior_weights.size(0);++k)
     for (unsigned int i=0;i<interior_weights.size(1);++i)
       for (unsigned int d=0;d<dim;++d)
         local_dofs[start_cell_dofs+i*dim+d] += interior_weights(k,i,d) * values[d][k+start_cell_points];
 
-  const unsigned start_abf_dofs = start_cell_dofs + interior_weights.size(1) * dim;
+  const unsigned int start_abf_dofs = start_cell_dofs + interior_weights.size(1) * dim;
 
   // Cell integral of ABF terms
   for (unsigned int k=0;k<interior_weights_abf.size(0);++k)

diff --git a/deal.II/source/fe/fe_nedelec.cc b/deal.II/source/fe/fe_nedelec.cc
index e1c05bb37bc219c9f79e2929b04476c87fb98933..d54dc15eaabecedacea01595addc090ebcc3851d 100644 (file)
--- a/deal.II/source/fe/fe_nedelec.cc
+++ b/deal.II/source/fe/fe_nedelec.cc
@@ -3258,7 +3258,7 @@ FE_Nedelec<dim>::interpolate (std::vector<double>& local_dofs,
                                                                    * n_edge_points],
                                   1);
 
-                    for (unsigned i = 0; i < this->degree; ++i)
+                    for (unsigned int i = 0; i < this->degree; ++i)
                       for (unsigned int j = 0; j < this->degree-1; ++j)
                         system_rhs (i * (this->degree-1) + j)
                           += reference_quadrature.weight (q_point) * tmp
@@ -3578,7 +3578,7 @@ FE_Nedelec<dim>::interpolate (std::vector<double>& local_dofs,
                                                                                * n_edge_points],
                                               2);
 
-                                for (unsigned i = 0; i < this->degree; ++i)
+                                for (unsigned int i = 0; i < this->degree; ++i)
                                   for (unsigned int j = 0; j < this->degree-1; ++j)
                                     system_rhs (i * (this->degree-1) + j)
                                       += boundary_weights
@@ -3686,7 +3686,7 @@ FE_Nedelec<dim>::interpolate (std::vector<double>& local_dofs,
                                                                                + n_face_points],
                                               2);
 
-                                for (unsigned i = 0; i <= deg; ++i)
+                                for (unsigned int i = 0; i <= deg; ++i)
                                   for (unsigned int j = 0; j < deg; ++j)
                                     system_rhs (i * deg + j)
                                       += boundary_weights
@@ -3742,7 +3742,7 @@ FE_Nedelec<dim>::interpolate (std::vector<double>& local_dofs,
                                                                                 * n_face_points],
                                                2);
 
-                                    for (unsigned i = 0; i <= deg; ++i)
+                                    for (unsigned int i = 0; i <= deg; ++i)
                                       for (unsigned int j = 0; j < deg; ++j)
                                         system_rhs (i * deg + j)
                                           += boundary_weights
@@ -3850,7 +3850,7 @@ FE_Nedelec<dim>::interpolate (std::vector<double>& local_dofs,
                                                                                 * n_face_points],
                                                2);
 
-                                    for (unsigned i = 0; i <= deg; ++i)
+                                    for (unsigned int i = 0; i <= deg; ++i)
                                       for (unsigned int j = 0; j < deg; ++j)
                                         system_rhs (i * deg + j)
                                           += boundary_weights
@@ -4013,7 +4013,7 @@ FE_Nedelec<dim>::interpolate (std::vector<double>& local_dofs,
                                                                                    * n_face_points],
                                                   1);
 
-                                    for (unsigned i = 0; i <= deg; ++i)
+                                    for (unsigned int i = 0; i <= deg; ++i)
                                       for (unsigned int j = 0; j < deg; ++j)
                                         system_rhs (i * deg + j)
                                           += boundary_weights
@@ -4125,7 +4125,7 @@ FE_Nedelec<dim>::interpolate (std::vector<double>& local_dofs,
                                                                                  * n_face_points],
                                                 1);
 
-                                  for (unsigned i = 0; i <= deg; ++i)
+                                  for (unsigned int i = 0; i <= deg; ++i)
                                     for (unsigned int j = 0; j < deg; ++j)
                                       system_rhs (i * deg + j)
                                         += boundary_weights
@@ -4794,7 +4794,7 @@ const
                                                                  * n_edge_points],
                                 1);
 
-                  for (unsigned i = 0; i <= deg; ++i)
+                  for (unsigned int i = 0; i <= deg; ++i)
                     for (unsigned int j = 0; j < deg; ++j)
                       system_rhs (i * deg + j)
                         += reference_quadrature.weight (q_point) * tmp
@@ -5074,7 +5074,7 @@ const
                                                                      * n_edge_points],
                                     face_coordinates[face][1]);
 
-                      for (unsigned i = 0; i <= deg; ++i)
+                      for (unsigned int i = 0; i <= deg; ++i)
                         for (unsigned int j = 0; j < deg; ++j)
                           system_rhs (i * deg + j)
                             += boundary_weights (q_point + n_edge_points,

diff --git a/deal.II/source/fe/fe_nothing.cc b/deal.II/source/fe/fe_nothing.cc
index b64b834384dd535486bdcd342f8ced9a46611455..8560468828733fdba627cbf4b8a4ac8d56a2e062 100644 (file)
--- a/deal.II/source/fe/fe_nothing.cc
+++ b/deal.II/source/fe/fe_nothing.cc
@@ -25,7 +25,7 @@ namespace
 
 
 template <int dim>
-FE_Nothing<dim>::FE_Nothing (const unsigned n_components)
+FE_Nothing<dim>::FE_Nothing (const unsigned int n_components)
                 :
                 FiniteElement<dim>
                 (FiniteElementData<dim>(std::vector<unsigned>(dim+1,0),

diff --git a/deal.II/source/fe/fe_raviart_thomas.cc b/deal.II/source/fe/fe_raviart_thomas.cc
index 543a2ca0a8178fe05352acdfd4bcbcbb91105dbe..8e60ee549b7a11412f9488067ce3c6df0ee2bb97 100644 (file)
--- a/deal.II/source/fe/fe_raviart_thomas.cc
+++ b/deal.II/source/fe/fe_raviart_thomas.cc
@@ -484,8 +484,8 @@ FE_RaviartThomas<dim>::interpolate(
                          * values[face*n_face_points+k](GeometryInfo<dim>::unit_normal_direction[face]+offset);
       }
 
-  const unsigned start_cell_dofs = GeometryInfo<dim>::faces_per_cell*this->dofs_per_face;
-  const unsigned start_cell_points = GeometryInfo<dim>::faces_per_cell*n_face_points;
+  const unsigned int start_cell_dofs = GeometryInfo<dim>::faces_per_cell*this->dofs_per_face;
+  const unsigned int start_cell_points = GeometryInfo<dim>::faces_per_cell*n_face_points;
 
   for (unsigned int k=0;k<interior_weights.size(0);++k)
     for (unsigned int i=0;i<interior_weights.size(1);++i)
@@ -518,8 +518,8 @@ FE_RaviartThomas<dim>::interpolate(
                          * values[GeometryInfo<dim>::unit_normal_direction[face]][face*n_face_points+k];
       }
 
-  const unsigned start_cell_dofs = GeometryInfo<dim>::faces_per_cell*this->dofs_per_face;
-  const unsigned start_cell_points = GeometryInfo<dim>::faces_per_cell*n_face_points;
+  const unsigned int start_cell_dofs = GeometryInfo<dim>::faces_per_cell*this->dofs_per_face;
+  const unsigned int start_cell_points = GeometryInfo<dim>::faces_per_cell*n_face_points;
 
   for (unsigned int k=0;k<interior_weights.size(0);++k)
     for (unsigned int i=0;i<interior_weights.size(1);++i)

diff --git a/deal.II/source/fe/fe_system.cc b/deal.II/source/fe/fe_system.cc
index 89c81f762b8efe23bcb332fdd00292ef4b036f6f..44ece19d54821ed6a44b786718954e2c95596880 100644 (file)
--- a/deal.II/source/fe/fe_system.cc
+++ b/deal.II/source/fe/fe_system.cc
@@ -1242,7 +1242,7 @@ FESystem<dim,spacedim>::build_cell_tables()
   this->system_to_component_table.resize(this->dofs_per_cell);
   this->face_system_to_component_table.resize(this->dofs_per_face);
 
-  unsigned total_index = 0;
+  unsigned int total_index = 0;
   this->block_indices_data.reinit(0,0);
 
   for (unsigned int base=0; base < this->n_base_elements(); ++base)
@@ -1275,7 +1275,7 @@ FESystem<dim,spacedim>::build_cell_tables()
        vertex_number<GeometryInfo<dim>::vertices_per_cell;
        ++vertex_number)
     {
-      unsigned comp_start = 0;
+      unsigned int comp_start = 0;
       for(unsigned int base=0; base<this->n_base_elements(); ++base)
         for (unsigned int m=0; m<this->element_multiplicity(base);
              ++m, comp_start+=base_element(base).n_components())
@@ -1312,7 +1312,7 @@ FESystem<dim,spacedim>::build_cell_tables()
          line_number != GeometryInfo<dim>::lines_per_cell;
          ++line_number)
       {
-        unsigned comp_start = 0;
+        unsigned int comp_start = 0;
         for (unsigned int base=0; base<this->n_base_elements(); ++base)
           for (unsigned int m=0; m<this->element_multiplicity(base);
                ++m, comp_start+=base_element(base).n_components())
@@ -1507,15 +1507,15 @@ FESystem<dim,spacedim>::build_face_tables()
 
                                    // 2. Lines
   if (GeometryInfo<dim>::lines_per_face > 0)
-    for (unsigned line_number= 0;
+    for (unsigned int line_number= 0;
          line_number != GeometryInfo<dim>::lines_per_face;
          ++line_number)
       {
-        unsigned comp_start = 0;
-        for(unsigned base = 0; base < this->n_base_elements(); ++base)
+        unsigned int comp_start = 0;
+        for(unsigned int base = 0; base < this->n_base_elements(); ++base)
           for (unsigned int m=0; m<this->element_multiplicity(base);
                ++m, comp_start += base_element(base).n_components())
-            for (unsigned local_index = 0;
+            for (unsigned int local_index = 0;
                  local_index < base_element(base).dofs_per_line;
                  ++local_index, ++total_index)
               {
@@ -1553,15 +1553,15 @@ FESystem<dim,spacedim>::build_face_tables()
 
                                    // 3. Quads
   if (GeometryInfo<dim>::quads_per_face > 0)
-    for (unsigned quad_number= 0;
+    for (unsigned int quad_number= 0;
          quad_number != GeometryInfo<dim>::quads_per_face;
          ++quad_number)
       {
-        unsigned comp_start = 0;
-        for(unsigned base=0; base<this->n_base_elements(); ++base)
+        unsigned int comp_start = 0;
+        for(unsigned int base=0; base<this->n_base_elements(); ++base)
           for (unsigned int m=0; m<this->element_multiplicity(base);
                ++m, comp_start += base_element(base).n_components())
-            for (unsigned local_index = 0;
+            for (unsigned int local_index = 0;
                  local_index < base_element(base).dofs_per_quad;
                  ++local_index, ++total_index)
               {
@@ -3294,7 +3294,7 @@ compute_nonzero_components (const std::vector<const FiniteElement<dim,spacedim>*
        vertex_number<GeometryInfo<dim>::vertices_per_cell;
        ++vertex_number)
     {
-      unsigned comp_start = 0;
+      unsigned int comp_start = 0;
       for(unsigned int base=0; base<fes.size(); ++base)
         for (unsigned int m=0; m<multiplicities[base];
              ++m, comp_start+=fes[base]->n_components())
@@ -3327,7 +3327,7 @@ compute_nonzero_components (const std::vector<const FiniteElement<dim,spacedim>*
          line_number != GeometryInfo<dim>::lines_per_cell;
          ++line_number)
       {
-        unsigned comp_start = 0;
+        unsigned int comp_start = 0;
         for (unsigned int base=0; base<fes.size(); ++base)
           for (unsigned int m=0; m<multiplicities[base];
                ++m, comp_start+=fes[base]->n_components())
@@ -3456,7 +3456,7 @@ FESystem<dim,spacedim>::has_support_on_face (const unsigned int shape_index,
 
 template <int dim, int spacedim>
 Point<dim>
-FESystem<dim,spacedim>::unit_support_point (const unsigned index) const
+FESystem<dim,spacedim>::unit_support_point (const unsigned int index) const
 {
   Assert (index < this->dofs_per_cell,
           ExcIndexRange (index, 0, this->dofs_per_cell));
@@ -3481,7 +3481,7 @@ FESystem<dim,spacedim>::unit_support_point (const unsigned index) const
 
 template <int dim, int spacedim>
 Point<dim-1>
-FESystem<dim,spacedim>::unit_face_support_point (const unsigned index) const
+FESystem<dim,spacedim>::unit_face_support_point (const unsigned int index) const
 {
   Assert (index < this->dofs_per_face,
           ExcIndexRange (index, 0, this->dofs_per_face));

diff --git a/deal.II/source/fe/mapping_q1.cc b/deal.II/source/fe/mapping_q1.cc
index 4ca013da9a222c80042910573114ddb214433b81..d40401de26534b21518472a268798d482f8f4c61 100644 (file)
--- a/deal.II/source/fe/mapping_q1.cc
+++ b/deal.II/source/fe/mapping_q1.cc
@@ -940,7 +940,7 @@ namespace internal
                                            // map the unit tangentials to the
                                            // real cell. checking for d!=dim-1
                                            // eliminates compiler warnings
-                                           // regarding unsigned expressions <
+                                           // regarding unsigned int expressions <
                                            // 0.
           for (unsigned int d=0; d!=dim-1; ++d)
             {

diff --git a/deal.II/source/grid/grid_tools.cc b/deal.II/source/grid/grid_tools.cc
index e8250f1d692b99d08c15eb8e5359fdc08b04ec81..62990c8f5aaa4bc92c7163634a40cc858b4c5b67 100644 (file)
--- a/deal.II/source/grid/grid_tools.cc
+++ b/deal.II/source/grid/grid_tools.cc
@@ -703,7 +703,7 @@ namespace GridTools
     // look at the mid-points of edges
     for (; cell != endc; ++cell)
       {
-        for (unsigned v = 0; v < GeometryInfo<dim>::vertices_per_cell; v++)
+        for (unsigned int v = 0; v < GeometryInfo<dim>::vertices_per_cell; v++)
           if (cell->vertex_index(v) == vertex)
             {
               // OK, we found a cell that contains
@@ -716,7 +716,7 @@ namespace GridTools
               // neighbor. if this is the case, then we need to also
               // add this neighbor
               if (dim >= 2)
-                for (unsigned vface = 0; vface < dim; vface++)
+                for (unsigned int vface = 0; vface < dim; vface++)
                   {
                     const unsigned int face =
                         GeometryInfo<dim>::vertex_to_face[v][vface];

diff --git a/deal.II/source/grid/tria.cc b/deal.II/source/grid/tria.cc
index 156b910e9082e3e88a5633dbb9fe593812ac94a9..6f9355de110d14a23c6c0286259200bfbfb875bb 100644 (file)
--- a/deal.II/source/grid/tria.cc
+++ b/deal.II/source/grid/tria.cc
@@ -12533,7 +12533,7 @@ unsigned int Triangulation<dim, spacedim>::max_adjacent_cells () const
                                    // vertices used on level 0
   unsigned int max_vertex_index = 0;
   for (; cell!=endc; ++cell)
-    for (unsigned vertex=0; vertex<GeometryInfo<dim>::vertices_per_cell; ++vertex)
+    for (unsigned int vertex=0; vertex<GeometryInfo<dim>::vertices_per_cell; ++vertex)
       if (cell->vertex_index(vertex) > max_vertex_index)
         max_vertex_index = cell->vertex_index(vertex);
 
@@ -12546,7 +12546,7 @@ unsigned int Triangulation<dim, spacedim>::max_adjacent_cells () const
                                    // every time we find an adjacent
                                    // element
   for (cell=begin(); cell!=endc; ++cell)
-    for (unsigned vertex=0; vertex<GeometryInfo<dim>::vertices_per_cell; ++vertex)
+    for (unsigned int vertex=0; vertex<GeometryInfo<dim>::vertices_per_cell; ++vertex)
       ++usage_count[cell->vertex_index(vertex)];
 
   return std::max (GeometryInfo<dim>::vertices_per_cell,

diff --git a/deal.II/source/lac/petsc_vector_base.cc b/deal.II/source/lac/petsc_vector_base.cc
index 20dcc6fd0ec9c68d936184481ff969495821855d..6820ff126a9d01189e2a0884d25b36738203dec1 100644 (file)
--- a/deal.II/source/lac/petsc_vector_base.cc
+++ b/deal.II/source/lac/petsc_vector_base.cc
@@ -100,7 +100,7 @@ namespace PETScWrappers
               else
                 {
                                                    //ghost entry
-                  unsigned ghostidx
+                  unsigned int ghostidx
                     = vector.ghost_indices.index_within_set(index);
 
                   Assert(ghostidx+end-begin<(unsigned int)lsize, ExcInternalError());

diff --git a/deal.II/source/numerics/derivative_approximation.cc b/deal.II/source/numerics/derivative_approximation.cc
index 5f5ac9784e0c5825f94af432d29b7e986724cfa0..6ada44114c8bf6a29071074208254778f192ecb4 100644 (file)
--- a/deal.II/source/numerics/derivative_approximation.cc
+++ b/deal.II/source/numerics/derivative_approximation.cc
@@ -672,7 +672,7 @@ DerivativeApproximation::approximate (const Mapping<dim,spacedim>    &mapping,
   typename DH<dim,spacedim>::active_cell_iterator cell, endc;
   cell = endc = dof_handler.begin_active();
                                    // (static_cast to avoid warnings
-                                   // about unsigned always >=0)
+                                   // about unsigned int always >=0)
   std::advance (cell, static_cast<int>(index_interval.first));
   std::advance (endc, static_cast<int>(index_interval.second));
 

diff --git a/deal.II/source/numerics/time_dependent.cc b/deal.II/source/numerics/time_dependent.cc
index be529b60f8c906b1a5336156ea45b830f827177c..c5d1355cc491117118f33cd70dc3d13564ae26a4 100644 (file)
--- a/deal.II/source/numerics/time_dependent.cc
+++ b/deal.II/source/numerics/time_dependent.cc
@@ -270,7 +270,7 @@ TimeStepBase::~TimeStepBase ()
 
 
 void
-TimeStepBase::wake_up (const unsigned )
+TimeStepBase::wake_up (const unsigned int )
 {}
 
 
@@ -454,7 +454,7 @@ TimeStepBase_Tria<dim>::~TimeStepBase_Tria ()
 
 template <int dim>
 void
-TimeStepBase_Tria<dim>::wake_up (const unsigned wakeup_level)
+TimeStepBase_Tria<dim>::wake_up (const unsigned int wakeup_level)
 {
   TimeStepBase::wake_up (wakeup_level);
 
@@ -467,7 +467,7 @@ TimeStepBase_Tria<dim>::wake_up (const unsigned wakeup_level)
 
 template <int dim>
 void
-TimeStepBase_Tria<dim>::sleep (const unsigned sleep_level)
+TimeStepBase_Tria<dim>::sleep (const unsigned int sleep_level)
 {
   if (sleep_level == flags.sleep_level_to_delete_grid)
     {