]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Bugfix: Make icc-13.0.0 happy
authormaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Tue, 2 Oct 2012 13:09:10 +0000 (13:09 +0000)
committermaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Tue, 2 Oct 2012 13:09:10 +0000 (13:09 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_cmake@26923 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/include/deal.II/lac/block_indices.h

index 61be16b607ac2fae9a4dae86a51e55e74d20ac7d..a78d0eae0f0637b8381b42ee0b8b7058aa68a02c 100644 (file)
@@ -396,12 +396,13 @@ std::pair<unsigned int,unsigned int>
 BlockIndices::global_to_local (const unsigned int i) const
 {
   Assert (i<total_size(), ExcIndexRange(i, 0, total_size()));
+  Assert (n_blocks > 0, ExcLowrRange(i, 1));
 
-  int block = n_blocks-1;
+  unsigned int block = n_blocks-1;
   while (i < start_indices[block])
     --block;
 
-  return std::make_pair<unsigned int>(block, i-start_indices[block]);
+  return std::make_pair(block, i-start_indices[block]);
 }
 
 

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.