Merge pull request #13234 from jketema/std-inline

jketema · web-flow · commit a319fc0044ec · 2023-05-22T19:56:15.000+02:00
C++: Include inline namespaces in `StdNamespace`
diff --git a/cpp/ql/lib/change-notes/2023-05-22-inline-in-std-namespace.md b/cpp/ql/lib/change-notes/2023-05-22-inline-in-std-namespace.md
@@ -0,0 +1,4 @@
+---
+category: minorAnalysis
+---
+* The `StdNamespace` class now also includes all inline namespaces that are children of `std` namespace.
diff --git a/cpp/ql/lib/semmle/code/cpp/Namespace.qll b/cpp/ql/lib/semmle/code/cpp/Namespace.qll
@@ -230,8 +230,12 @@ class GlobalNamespace extends Namespace {
 }
 
 /**
- * The C++ `std::` namespace.
+ * The C++ `std::` namespace and its inline namespaces.
  */
 class StdNamespace extends Namespace {
-  StdNamespace() { this.hasName("std") and this.getParentNamespace() instanceof GlobalNamespace }
+  StdNamespace() {
+    this.hasName("std") and this.getParentNamespace() instanceof GlobalNamespace
+    or
+    this.isInline() and this.getParentNamespace() instanceof StdNamespace
+  }
 }

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +---
 +category: minorAnalysis
 +---
 +* The `StdNamespace` class now also includes all inline namespaces that are children of `std` namespace.
Original file line number	Diff line number	Diff line change
`@@ -230,8 +230,12 @@ class GlobalNamespace extends Namespace {`
`230`	`230`	`}`
`231`	`231`
`232`	`232`	`/**`
`233`		- * The C++ `std::` namespace.
	`233`	+ * The C++ `std::` namespace and its inline namespaces.
`234`	`234`	`*/`
`235`	`235`	`class StdNamespace extends Namespace {`
`236`		`- StdNamespace() { this.hasName("std") and this.getParentNamespace() instanceof GlobalNamespace }`
	`236`	`+ StdNamespace() {`
	`237`	`+ this.hasName("std") and this.getParentNamespace() instanceof GlobalNamespace`
	`238`	`+ or`
	`239`	`+ this.isInline() and this.getParentNamespace() instanceof StdNamespace`
	`240`	`+ }`
`237`	`241`	`}`