From: Timo Heister <timo.heister@gmail.com>
Date: Tue, 5 Nov 2019 03:03:03 +0000 (-0500)
Subject: fix 64bit IndexSet::add_indices
X-Git-Tag: v9.2.0-rc1~909^2~1
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2686c19eab1bb66d7d642531c1e7cf3526bce643;p=dealii.git

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 ef6a55d575..1fcdf77554 100644
--- 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 ef7ff15d95..069d231f5b 100644
--- 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;