Skip to content

Commit 7ecd229

Browse files
committed
C++: Improve make_pair in stl.h (jbj solution).
1 parent 6de29a6 commit 7ecd229

File tree

3 files changed

+1
-6
lines changed

3 files changed

+1
-6
lines changed

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -324,8 +324,7 @@ namespace std {
324324

325325
void swap(pair& p) /*noexcept(...)*/;
326326
};
327-
328-
template<class T1, class T2> constexpr pair<T1, T2> make_pair(T1&&, T2&&);
327+
template< class T1, class T2 > std::pair<T1,T2> make_pair(const T1& t, const T2& u );
329328
}
330329

331330
// --- map ---

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,7 @@
2828
| map.cpp:76:9:76:13 | map.cpp:63:37:63:42 | IR only |
2929
| map.cpp:77:9:77:14 | map.cpp:63:37:63:42 | IR only |
3030
| map.cpp:84:34:84:38 | map.cpp:84:17:84:22 | IR only |
31-
| map.cpp:85:7:85:39 | map.cpp:85:17:85:22 | IR only |
3231
| map.cpp:85:34:85:39 | map.cpp:85:17:85:22 | IR only |
33-
| map.cpp:87:7:87:38 | map.cpp:87:24:87:29 | IR only |
3432
| map.cpp:87:34:87:38 | map.cpp:87:24:87:29 | IR only |
3533
| map.cpp:88:34:88:39 | map.cpp:88:24:88:29 | IR only |
3634
| 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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,8 @@
7070
| map.cpp:78:7:78:7 | l | map.cpp:63:37:63:42 | call to source |
7171
| map.cpp:83:7:83:32 | call to pair | map.cpp:83:17:83:22 | call to source |
7272
| map.cpp:84:34:84:38 | first | map.cpp:84:17:84:22 | call to source |
73-
| map.cpp:85:7:85:39 | (reference dereference) | map.cpp:85:17:85:22 | call to source |
7473
| map.cpp:85:34:85:39 | second | map.cpp:85:17:85:22 | call to source |
7574
| map.cpp:86:7:86:32 | call to pair | map.cpp:86:24:86:29 | call to source |
76-
| map.cpp:87:7:87:38 | (reference dereference) | map.cpp:87:24:87:29 | call to source |
7775
| map.cpp:87:34:87:38 | first | map.cpp:87:24:87:29 | call to source |
7876
| map.cpp:88:34:88:39 | second | map.cpp:88:24:88:29 | call to source |
7977
| map.cpp:93:9:93:13 | first | map.cpp:91:33:91:38 | call to source |

0 commit comments

Comments
 (0)