Simplify definitions.qll for C++.

pavgust · pavgust · commit 3bc06627e126 · 2018-08-14T16:38:56.000-07:00
diff --git a/cpp/ql/src/definitions.qll b/cpp/ql/src/definitions.qll
@@ -186,7 +186,7 @@ Top definitionOf(Top e, string kind) {
       not exists(MacroInvocation mi, Location l1, Location l2 |
         l1 = e.(Include).getLocation() and
         l2 = mi.getLocation() and
-        l1.getFile() = l2.getFile() and
+        l1.getContainer() = l2.getContainer() and
         l1.getStartLine() = l2.getStartLine()
         // (an #include directive must be always on it's own line)
       )

Original file line number	Diff line number	Diff line change
`@@ -186,7 +186,7 @@ Top definitionOf(Top e, string kind) {`
`186`	`186`	`not exists(MacroInvocation mi, Location l1, Location l2 \|`
`187`	`187`	`l1 = e.(Include).getLocation() and`
`188`	`188`	`l2 = mi.getLocation() and`
`189`		`- l1.getFile() = l2.getFile() and`
	`189`	`+ l1.getContainer() = l2.getContainer() and`
`190`	`190`	`l1.getStartLine() = l2.getStartLine()`
`191`	`191`	`// (an #include directive must be always on it's own line)`
`192`	`192`	`)`