[CP] Fix SAL annotation placement on function templates (#5895)#5897
Merged
guhetier merged 2 commits intorelease/2.5from Mar 30, 2026
Merged
[CP] Fix SAL annotation placement on function templates (#5895)#5897guhetier merged 2 commits intorelease/2.5from
guhetier merged 2 commits intorelease/2.5from
Conversation
## Description SAL annotations (`_Success_`, `_Function_class_`) placed before the `template` keyword cause MSVC compilation errors (C2059) when TVS / static analysis is enabled. The `template` head must always come first; annotations go between it and the return type. Fixed 5 occurrences: - `src/perf/lib/SecNetPerfMain.cpp`: 4 instances of `_Success_` before `template` - `src/test/lib/ApiTest.cpp`: 1 instance of `_Function_class_` before `template` ## Testing Existing tests cover this change. No new tests needed — this is a compilation fix only (no behavioral change). ## Documentation No documentation impact.
Contributor
|
Should the perl action/CP be a separate chore? |
mtfriesen
approved these changes
Mar 27, 2026
Collaborator
Author
It can if you feel strongly, I wanted to check fast it was enough to solve the failure. |
Contributor
I think ideally they're separate, but I don't feel strongly at all. |
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## release/2.5 #5897 +/- ##
===============================================
- Coverage 87.18% 86.02% -1.16%
===============================================
Files 59 59
Lines 18209 18209
===============================================
- Hits 15875 15665 -210
- Misses 2334 2544 +210 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Cherry-pick of #5895
Description
SAL annotations (
_Success_,_Function_class_) placed before thetemplatekeyword cause MSVC compilation errors (C2059) when TVS / static analysis is enabled. Thetemplatehead must always come first; annotations go between it and the return type.Fixed 5 occurrences:
src/perf/lib/SecNetPerfMain.cpp: 4 instances of_Success_beforetemplatesrc/test/lib/ApiTest.cpp: 1 instance of_Function_class_beforetemplateTesting
Existing tests cover this change. No new tests needed — this is a compilation fix only (no behavioral change).
Documentation
No documentation impact.