C++: Fix queries after #20126 #3737

Job	Run time
Prepare CodeQL unit test matrix	4s
Run unit tests (cpp, 2.19.4, codeql-cli/v2.19.4, codeql-bundle-v2.19.4, ubuntu-latest-xl, codeql-...	6m 56s
Run unit tests (c, 2.19.4, codeql-cli/v2.19.4, codeql-bundle-v2.19.4, ubuntu-latest-xl, codeql-cl...	13m 56s
Validate test results	2s
	20m 58s

Provide feedback