From 2686c19eab1bb66d7d642531c1e7cf3526bce643 Mon Sep 17 00:00:00 2001 From: Timo Heister Date: Mon, 4 Nov 2019 22:03:03 -0500 Subject: [PATCH] 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 --- include/deal.II/base/index_set.h | 2 +- source/base/index_set.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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: * [0,size()) 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; -- 2.39.5