C++: Fix deprecated predicate warnings

dave-bartolomeo · dave-bartolomeo · commit 4a1d04b42325 · 2018-09-04T10:30:48.000-07:00
diff --git a/cpp/ql/src/semmle/code/cpp/ir/implementation/aliased_ssa/PrintIR.qll b/cpp/ql/src/semmle/code/cpp/ir/implementation/aliased_ssa/PrintIR.qll
@@ -83,7 +83,7 @@ class PrintableFunctionIR extends PrintableIRNode, TPrintableFunctionIR {
   override int getOrder() {
     this = rank[result + 1](PrintableFunctionIR orderedFunc, Location location |
       location = orderedFunc.getFunctionIR().getLocation() |
-      orderedFunc order by location.getFile().getURL(), location.getStartLine(),
+      orderedFunc order by location.getFile().getAbsolutePath(), location.getStartLine(),
         location.getStartColumn(), orderedFunc.getLabel()
     )
   }
diff --git a/cpp/ql/src/semmle/code/cpp/ir/implementation/raw/PrintIR.qll b/cpp/ql/src/semmle/code/cpp/ir/implementation/raw/PrintIR.qll
@@ -83,7 +83,7 @@ class PrintableFunctionIR extends PrintableIRNode, TPrintableFunctionIR {
   override int getOrder() {
     this = rank[result + 1](PrintableFunctionIR orderedFunc, Location location |
       location = orderedFunc.getFunctionIR().getLocation() |
-      orderedFunc order by location.getFile().getURL(), location.getStartLine(),
+      orderedFunc order by location.getFile().getAbsolutePath(), location.getStartLine(),
         location.getStartColumn(), orderedFunc.getLabel()
     )
   }
diff --git a/cpp/ql/src/semmle/code/cpp/ir/implementation/unaliased_ssa/PrintIR.qll b/cpp/ql/src/semmle/code/cpp/ir/implementation/unaliased_ssa/PrintIR.qll
@@ -83,8 +83,7 @@ class PrintableFunctionIR extends PrintableIRNode, TPrintableFunctionIR {
   override int getOrder() {
     this = rank[result + 1](PrintableFunctionIR orderedFunc, Location location |
       location = orderedFunc.getFunctionIR().getLocation() |
-      orderedFunc order by location.getFile().getAbsolutePath(),
-        location.getStartLine(),
+      orderedFunc order by location.getFile().getAbsolutePath(), location.getStartLine(),
         location.getStartColumn(), orderedFunc.getLabel()
     )
   }

Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ class PrintableFunctionIR extends PrintableIRNode, TPrintableFunctionIR {`
`83`	`83`	`override int getOrder() {`
`84`	`84`	`this = rank[result + 1](PrintableFunctionIR orderedFunc, Location location \|`
`85`	`85`	`location = orderedFunc.getFunctionIR().getLocation() \|`
`86`		`- orderedFunc order by location.getFile().getURL(), location.getStartLine(),`
	`86`	`+ orderedFunc order by location.getFile().getAbsolutePath(), location.getStartLine(),`
`87`	`87`	`location.getStartColumn(), orderedFunc.getLabel()`
`88`	`88`	`)`
`89`	`89`	`}`
Original file line number	Diff line number	Diff line change
`@@ -83,8 +83,7 @@ class PrintableFunctionIR extends PrintableIRNode, TPrintableFunctionIR {`
`83`	`83`	`override int getOrder() {`
`84`	`84`	`this = rank[result + 1](PrintableFunctionIR orderedFunc, Location location \|`
`85`	`85`	`location = orderedFunc.getFunctionIR().getLocation() \|`
`86`		`- orderedFunc order by location.getFile().getAbsolutePath(),`
`87`		`- location.getStartLine(),`
	`86`	`+ orderedFunc order by location.getFile().getAbsolutePath(), location.getStartLine(),`
`88`	`87`	`location.getStartColumn(), orderedFunc.getLabel()`
`89`	`88`	`)`
`90`	`89`	`}`