Thanks, I agree that this is an improvement! The original intention was presumably to silence compiler warnings about truncation when building the STL, but either this was for another compiler (our sources were originally derived from a codebase that targeted many compilers beyond what we currently support), or the compiler has gotten smarter about emitting warnings in this scenario. (The issue is that return condition ? 1 : 2; is returning an int that isn't exactly a constant expression, even though both sides are constants, so some compilers might warn about truncating int to short.)

As long as the STL builds warning-free, I believe this change is fine to make. We also already have return statements that don't cast:

I see a few more sites that can be changed, so I'll validate and push a commit.

I'm mirroring this to the MSVC-internal repo - please notify me if any further changes are pushed.

Thanks for this code cleanup! 😸 😸 😸 😸 😸 😸 😸 😸 😸