Merge pull request #3876 from tautschnig/catch-warnings

Silence warnings resulting from catch.hpp [blocks: #2310, #3425]

Author: Thomas Kiley

jbmc/unit/java-testing-utils/load_java_class.cpp

@@ -9,9 +9,9 @@ Author: Diffblue Ltd.
 #include "load_java_class.h"
 
 #include <iostream>
-#include <testing-utils/catch.hpp>
 #include <testing-utils/free_form_cmdline.h>
 #include <testing-utils/message.h>
+#include <testing-utils/use_catch.h>
 
 #include <util/config.h>
 #include <util/options.h>

jbmc/unit/java-testing-utils/require_goto_statements.cpp

@@ -8,7 +8,7 @@ Author: Diffblue Ltd.
 
 #include "require_goto_statements.h"
 
-#include <testing-utils/catch.hpp>
+#include <testing-utils/use_catch.h>
 
 #include <algorithm>
 #include <util/expr_iterator.h>

jbmc/unit/java-testing-utils/require_parse_tree.h

@@ -14,7 +14,7 @@ Author: Diffblue Ltd.
 
 #include <java_bytecode/java_bytecode_parse_tree.h>
 
-#include <testing-utils/catch.hpp>
+#include <testing-utils/use_catch.h>
 
 // NOLINTNEXTLINE(readability/namespace)
 namespace require_parse_tree

jbmc/unit/java-testing-utils/require_type.cpp

@@ -8,7 +8,7 @@ Author: Diffblue Ltd.
 
 #include "require_type.h"
 
-#include <testing-utils/catch.hpp>
+#include <testing-utils/use_catch.h>
 #include <util/base_type.h>
 #include <util/namespace.h>
 #include <util/symbol_table.h>

jbmc/unit/java_bytecode/ci_lazy_methods/lazy_load_lambdas.cpp

@@ -6,9 +6,9 @@ Author: Diffblue Limited.
 
 \*******************************************************************/
 
-#include <testing-utils/catch.hpp>
 #include <java-testing-utils/load_java_class.h>
 #include <testing-utils/require_symbol.h>
+#include <testing-utils/use_catch.h>
 
 SCENARIO(
   "Lazy load lambda methods",

jbmc/unit/java_bytecode/expr2java.cpp

@@ -6,8 +6,8 @@ Author: Diffblue Ltd.
 
 \*******************************************************************/
 
-#include <testing-utils/catch.hpp>
 #include <java_bytecode/expr2java.h>
+#include <testing-utils/use_catch.h>
 
 TEST_CASE(
   "expr2java tests",

jbmc/unit/java_bytecode/goto-programs/class_hierarchy_graph.cpp

@@ -6,8 +6,8 @@ Author: Diffblue Ltd.
 
 \*******************************************************************/
 
-#include <testing-utils/catch.hpp>
 #include <java-testing-utils/load_java_class.h>
+#include <testing-utils/use_catch.h>
 
 #include <goto-programs/class_hierarchy.h>
 

jbmc/unit/java_bytecode/goto-programs/class_hierarchy_output.cpp

@@ -6,8 +6,8 @@ Author: Diffblue Ltd.
 
 \*******************************************************************/
 
-#include <testing-utils/catch.hpp>
 #include <java-testing-utils/load_java_class.h>
+#include <testing-utils/use_catch.h>
 
 #include <goto-programs/class_hierarchy.h>
 

jbmc/unit/java_bytecode/goto-programs/remove_virtual_functions_without_fallback.cpp

@@ -7,8 +7,8 @@ Author: Diffblue Ltd.
 
 \*******************************************************************/
 
-#include <testing-utils/catch.hpp>
 #include <java-testing-utils/load_java_class.h>
+#include <testing-utils/use_catch.h>
 
 #include <util/simplify_expr.h>
 #include <goto-programs/remove_virtual_functions.h>

jbmc/unit/java_bytecode/goto_program_generics/generic_bases_test.cpp

@@ -5,12 +5,12 @@ Module: Unit tests for instantiating generic superclasses and interfaces.
 Author: Diffblue Ltd.
 
 \*******************************************************************/
-#include <testing-utils/catch.hpp>
 #include <java-testing-utils/load_java_class.h>
 #include <java-testing-utils/require_goto_statements.h>
-#include <util/config.h>
 #include <java-testing-utils/require_type.h>
 #include <testing-utils/require_symbol.h>
+#include <testing-utils/use_catch.h>
+#include <util/config.h>
 
 // NOTE: To inspect these tests at any point, use expr2java.
 // A good way to verify the validity of a test is to iterate