C++: Use a more modern make_pair.

Author: geoffw0

cpp/ql/test/library-tests/dataflow/taint-tests/localTaint.expected

@@ -260,7 +260,6 @@
 | file://:0:0:0:0 | p#0 | file://:0:0:0:0 | p#0 |  |
 | file://:0:0:0:0 | p#0 | file://:0:0:0:0 | p#0 |  |
 | file://:0:0:0:0 | p#0 | file://:0:0:0:0 | p#0 |  |
-| file://:0:0:0:0 | p#0 | file://:0:0:0:0 | p#0 |  |
 | format.cpp:16:21:16:21 | s | format.cpp:22:22:22:22 | s |  |
 | format.cpp:16:31:16:31 | n | format.cpp:22:25:22:25 | n |  |
 | format.cpp:16:46:16:51 | format | format.cpp:22:28:22:33 | format |  |
@@ -1989,15 +1988,10 @@
 | stl.h:222:30:222:40 | call to allocator | stl.h:222:21:222:41 | noexcept(...) | TAINT |
 | stl.h:222:53:222:63 | 0 | stl.h:222:46:222:64 | (no string representation) | TAINT |
 | stl.h:315:9:315:9 | Unknown literal | stl.h:315:9:315:9 | constructor init of field first | TAINT |
-| stl.h:315:9:315:9 | Unknown literal | stl.h:315:9:315:9 | constructor init of field first | TAINT |
-| stl.h:315:9:315:9 | Unknown literal | stl.h:315:9:315:9 | constructor init of field second | TAINT |
 | stl.h:315:9:315:9 | Unknown literal | stl.h:315:9:315:9 | constructor init of field second | TAINT |
 | stl.h:315:9:315:9 | constructor init of field first [post-this] | stl.h:315:9:315:9 | constructor init of field second [pre-this] |  |
-| stl.h:315:9:315:9 | constructor init of field first [post-this] | stl.h:315:9:315:9 | constructor init of field second [pre-this] |  |
-| stl.h:315:9:315:9 | constructor init of field first [pre-this] | stl.h:315:9:315:9 | constructor init of field second [pre-this] |  |
 | stl.h:315:9:315:9 | constructor init of field first [pre-this] | stl.h:315:9:315:9 | constructor init of field second [pre-this] |  |
 | stl.h:315:9:315:9 | this | stl.h:315:9:315:9 | constructor init of field first [pre-this] |  |
-| stl.h:315:9:315:9 | this | stl.h:315:9:315:9 | constructor init of field first [pre-this] |  |
 | string.cpp:24:12:24:17 | call to source | string.cpp:28:7:28:7 | a |  |
 | string.cpp:25:16:25:20 | 123 | string.cpp:25:16:25:21 | call to basic_string | TAINT |
 | string.cpp:25:16:25:21 | call to basic_string | string.cpp:29:7:29:7 | b |  |

cpp/ql/test/library-tests/dataflow/taint-tests/stl.h

@@ -325,7 +325,7 @@ namespace std {
 		void swap(pair& p) /*noexcept(...)*/;
 	};
 
-	template <class T1, class T2> pair<T1,T2> make_pair(T1, T2);
+	template<class T1, class T2> constexpr pair<T1, T2> make_pair(T1&&, T2&&);
 }
 
 // --- map ---

cpp/ql/test/library-tests/dataflow/taint-tests/test_diff.expected

@@ -34,7 +34,9 @@
 | map.cpp:76:9:76:13 | map.cpp:63:37:63:42 | IR only |
 | map.cpp:77:9:77:14 | map.cpp:63:37:63:42 | IR only |
 | map.cpp:84:34:84:38 | map.cpp:84:17:84:22 | IR only |
+| map.cpp:85:7:85:39 | map.cpp:85:17:85:22 | IR only |
 | map.cpp:85:34:85:39 | map.cpp:85:17:85:22 | IR only |
+| map.cpp:87:7:87:38 | map.cpp:87:24:87:29 | IR only |
 | map.cpp:87:34:87:38 | map.cpp:87:24:87:29 | IR only |
 | map.cpp:88:34:88:39 | map.cpp:88:24:88:29 | IR only |
 | map.cpp:92:7:92:7 | map.cpp:91:33:91:38 | AST only |

cpp/ql/test/library-tests/dataflow/taint-tests/test_ir.expected

@@ -70,8 +70,10 @@
 | map.cpp:78:7:78:7 | l | map.cpp:63:37:63:42 | call to source |
 | map.cpp:83:7:83:32 | call to pair | map.cpp:83:17:83:22 | call to source |
 | map.cpp:84:34:84:38 | first | map.cpp:84:17:84:22 | call to source |
+| map.cpp:85:7:85:39 | (reference dereference) | map.cpp:85:17:85:22 | call to source |
 | map.cpp:85:34:85:39 | second | map.cpp:85:17:85:22 | call to source |
 | map.cpp:86:7:86:32 | call to pair | map.cpp:86:24:86:29 | call to source |
+| map.cpp:87:7:87:38 | (reference dereference) | map.cpp:87:24:87:29 | call to source |
 | map.cpp:87:34:87:38 | first | map.cpp:87:24:87:29 | call to source |
 | map.cpp:88:34:88:39 | second | map.cpp:88:24:88:29 | call to source |
 | map.cpp:93:9:93:13 | first | map.cpp:91:33:91:38 | call to source |