C++: Fix queries I forgot after merging github/codeql#20485. #3260

Job	Run time
Prepare supported CodeQL environment matrix	4s
Run Guideline Recategorization tests	14s
Run release tests	14s
Run analysis report tests (2.20.7, codeql-cli/v2.20.7, codeql-bundle-v2.20.7)	5m 45s
	6m 17s

Provide feedback