Fix tests

diff --git a/include/deal.II/lac/sparse_matrix_tools.h b/include/deal.II/lac/sparse_matrix_tools.h
index b355c6c95492ec379434958eb2a4903d9cd2cb74..1e004c275fb6b6bc3258bd257645078599baf8f7 100644 (file)
--- a/include/deal.II/lac/sparse_matrix_tools.h
+++ b/include/deal.II/lac/sparse_matrix_tools.h
@@ -343,7 +343,7 @@ namespace SparseMatrixTools
                                    SparseMatrixType2 &        system_matrix_out,
                                    SparsityPatternType2 &sparsity_pattern_out)
   {
-    Assert(index_set_1.size() || index_set_0.size() == index_set_1.size(),
+    Assert(index_set_1.size() == 0 || index_set_0.size() == index_set_1.size(),
            ExcInternalError());
 
     auto index_set_1_cleared = index_set_1;

diff --git a/tests/parameter_handler/parameter_handler_25.output b/tests/parameter_handler/parameter_handler_25.output
index 26d844de58c87dc52c14a9f5ac1e548253026ba7..d139d9cf5d720043a938277762956343515ece7f 100644 (file)
--- a/tests/parameter_handler/parameter_handler_25.output
+++ b/tests/parameter_handler/parameter_handler_25.output
@@ -4,7 +4,7 @@ DEAL::successful
 DEAL::
 --------------------------------------------------------
 An error occurred in file <parameter_handler.cc> in function
-    void dealii::ParameterHandler::set(const string&, const string&)
+    void dealii::ParameterHandler::set(const std::string &, const std::string &)
 The violated condition was: 
     false
 Additional information: 
@@ -16,7 +16,7 @@ DEAL::
 An error occurred in file <parameter_handler.cc> in function
     void dealii::ParameterHandler::assert_that_entries_have_been_set() const
 The violated condition was: 
-    entries_wrongly_not_set.size() == 0
+    entries_wrongly_not_set.empty()
 Additional information: 
     Not all entries of the parameter handler that were declared with
     `has_to_be_set = true` have been set. The following parameters

diff --git a/tests/parameter_handler/parameter_handler_26.output b/tests/parameter_handler/parameter_handler_26.output
index ce3d2c506965e6b995e699ea11310c303356994a..d1a3ad63cc28578c23661532bece26c436635a85 100644 (file)
--- a/tests/parameter_handler/parameter_handler_26.output
+++ b/tests/parameter_handler/parameter_handler_26.output
@@ -6,7 +6,7 @@ DEAL::
 An error occurred in file <parameter_handler.cc> in function
     void dealii::ParameterHandler::assert_that_entries_have_been_set() const
 The violated condition was: 
-    entries_wrongly_not_set.size() == 0
+    entries_wrongly_not_set.empty()
 Additional information: 
     Not all entries of the parameter handler that were declared with
     `has_to_be_set = true` have been set. The following parameters
@@ -26,7 +26,7 @@ DEAL::
 An error occurred in file <parameter_handler.cc> in function
     void dealii::ParameterHandler::assert_that_entries_have_been_set() const
 The violated condition was: 
-    entries_wrongly_not_set.size() == 0
+    entries_wrongly_not_set.empty()
 Additional information: 
     Not all entries of the parameter handler that were declared with
     `has_to_be_set = true` have been set. The following parameters