fix 64bit IndexSet::add_indices

the offset parameter needs to be 64 bit to allow shifting an IndexSet in
a large computation.

part of and hopefully a fix for #8937

diff --git a/include/deal.II/base/index_set.h b/include/deal.II/base/index_set.h
index ef6a55d575032385632ddaca62e5f5af36a587e5..1fcdf7755472767b162289ff4fdbc7e5065fa6d1 100644 (file)
--- a/include/deal.II/base/index_set.h
+++ b/include/deal.II/base/index_set.h
@@ -215,7 +215,7 @@ public:
    * <code>[0,size())</code> represented by the current object.
    */
   void
-  add_indices(const IndexSet &other, const unsigned int offset = 0);
+  add_indices(const IndexSet &other, const size_type offset = 0);
 
   /**
    * Return whether the specified index is an element of the index set.

diff --git a/source/base/index_set.cc b/source/base/index_set.cc
index ef7ff15d95d1ff3045e74de998308ee641612707..069d231f5b6e8e80ea8d3d7ea8fdfeee4ad17d9f 100644 (file)
--- a/source/base/index_set.cc
+++ b/source/base/index_set.cc
@@ -347,7 +347,7 @@ IndexSet::pop_front()
 
 
 void
-IndexSet::add_indices(const IndexSet &other, const unsigned int offset)
+IndexSet::add_indices(const IndexSet &other, const size_type offset)
 {
   if ((this == &other) && (offset == 0))
     return;