Merge pull request #613 from ian-semmle/catch

C++: Test output changes following CatchAny fix

Author: nickrolfe

cpp/ql/test/library-tests/c++_exceptions/anycatch.expected

@@ -1,4 +1,3 @@
-| ODASA-5692.cpp:11:18:13:3 | { ... } |
 | ODASA-5692.cpp:14:15:16:3 | { ... } |
 | ODASA-5692.cpp:14:15:16:3 | { ... } |
 | exceptions.cpp:44:19:46:5 | { ... } |

cpp/ql/test/library-tests/c++_exceptions/catchparams.expected

@@ -1,4 +1,5 @@
 | ODASA-5692.cpp:11:10:11:14 | p#0 | ODASA-5692.cpp:11:18:13:3 | { ... } |
+| ODASA-5692.cpp:11:10:11:14 | p#0 | ODASA-5692.cpp:11:18:13:3 | { ... } |
 | exceptions.cpp:28:20:28:20 | e | exceptions.cpp:28:23:30:9 | { ... } |
 | exceptions.cpp:32:16:32:16 | e | exceptions.cpp:32:19:34:5 | { ... } |
 | exceptions.cpp:35:16:35:16 | e | exceptions.cpp:35:19:37:5 | { ... } |

cpp/ql/test/library-tests/c++_exceptions/handler.expected

@@ -1,6 +1,7 @@
 | ODASA-5692.cpp:11:18:13:3 | <handler> | getBlock | ODASA-5692.cpp:11:18:13:3 | { ... } |
 | ODASA-5692.cpp:11:18:13:3 | <handler> | getBlock | ODASA-5692.cpp:11:18:13:3 | { ... } |
 | ODASA-5692.cpp:11:18:13:3 | <handler> | getParameter | ODASA-5692.cpp:11:10:11:14 | p#0 |
+| ODASA-5692.cpp:11:18:13:3 | <handler> | getParameter | ODASA-5692.cpp:11:10:11:14 | p#0 |
 | ODASA-5692.cpp:11:18:13:3 | <handler> | getTryStmt | ODASA-5692.cpp:9:3:10:3 | try { ... } |
 | ODASA-5692.cpp:11:18:13:3 | <handler> | getTryStmt | ODASA-5692.cpp:9:3:10:3 | try { ... } |
 | ODASA-5692.cpp:11:18:13:3 | <handler> | getTryStmt.getACatchClause() | ODASA-5692.cpp:11:18:13:3 | { ... } |