Fix a 64-bit issue in TrilinosWrappers::SparseMatrix::local_range().

This tripped up all of the Trilinos sparse matrix iterators in 64 bit
mode after one of my recent changes.

diff --git a/doc/news/changes.h b/doc/news/changes.h
index 14c559f78c2c17f143e0b2c5af829bad1672dc9d..aca830aecdf3d3d0f94b7181ec3439c2d587f80a 100644 (file)
--- a/doc/news/changes.h
+++ b/doc/news/changes.h
@@ -395,6 +395,12 @@ inconvenience this causes.
 <h3>Specific improvements</h3>
 
 <ol>
+  <li> Fixed: TrilinosWrappers::SparseMatrix::local_range() erroneously
+  threw an exception in 64-bit mode. This is now fixed.
+  <br>
+  (Wolfgang Bangerth, 2015/03/24)
+  </li>
+
   <li> New: The GridOut::write_gnuplot() function produced output
   for 1d meshes embedded in higher dimensional spaces that was
   invalid in that the lines showing individual cells were connected.

diff --git a/include/deal.II/lac/trilinos_sparse_matrix.h b/include/deal.II/lac/trilinos_sparse_matrix.h
index 6e7614c588ab96ce5e3cbfdb7feaccaf49c5d22e..87e0d4a9f923ff284586f81d3534282940b0cb8a 100644 (file)
--- a/include/deal.II/lac/trilinos_sparse_matrix.h
+++ b/include/deal.II/lac/trilinos_sparse_matrix.h
@@ -2352,8 +2352,8 @@ namespace TrilinosWrappers
     begin = matrix->RowMap().MinMyGID();
     end = matrix->RowMap().MaxMyGID()+1;
 #else
-    begin = matrix->RowMap().MinMyGID();
-    end = matrix->RowMap().MaxMyGID()+1;
+    begin = matrix->RowMap().MinMyGID64();
+    end = matrix->RowMap().MaxMyGID64()+1;
 #endif
 
     return ((index >= static_cast<size_type>(begin)) &&