C++: Fix more queries after shared guards (part 2) #3842

Job	Run time
Prepare CodeQL unit test matrix	4s
Run unit tests (cpp, 2.20.7, codeql-cli/v2.20.7, codeql-bundle-v2.20.7, ubuntu-latest-xl, codeql-...	4m 47s
Run unit tests (c, 2.20.7, codeql-cli/v2.20.7, codeql-bundle-v2.20.7, ubuntu-latest-xl, codeql-cl...	3m 42s
Validate test results	4s
	8m 37s

Provide feedback