C++: Make a few things in SAL.qll private where it looks like that was intended (and they're not used outside the file).

geoffw0 · geoffw0 · commit d44477853598 · 2020-08-12T16:57:43.000+01:00
diff --git a/cpp/ql/src/Microsoft/SAL.qll b/cpp/ql/src/Microsoft/SAL.qll
@@ -27,7 +27,7 @@ class SALMacro extends Macro {
   }
 }
 
-pragma[noinline]
+private pragma[noinline]
 predicate isTopLevelMacroAccess(MacroAccess ma) { not exists(ma.getParentInvocation()) }
 
 /**
@@ -107,7 +107,7 @@ class SALMaybeNull extends SALAnnotation {
  * Holds if `a` annotates the declaration entry `d` and
  * its start position is the `idx`th position in `file` that holds a SAL element.
  */
-predicate annotatesAt(SALAnnotation a, DeclarationEntry d, File file, int idx) {
+private predicate annotatesAt(SALAnnotation a, DeclarationEntry d, File file, int idx) {
   annotatesAtPosition(a.(SALElement).getStartPosition(), d, file, idx)
 }
 

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ class SALMacro extends Macro {`
`27`	`27`	`}`
`28`	`28`	`}`
`29`	`29`
`30`		`-pragma[noinline]`
	`30`	`+private pragma[noinline]`
`31`	`31`	`predicate isTopLevelMacroAccess(MacroAccess ma) { not exists(ma.getParentInvocation()) }`
`32`	`32`
`33`	`33`	`/**`
`@@ -107,7 +107,7 @@ class SALMaybeNull extends SALAnnotation {`
`107`	`107`	* Holds if `a` annotates the declaration entry `d` and
`108`	`108`	* its start position is the `idx`th position in `file` that holds a SAL element.
`109`	`109`	`*/`
`110`		`-predicate annotatesAt(SALAnnotation a, DeclarationEntry d, File file, int idx) {`
	`110`	`+private predicate annotatesAt(SALAnnotation a, DeclarationEntry d, File file, int idx) {`
`111`	`111`	`annotatesAtPosition(a.(SALElement).getStartPosition(), d, file, idx)`
`112`	`112`	`}`
`113`	`113`