C++: accept more test changes following extractor frontend upgrade

Author: nickrolfe

cpp/ql/test/library-tests/friends/loop/friends.expected

@@ -6,4 +6,4 @@
 | file://:0:0:0:0 | F<D>'s friend | loop.cpp:5:26:5:26 | E<D> |
 | loop.cpp:6:5:6:5 | E<T>'s friend | loop.cpp:5:26:5:26 | E<T> |
 | loop.cpp:7:5:7:5 | E<T>'s friend | loop.cpp:7:36:7:36 | F<U> |
-| loop.cpp:11:5:11:5 | F<T>'s friend | loop.cpp:5:26:5:26 | E<T> |
+| loop.cpp:11:5:11:5 | F<T>'s friend | loop.cpp:11:36:11:36 | E<U> |

cpp/ql/test/library-tests/templates/CPP-204/element.expected

@@ -29,7 +29,7 @@
 | test.cpp:7:8:7:10 | IsX<X> |
 | test.cpp:7:8:7:10 | definition of IsX<X> |
 | test.cpp:8:23:8:27 | Value |
-| test.cpp:8:23:8:27 | declaration of Value |
+| test.cpp:8:23:8:27 | definition of Value |
 | test.cpp:8:31:8:35 | 0 |
 | test.cpp:8:31:8:35 | initializer for Value |
 | test.cpp:11:10:11:11 | mention of EC |
@@ -43,7 +43,7 @@
 | test.cpp:17:8:17:9 | IX<X> |
 | test.cpp:17:8:17:9 | definition of IX<X> |
 | test.cpp:18:21:18:25 | Value |
-| test.cpp:18:21:18:25 | declaration of Value |
+| test.cpp:18:21:18:25 | definition of Value |
 | test.cpp:18:29:18:32 | EC:: |
 | test.cpp:18:29:18:33 | V |
 | test.cpp:18:29:18:33 | initializer for Value |

cpp/ql/test/library-tests/templates/isfromtemplateinstantiation/isfromuninstantiatedtemplate.expected

@@ -1,6 +1,8 @@
 isFromUninstantiatedTemplate
-| file://:0:0:0:0 | Unknown literal | isfromtemplateinstantiation.cpp:77:26:77:45 | AnotherTemplateClass<T> |
-| file://:0:0:0:0 | Unknown literal | isfromtemplateinstantiation.cpp:77:26:77:45 | AnotherTemplateClass<T> |
+| file://:0:0:0:0 | 0 | isfromtemplateinstantiation.cpp:77:26:77:45 | AnotherTemplateClass<T> |
+| file://:0:0:0:0 | 0 | isfromtemplateinstantiation.cpp:77:26:77:45 | AnotherTemplateClass<T> |
+| file://:0:0:0:0 | (int)... | isfromtemplateinstantiation.cpp:77:26:77:45 | AnotherTemplateClass<T> |
+| file://:0:0:0:0 | (int)... | isfromtemplateinstantiation.cpp:77:26:77:45 | AnotherTemplateClass<T> |
 | file://:0:0:0:0 | declaration of 1st parameter | isfromtemplateinstantiation.cpp:134:29:134:33 | Outer<T> |
 | file://:0:0:0:0 | declaration of 1st parameter | isfromtemplateinstantiation.cpp:134:29:134:33 | Outer<T> |
 | file://:0:0:0:0 | initializer for MyClassEnumConst | isfromtemplateinstantiation.cpp:77:26:77:45 | AnotherTemplateClass<T> |