Skip to content

Commit 9a6465b

Browse files
author
Thomas Kiley
authored
Merge pull request #3876 from tautschnig/catch-warnings
Silence warnings resulting from catch.hpp [blocks: #2310, #3425]
2 parents 0242961 + 606ffdf commit 9a6465b

File tree

134 files changed

+232
-160
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

134 files changed

+232
-160
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ Author: Diffblue Ltd.
99
#include "load_java_class.h"
1010

1111
#include <iostream>
12-
#include <testing-utils/catch.hpp>
1312
#include <testing-utils/free_form_cmdline.h>
1413
#include <testing-utils/message.h>
14+
#include <testing-utils/use_catch.h>
1515

1616
#include <util/config.h>
1717
#include <util/options.h>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Author: Diffblue Ltd.
88

99
#include "require_goto_statements.h"
1010

11-
#include <testing-utils/catch.hpp>
11+
#include <testing-utils/use_catch.h>
1212

1313
#include <algorithm>
1414
#include <util/expr_iterator.h>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Author: Diffblue Ltd.
1414

1515
#include <java_bytecode/java_bytecode_parse_tree.h>
1616

17-
#include <testing-utils/catch.hpp>
17+
#include <testing-utils/use_catch.h>
1818

1919
// NOLINTNEXTLINE(readability/namespace)
2020
namespace require_parse_tree

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Author: Diffblue Ltd.
88

99
#include "require_type.h"
1010

11-
#include <testing-utils/catch.hpp>
11+
#include <testing-utils/use_catch.h>
1212
#include <util/base_type.h>
1313
#include <util/namespace.h>
1414
#include <util/symbol_table.h>

‎jbmc/unit/java_bytecode/ci_lazy_methods/lazy_load_lambdas.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ Author: Diffblue Limited.
66
77
\*******************************************************************/
88

9-
#include <testing-utils/catch.hpp>
109
#include <java-testing-utils/load_java_class.h>
1110
#include <testing-utils/require_symbol.h>
11+
#include <testing-utils/use_catch.h>
1212

1313
SCENARIO(
1414
"Lazy load lambda methods",

‎jbmc/unit/java_bytecode/expr2java.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ Author: Diffblue Ltd.
66
77
\*******************************************************************/
88

9-
#include <testing-utils/catch.hpp>
109
#include <java_bytecode/expr2java.h>
10+
#include <testing-utils/use_catch.h>
1111

1212
TEST_CASE(
1313
"expr2java tests",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ Author: Diffblue Ltd.
66
77
\*******************************************************************/
88

9-
#include <testing-utils/catch.hpp>
109
#include <java-testing-utils/load_java_class.h>
10+
#include <testing-utils/use_catch.h>
1111

1212
#include <goto-programs/class_hierarchy.h>
1313

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ Author: Diffblue Ltd.
66
77
\*******************************************************************/
88

9-
#include <testing-utils/catch.hpp>
109
#include <java-testing-utils/load_java_class.h>
10+
#include <testing-utils/use_catch.h>
1111

1212
#include <goto-programs/class_hierarchy.h>
1313

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ Author: Diffblue Ltd.
77
88
\*******************************************************************/
99

10-
#include <testing-utils/catch.hpp>
1110
#include <java-testing-utils/load_java_class.h>
11+
#include <testing-utils/use_catch.h>
1212

1313
#include <util/simplify_expr.h>
1414
#include <goto-programs/remove_virtual_functions.h>

‎jbmc/unit/java_bytecode/goto_program_generics/generic_bases_test.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ Module: Unit tests for instantiating generic superclasses and interfaces.
55
Author: Diffblue Ltd.
66
77
\*******************************************************************/
8-
#include <testing-utils/catch.hpp>
98
#include <java-testing-utils/load_java_class.h>
109
#include <java-testing-utils/require_goto_statements.h>
11-
#include <util/config.h>
1210
#include <java-testing-utils/require_type.h>
1311
#include <testing-utils/require_symbol.h>
12+
#include <testing-utils/use_catch.h>
13+
#include <util/config.h>
1414

1515
// NOTE: To inspect these tests at any point, use expr2java.
1616
// A good way to verify the validity of a test is to iterate

‎jbmc/unit/java_bytecode/goto_program_generics/generic_parameters_test.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ Module: Unit tests for instantiating generic classes.
55
Author: Diffblue Ltd.
66
77
\*******************************************************************/
8-
#include <testing-utils/catch.hpp>
98
#include <java-testing-utils/load_java_class.h>
109
#include <java-testing-utils/require_goto_statements.h>
11-
#include <util/config.h>
1210
#include <java-testing-utils/require_type.h>
1311
#include <testing-utils/require_symbol.h>
12+
#include <testing-utils/use_catch.h>
13+
#include <util/config.h>
1414

1515
// NOTE: To inspect these tests at any point, use expr2java.
1616
// A good way to verify the validity of a test is to iterate

‎jbmc/unit/java_bytecode/goto_program_generics/mutually_recursive_generics.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Author: Diffblue Ltd.
99
#include <java-testing-utils/load_java_class.h>
1010
#include <java-testing-utils/require_goto_statements.h>
1111
#include <java-testing-utils/require_type.h>
12-
#include <testing-utils/catch.hpp>
12+
#include <testing-utils/use_catch.h>
1313

1414
SCENARIO(
1515
"Generics class with mutually recursive_generic parameters",

‎jbmc/unit/java_bytecode/inherited_static_fields/inherited_static_fields.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ Author: Diffblue Ltd.
66
77
\*******************************************************************/
88

9-
#include <testing-utils/catch.hpp>
109
#include <java-testing-utils/load_java_class.h>
10+
#include <testing-utils/use_catch.h>
1111

1212
#include <algorithm>
1313

‎jbmc/unit/java_bytecode/java_bytecode_convert_class/convert_abstract_class.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Author: Diffblue Ltd.
66
77
\*******************************************************************/
88

9-
#include <testing-utils/catch.hpp>
9+
#include <testing-utils/use_catch.h>
1010

1111
#include <istream>
1212
#include <memory>

‎jbmc/unit/java_bytecode/java_bytecode_convert_class/convert_java_annotations.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Author: Diffblue Ltd.
1010
#include <java_bytecode/java_bytecode_convert_class.h>
1111
#include <java_bytecode/java_bytecode_parse_tree.h>
1212
#include <java_bytecode/java_types.h>
13-
#include <testing-utils/catch.hpp>
13+
#include <testing-utils/use_catch.h>
1414

1515
SCENARIO(
1616
"java_bytecode_convert_annotations",

‎jbmc/unit/java_bytecode/java_bytecode_convert_method/convert_initalizers.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Author: Diffblue Limited.
66
77
\*******************************************************************/
88

9-
#include <testing-utils/catch.hpp>
9+
#include <testing-utils/use_catch.h>
1010

1111
#include <memory>
1212

‎jbmc/unit/java_bytecode/java_bytecode_convert_method/convert_invoke_dynamic.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ Author: Diffblue Ltd.
66
77
\*******************************************************************/
88

9-
#include <testing-utils/catch.hpp>
9+
#include <goto-programs/class_hierarchy.h>
1010
#include <java-testing-utils/load_java_class.h>
1111
#include <java-testing-utils/require_goto_statements.h>
12-
#include <testing-utils/require_expr.h>
1312
#include <java-testing-utils/require_type.h>
14-
#include <testing-utils/run_test_with_compilers.h>
13+
#include <testing-utils/require_expr.h>
1514
#include <testing-utils/require_symbol.h>
15+
#include <testing-utils/run_test_with_compilers.h>
16+
#include <testing-utils/use_catch.h>
1617
#include <util/expr_iterator.h>
17-
#include <goto-programs/class_hierarchy.h>
1818

1919
struct lambda_assignment_test_datat
2020
{

‎jbmc/unit/java_bytecode/java_bytecode_convert_method/convert_method.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Author: Diffblue Limited.
66
77
\*******************************************************************/
88

9-
#include <testing-utils/catch.hpp>
9+
#include <testing-utils/use_catch.h>
1010

1111
#include <util/symbol_table.h>
1212

‎jbmc/unit/java_bytecode/java_bytecode_instrument/virtual_call_null_checks.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ Author: Diffblue Limited.
77
88
\*******************************************************************/
99

10-
#include <testing-utils/catch.hpp>
11-
#include <testing-utils/message.h>
1210
#include <java-testing-utils/load_java_class.h>
11+
#include <testing-utils/message.h>
12+
#include <testing-utils/use_catch.h>
1313

1414
#include <analyses/local_safe_pointers.h>
1515
#include <goto-programs/goto_convert_functions.h>

‎jbmc/unit/java_bytecode/java_bytecode_parse_generics/parse_bounded_generic_inner_classes.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ Author: Diffblue Ltd.
66
77
\*******************************************************************/
88

9-
#include <testing-utils/catch.hpp>
109
#include <java-testing-utils/load_java_class.h>
1110
#include <java-testing-utils/require_type.h>
11+
#include <testing-utils/use_catch.h>
1212

1313
SCENARIO(
1414
"parse_bounded_generic_inner_classes",

‎jbmc/unit/java_bytecode/java_bytecode_parse_generics/parse_derived_generic_class.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ Author: Diffblue Ltd.
66
77
\*******************************************************************/
88

9-
#include <testing-utils/catch.hpp>
109
#include <java-testing-utils/load_java_class.h>
1110
#include <java-testing-utils/require_type.h>
11+
#include <testing-utils/use_catch.h>
1212

1313
SCENARIO(
1414
"parse_derived_generic_class",

‎jbmc/unit/java_bytecode/java_bytecode_parse_generics/parse_functions_with_generics.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ Author: Diffblue Ltd.
66
77
\*******************************************************************/
88

9-
#include <testing-utils/catch.hpp>
109
#include <java-testing-utils/load_java_class.h>
1110
#include <java-testing-utils/require_type.h>
11+
#include <testing-utils/use_catch.h>
1212

1313
SCENARIO(
1414
"parse_functions_with_generics",

‎jbmc/unit/java_bytecode/java_bytecode_parse_generics/parse_generic_array_class.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ Author: Diffblue Ltd.
66
77
\*******************************************************************/
88

9-
#include <testing-utils/catch.hpp>
109
#include <java-testing-utils/load_java_class.h>
1110
#include <java-testing-utils/require_type.h>
11+
#include <testing-utils/use_catch.h>
1212

1313
SCENARIO(
1414
"parse_generic_array_class",

‎jbmc/unit/java_bytecode/java_bytecode_parse_generics/parse_generic_class.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ Author: Diffblue Ltd.
66
77
\*******************************************************************/
88

9-
#include <testing-utils/catch.hpp>
109
#include <java-testing-utils/load_java_class.h>
1110
#include <java-testing-utils/require_type.h>
11+
#include <testing-utils/use_catch.h>
1212

1313
SCENARIO(
1414
"parse_generic_class_one_param",

‎jbmc/unit/java_bytecode/java_bytecode_parse_generics/parse_generic_class_with_generic_inner_classes.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ Author: Diffblue Ltd.
66
77
\*******************************************************************/
88

9-
#include <testing-utils/catch.hpp>
109
#include <java-testing-utils/load_java_class.h>
1110
#include <java-testing-utils/require_type.h>
11+
#include <testing-utils/use_catch.h>
1212

1313
SCENARIO(
1414
"parse_generic_class_with_generic_inner_classes_fields",

‎jbmc/unit/java_bytecode/java_bytecode_parse_generics/parse_generic_class_with_inner_classes.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ Author: Diffblue Ltd.
66
77
\*******************************************************************/
88

9-
#include <testing-utils/catch.hpp>
109
#include <java-testing-utils/load_java_class.h>
1110
#include <java-testing-utils/require_type.h>
11+
#include <testing-utils/use_catch.h>
1212

1313
SCENARIO(
1414
"parse_generic_class_with_inner_classes",

‎jbmc/unit/java_bytecode/java_bytecode_parse_generics/parse_generic_fields.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ Author: Diffblue Ltd.
66
77
\*******************************************************************/
88

9-
#include <testing-utils/catch.hpp>
109
#include <java-testing-utils/load_java_class.h>
1110
#include <java-testing-utils/require_type.h>
11+
#include <testing-utils/use_catch.h>
1212

1313
SCENARIO(
1414
"parse_generic_fields",

‎jbmc/unit/java_bytecode/java_bytecode_parse_generics/parse_generic_functions.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ Author: Diffblue Ltd.
66
77
\*******************************************************************/
88

9-
#include <testing-utils/catch.hpp>
109
#include <java-testing-utils/load_java_class.h>
1110
#include <java-testing-utils/require_type.h>
11+
#include <testing-utils/use_catch.h>
1212

1313
SCENARIO(
1414
"parse_generic_functions",

‎jbmc/unit/java_bytecode/java_bytecode_parse_generics/parse_generic_superclasses.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ Author: Diffblue Ltd.
88
99
\*******************************************************************/
1010

11-
#include <testing-utils/catch.hpp>
1211
#include <java-testing-utils/load_java_class.h>
1312
#include <java-testing-utils/require_type.h>
13+
#include <testing-utils/use_catch.h>
1414

1515
SCENARIO(
1616
"parse generic superclass signature",

‎jbmc/unit/java_bytecode/java_bytecode_parse_generics/parse_generic_wildcard_function.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ Author: Diffblue Ltd.
66
77
\*******************************************************************/
88

9-
#include <testing-utils/catch.hpp>
109
#include <java-testing-utils/load_java_class.h>
10+
#include <testing-utils/use_catch.h>
1111

1212
SCENARIO(
1313
"parse_generic_wildcard",

‎jbmc/unit/java_bytecode/java_bytecode_parse_generics/parse_lvtt_generic_local_vars.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Author: Diffblue Ltd.
88

99
#include <java-testing-utils/load_java_class.h>
1010
#include <java-testing-utils/require_type.h>
11-
#include <testing-utils/catch.hpp>
11+
#include <testing-utils/use_catch.h>
1212

1313
SCENARIO(
1414
"parse_lvtt_generic_local_vars",

‎jbmc/unit/java_bytecode/java_bytecode_parse_generics/parse_nested_generics.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ Author: Diffblue Ltd.
66
77
\*******************************************************************/
88

9-
#include <testing-utils/catch.hpp>
109
#include <java-testing-utils/load_java_class.h>
1110
#include <java-testing-utils/require_type.h>
11+
#include <testing-utils/use_catch.h>
1212

1313
SCENARIO(
1414
"parse_nested_generics_fields",

‎jbmc/unit/java_bytecode/java_bytecode_parse_generics/parse_recursive_generic_class.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ Author: Diffblue Ltd.
66
77
\*******************************************************************/
88

9-
#include <testing-utils/catch.hpp>
109
#include <java-testing-utils/load_java_class.h>
10+
#include <testing-utils/use_catch.h>
1111

1212
SCENARIO(
1313
"parse_recursive_generic_class",

‎jbmc/unit/java_bytecode/java_bytecode_parse_generics/parse_signature_descriptor_mismatch.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ Author: Diffblue Ltd.
66
77
\*******************************************************************/
88

9-
#include <testing-utils/catch.hpp>
109
#include <java-testing-utils/load_java_class.h>
1110
#include <java-testing-utils/require_type.h>
11+
#include <testing-utils/use_catch.h>
1212

1313
SCENARIO(
1414
"parse_signature_descriptor_mismatch",

‎jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/java_bytecode_convert_class_lambda_method_handles.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ Author: Diffblue Ltd.
88

99
#include <algorithm>
1010

11-
#include <testing-utils/catch.hpp>
1211
#include <java-testing-utils/load_java_class.h>
13-
#include <testing-utils/run_test_with_compilers.h>
1412
#include <java-testing-utils/require_type.h>
13+
#include <testing-utils/run_test_with_compilers.h>
14+
#include <testing-utils/use_catch.h>
1515

1616
SCENARIO(
1717
"Static lambdas in class symbol",

‎jbmc/unit/java_bytecode/java_bytecode_parse_lambdas/java_bytecode_parse_lambda_method_table.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ Author: Diffblue Ltd.
1313
#include <java-testing-utils/require_parse_tree.h>
1414

1515
#include <java_bytecode/java_bytecode_parser.h>
16-
#include <testing-utils/catch.hpp>
1716
#include <testing-utils/message.h>
17+
#include <testing-utils/use_catch.h>
1818

1919
#include <java_bytecode/java_bytecode_parse_tree.h>
2020
#include <java_bytecode/java_types.h>

‎jbmc/unit/java_bytecode/java_bytecode_parser/parse_class_without_instructions.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Author: Diffblue Ltd.
1212
#include <testing-utils/message.h>
1313
#include <util/message.h>
1414

15-
#include <testing-utils/catch.hpp>
15+
#include <testing-utils/use_catch.h>
1616

1717
static void check_class_structure(
1818
const java_bytecode_parse_treet::classt &loaded_class)

0 commit comments

Comments
 (0)