Skip to content

Merge master to next #164

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
adityasharad merged 21 commits into from
Sep 6, 2018
Merged

Merge master to next #164

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
04e919d
C++: clearer alert wording in integer-multiplication-cast-to-long
nickrolfe Sep 3, 2018
4230adb
C++: Remove reundant override
ian-semmle Sep 3, 2018
e39a0d2
C++: Tweak namespaces test
ian-semmle Sep 3, 2018
1fcf156
C++: Add another test to namespaces test
ian-semmle Sep 3, 2018
3fd6a8d
C++: Fix the definition of GlobalNamespace.getADeclaration()
ian-semmle Sep 3, 2018
f2d030a
C++: shorten message in integer-multiplication-cast-to-long
nickrolfe Sep 4, 2018
ab2bec7
Revert "Version: Bump to 1.19.0 dev."
adityasharad Sep 4, 2018
ae80b8d
Merge pull request #145 from nickrolfe/rewording
geoffw0 Sep 4, 2018
ce5653a
C++: Tweak qldoc for declaration names
ian-semmle Sep 4, 2018
20ade48
Merge pull request #146 from ian-semmle/TemplateParameterName
semmle-qlci Sep 4, 2018
43704e2
Merge pull request #144 from ian-semmle/topLevel2
jbj Sep 4, 2018
ccceef3
Merge pull request #155 from adityasharad/revert/master/version-1.19.0
nickrolfe Sep 4, 2018
2d4f664
Merge pull request #157 from ian-semmle/declarationName
semmle-qlci Sep 4, 2018
b9d825b
JS: better matching of String.prototype.search in js/regex-injection
Sep 5, 2018
5541b9f
C++: Split IRBlock index from IRBlock membership
jbj Sep 1, 2018
5fcd663
Merge pull request #158 from esben-semmle/js/sharpen-regexp-injection
semmle-qlci Sep 5, 2018
43e1e62
Merge pull request #133 from jbj/IRBlock-number-split
semmle-qlci Sep 5, 2018
f279452
Merge rc/1.18 into master.
adityasharad Sep 5, 2018
ec62657
Merge pull request #161 from adityasharad/merge/1.18-master-050918
jbj Sep 5, 2018
d5e0357
Revert "Revert "Version: Bump to 1.19.0 dev.""
jbj Sep 5, 2018
69e9156
Merge branch 'master-to-next-20180905-master' into master-to-next-201…
jbj Sep 5, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
C++: Add another test to namespaces test
  • Loading branch information
@ian-semmle
ian-semmle committed Sep 4, 2018
commit 1fcf156e7ee5784e54c88f015618ed5f7dfba15c
2 changes: 2 additions & 0 deletions cpp/ql/test/library-tests/namespaces/namespaces/decls.expected
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@
| file://:0:0:0:0 | (global namespace) | file://:0:0:0:0 | operator= | __va_list_tag::operator= | false |
| file://:0:0:0:0 | (global namespace) | file://:0:0:0:0 | overflow_arg_area | __va_list_tag::overflow_arg_area | false |
| file://:0:0:0:0 | (global namespace) | file://:0:0:0:0 | reg_save_area | __va_list_tag::reg_save_area | false |
| file://:0:0:0:0 | (global namespace) | namespaces.cpp:42:6:42:18 | globalIntUser | globalIntUser | true |
| file://:0:0:0:0 | <none> | file://:0:0:0:0 | auto | <none> | false |
| file://:0:0:0:0 | <none> | namespaces.cpp:40:5:40:13 | globalInt | <none> | true |
| file://:0:0:0:0 | B | namespaces.cpp:32:7:32:7 | x | B::x | true |
| namespaces.cpp:11:13:11:13 | C::D | file://:0:0:0:0 | p#0 | <none> | false |
| namespaces.cpp:11:13:11:13 | C::D | file://:0:0:0:0 | p#0 | <none> | false |
Expand Down
6 changes: 6 additions & 0 deletions cpp/ql/test/library-tests/namespaces/namespaces/namespaces.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,3 +36,9 @@ namespace B {
namespace std {

}

int globalInt;

void globalIntUser(void) {
extern int globalInt;
}