Use std::next instead of ++object.begin().

diff --git a/include/deal.II/base/iterator_range.h b/include/deal.II/base/iterator_range.h
index 5d8043308a796a184d42a165649bde551a927b0f..1f1682645f59b029a457f89355a1d0fc44394d61 100644 (file)
--- a/include/deal.II/base/iterator_range.h
+++ b/include/deal.II/base/iterator_range.h
@@ -114,10 +114,11 @@ class IteratorOverIterators;
  * way that if you <i>dereference</i> the result of IteratorRange::begin(),
  * you get the <code>b</code> iterator. Furthermore, you must be able to
  * increment the object returned by IteratorRange::begin() so that
- * <code>*(++begin()) == b+1</code>. In other words, IteratorRange::begin()
- * must return an iterator that when dereferenced returns an iterator of the
- * template type <code>Iterator</code>: It is an iterator over iterators in
- * the same sense as if you had a pointer into an array of pointers.
+ * <code>*(std::next(begin())) == b+1</code>. In other words,
+ * IteratorRange::begin() must return an iterator that when dereferenced returns
+ * an iterator of the template type <code>Iterator</code>: It is an iterator
+ * over iterators in the same sense as if you had a pointer into an array of
+ * pointers.
  *
  * This is implemented in the form of the IteratorRange::IteratorOverIterators
  * class.

diff --git a/include/deal.II/lac/block_indices.h b/include/deal.II/lac/block_indices.h
index a24c07dc957144a3751842f912ef20d413ea652a..1c1315b4e2c1e161aa22e0eaa56ed0011d761695 100644 (file)
--- a/include/deal.II/lac/block_indices.h
+++ b/include/deal.II/lac/block_indices.h
@@ -331,8 +331,9 @@ BlockIndices::global_to_local(const size_type i) const
   Assert(n_blocks > 0, ExcLowerRangeType<size_type>(i, size_type(1)));
 
   // start_indices[0] == 0 so we might as well start from the next one
-  const auto it =
-    --std::upper_bound(++start_indices.begin(), start_indices.end(), i);
+  const auto it = --std::upper_bound(std::next(start_indices.begin()),
+                                     start_indices.end(),
+                                     i);
 
   return {std::distance(start_indices.begin(), it), i - *it};
 }

diff --git a/tests/bits/chunk_sparse_matrix_iterator_11.cc b/tests/bits/chunk_sparse_matrix_iterator_11.cc
index 6894f8ddf8f4b4ed175534e5839dea7fcab427d2..0a9062a16e39d76341219831ad6de4825f4bb75b 100644 (file)
--- a/tests/bits/chunk_sparse_matrix_iterator_11.cc
+++ b/tests/bits/chunk_sparse_matrix_iterator_11.cc
@@ -39,7 +39,7 @@ test(const unsigned int chunk_size)
   // attach a sparse matrix to it
   ChunkSparseMatrix<double> A(sparsity);
 
-  ChunkSparseMatrix<double>::iterator k = A.begin(), j = ++A.begin();
+  ChunkSparseMatrix<double>::iterator k = A.begin(), j = std::next(A.begin());
 
   AssertThrow(k < j, ExcInternalError());
   AssertThrow(j > k, ExcInternalError());

diff --git a/tests/bits/chunk_sparse_matrix_iterator_12.cc b/tests/bits/chunk_sparse_matrix_iterator_12.cc
index f35c1b7750af97ff813b79a7862cd6b84d7b1d54..c72f7a9ab05a783c709a9ec75c4843b07af03adc 100644 (file)
--- a/tests/bits/chunk_sparse_matrix_iterator_12.cc
+++ b/tests/bits/chunk_sparse_matrix_iterator_12.cc
@@ -38,7 +38,8 @@ test(const unsigned int chunk_size)
   // attach a sparse matrix to it
   ChunkSparseMatrix<double> A(sparsity);
 
-  ChunkSparseMatrix<double>::const_iterator k = A.begin(), j = ++A.begin();
+  ChunkSparseMatrix<double>::const_iterator k = A.begin(),
+                                            j = std::next(A.begin());
 
   AssertThrow(k < j, ExcInternalError());
   AssertThrow(j > k, ExcInternalError());

diff --git a/tests/bits/sparse_matrix_iterator_11.cc b/tests/bits/sparse_matrix_iterator_11.cc
index 1449d167b28d22eba8b1d8462b1f7f046e6bd0c3..23bdfaac7433ece2f30580c23ddfceac7497b3c7 100644 (file)
--- a/tests/bits/sparse_matrix_iterator_11.cc
+++ b/tests/bits/sparse_matrix_iterator_11.cc
@@ -37,7 +37,7 @@ test()
   // attach a sparse matrix to it
   SparseMatrix<double> A(sparsity);
 
-  SparseMatrix<double>::iterator k = A.begin(), j = ++A.begin();
+  SparseMatrix<double>::iterator k = A.begin(), j = std::next(A.begin());
 
   AssertThrow(k < j, ExcInternalError());
   AssertThrow(j > k, ExcInternalError());

diff --git a/tests/bits/sparse_matrix_iterator_12.cc b/tests/bits/sparse_matrix_iterator_12.cc
index da1e6aa040226d629fb653976bc21ac594616b55..eac35f607c388068cbef1bddab49d836bae8c85c 100644 (file)
--- a/tests/bits/sparse_matrix_iterator_12.cc
+++ b/tests/bits/sparse_matrix_iterator_12.cc
@@ -37,7 +37,7 @@ test()
   // attach a sparse matrix to it
   SparseMatrix<double> A(sparsity);
 
