TpetraWrappers: fix dangling else warning, fix embedded macro warning

Triggered on gcc-9.4.0 on Ubuntu LTS 20.04

diff --git a/include/deal.II/lac/trilinos_tpetra_vector.h b/include/deal.II/lac/trilinos_tpetra_vector.h
index a34e7d87bad683f9a5fa61abf3df72626c088059..1411617a8f68938810c2f37dcaf31c740079a13a 100644 (file)
--- a/include/deal.II/lac/trilinos_tpetra_vector.h
+++ b/include/deal.II/lac/trilinos_tpetra_vector.h
@@ -1001,10 +1001,12 @@ namespace LinearAlgebra
 #  endif
 
           if (local_row != Teuchos::OrdinalTraits<int>::invalid())
-            if (nonlocal)
-              vector_1d_nonlocal(local_row) += values[i];
-            else
-              vector_1d_local(local_row) += values[i];
+            {
+              if (nonlocal)
+                vector_1d_nonlocal(local_row) += values[i];
+              else
+                vector_1d_local(local_row) += values[i];
+            }
         }
 
 #  if !DEAL_II_TRILINOS_VERSION_GTE(13, 2, 0)

diff --git a/include/deal.II/lac/trilinos_tpetra_vector.templates.h b/include/deal.II/lac/trilinos_tpetra_vector.templates.h
index e119b4f5adf7e757c2412cbcfe9d417c3a3c83ad..6d93e62eeb8f72d45407dcb43f2f1aa9bd4738e5 100644 (file)
--- a/include/deal.II/lac/trilinos_tpetra_vector.templates.h
+++ b/include/deal.II/lac/trilinos_tpetra_vector.templates.h
@@ -247,14 +247,16 @@ namespace LinearAlgebra
             vector->getMap()->getLocalElement(row);
 
 
+#  if DEAL_II_TRILINOS_VERSION_GTE(14, 0, 0)
           Assert(
             local_row != Teuchos::OrdinalTraits<int>::invalid(),
-#  if DEAL_II_TRILINOS_VERSION_GTE(14, 0, 0)
             ExcAccessToNonLocalElement(row,
                                        vector->getMap()->getLocalNumElements(),
                                        vector->getMap()->getMinLocalIndex(),
                                        vector->getMap()->getMaxLocalIndex()));
 #  else
+          Assert(
+            local_row != Teuchos::OrdinalTraits<int>::invalid(),
             ExcAccessToNonLocalElement(row,
                                        vector->getMap()->getNodeNumElements(),
                                        vector->getMap()->getMinLocalIndex(),