C++: Update the 'usings' tests.

Author: geoffw0

cpp/ql/test/library-tests/usings/Usings1.expected

@@ -1,7 +1,7 @@
-| templates.cpp:9:5:9:14 | using c |
-| usings.cpp:8:1:8:11 | using nf |
+| templates.cpp:9:5:9:14 | using declaration |
+| usings.cpp:8:1:8:11 | using declaration |
 | usings.cpp:9:1:9:17 | using namespace N |
-| usings.cpp:18:3:18:13 | using bf |
-| usings.cpp:21:5:21:14 | using gf |
-| usings.cpp:34:3:34:20 | using tbf |
-| usings.cpp:42:5:42:22 | using foo |
+| usings.cpp:18:3:18:13 | using declaration |
+| usings.cpp:21:5:21:14 | using declaration |
+| usings.cpp:34:3:34:20 | using declaration |
+| usings.cpp:42:5:42:22 | using declaration |

cpp/ql/test/library-tests/usings/Usings2.expected

@@ -1,7 +1,7 @@
-| templates.cpp:9:5:9:14 | using c | file://:0:0:0:0 | std |
-| usings.cpp:8:1:8:11 | using nf | file://:0:0:0:0 | (global namespace) |
+| templates.cpp:9:5:9:14 | using declaration | file://:0:0:0:0 | std |
+| usings.cpp:8:1:8:11 | using declaration | file://:0:0:0:0 | (global namespace) |
 | usings.cpp:9:1:9:17 | using namespace N | file://:0:0:0:0 | (global namespace) |
-| usings.cpp:18:3:18:13 | using bf | usings.cpp:16:8:16:8 | D |
-| usings.cpp:21:5:21:14 | using gf | usings.cpp:20:13:23:3 | { ... } |
-| usings.cpp:34:3:34:20 | using tbf | usings.cpp:32:8:32:9 | TD |
-| usings.cpp:42:5:42:22 | using foo | usings.cpp:41:11:41:15 | nsbar |
+| usings.cpp:18:3:18:13 | using declaration | usings.cpp:16:8:16:8 | D |
+| usings.cpp:21:5:21:14 | using declaration | usings.cpp:20:13:23:3 | { ... } |
+| usings.cpp:34:3:34:20 | using declaration | usings.cpp:32:8:32:9 | TD |
+| usings.cpp:42:5:42:22 | using declaration | usings.cpp:41:11:41:15 | nsbar |