-  SparseMatrix<double>::const_iterator k = A.begin(), j = ++A.begin();
+  SparseMatrix<double>::const_iterator k = A.begin(), j = std::next(A.begin());
 
   AssertThrow(k < j, ExcInternalError());
   AssertThrow(j > k, ExcInternalError());

diff --git a/tests/dofs/n_boundary_dofs_03.cc b/tests/dofs/n_boundary_dofs_03.cc
index 81437e5183e1ec8ef30ca432b96d6d636a6f8e6f..193afebbfe531fdd6bf8f0ee66da20a664d41665 100644 (file)
--- a/tests/dofs/n_boundary_dofs_03.cc
+++ b/tests/dofs/n_boundary_dofs_03.cc
@@ -60,8 +60,8 @@ test()
   // assign boundary ids
   triangulation.begin()->face(0)->set_boundary_id(12);
   triangulation.begin()->face(1)->set_boundary_id(13);
-  (++triangulation.begin())->face(0)->set_boundary_id(14);
-  (++triangulation.begin())->face(1)->set_boundary_id(15);
+  std::next(triangulation.begin())->face(0)->set_boundary_id(14);
+  std::next(triangulation.begin())->face(1)->set_boundary_id(15);
 
 
   FESystem<1, spacedim> fe(FE_Q<1, spacedim>(1), 1, FE_DGQ<1, spacedim>(1), 1);

diff --git a/tests/full_matrix/full_matrix_iterator_01.cc b/tests/full_matrix/full_matrix_iterator_01.cc
index d53e44060b02ef24881d8b78c007b2c2dcabcd18..8ff603e422985ef18da30da886fa8bb43dfd47eb 100644 (file)
--- a/tests/full_matrix/full_matrix_iterator_01.cc
+++ b/tests/full_matrix/full_matrix_iterator_01.cc
@@ -29,7 +29,7 @@ test()
   FullMatrix<double> A(3, 3);
 
   // test prefix operator
-  const IteratorType k = A.begin(), j = ++A.begin();
+  const IteratorType k = A.begin(), j = std::next(A.begin());
 
   AssertThrow(k < j, ExcInternalError());
   AssertThrow(j > k, ExcInternalError());

diff --git a/tests/hp/n_boundary_dofs_03.cc b/tests/hp/n_boundary_dofs_03.cc
index 8c8381419f75173a9c4604e75f93dacd5c59694a..90df8fd7fe1a98ab2227df6065e6cc5610e74203 100644 (file)
--- a/tests/hp/n_boundary_dofs_03.cc
+++ b/tests/hp/n_boundary_dofs_03.cc
@@ -62,8 +62,8 @@ test()
   // assign boundary ids
   triangulation.begin()->face(0)->set_boundary_id(12);
   triangulation.begin()->face(1)->set_boundary_id(13);
-  (++triangulation.begin())->face(0)->set_boundary_id(14);
-  (++triangulation.begin())->face(1)->set_boundary_id(15);
+  std::next(triangulation.begin())->face(0)->set_boundary_id(14);
+  std::next(triangulation.begin())->face(1)->set_boundary_id(15);
 
 
   hp::FECollection<1, spacedim> fe;

diff --git a/tests/trilinos/trilinos_sparse_matrix_iterator_11.cc b/tests/trilinos/trilinos_sparse_matrix_iterator_11.cc
index 4de8b31b3c54fe0c4e044c0122e7364b973cc43c..44e944b1e47bfc2f424e04636c9ad1961b0507f2 100644 (file)
--- a/tests/trilinos/trilinos_sparse_matrix_iterator_11.cc
+++ b/tests/trilinos/trilinos_sparse_matrix_iterator_11.cc
@@ -38,7 +38,8 @@ test()
   // attach a sparse matrix to it
   TrilinosWrappers::SparseMatrix A(sparsity);
 
-  TrilinosWrappers::SparseMatrix::iterator k = A.begin(), j = ++A.begin();
+  TrilinosWrappers::SparseMatrix::iterator k = A.begin(),
+                                           j = std::next(A.begin());
 
   AssertThrow(k < j, ExcInternalError());
   AssertThrow(j > k, ExcInternalError());

diff --git a/tests/trilinos/trilinos_sparse_matrix_iterator_12.cc b/tests/trilinos/trilinos_sparse_matrix_iterator_12.cc
index 177514f48d35b8269d7c512a054dd5a77aa71d46..ff4a2755dac76fdca7e60cfc091d6595bbc310cb 100644 (file)
--- a/tests/trilinos/trilinos_sparse_matrix_iterator_12.cc
+++ b/tests/trilinos/trilinos_sparse_matrix_iterator_12.cc
@@ -38,7 +38,8 @@ test()
   // attach a sparse matrix to it
   TrilinosWrappers::SparseMatrix A(sparsity);
 
-  TrilinosWrappers::SparseMatrix::const_iterator k = A.begin(), j = ++A.begin();
+  TrilinosWrappers::SparseMatrix::const_iterator k = A.begin(),
+                                                 j = std::next(A.begin());
 
   AssertThrow(k < j, ExcInternalError());
   AssertThrow(j > k, ExcInternalError());