Fix logical or
/and
usage for MSVC compilation.
#3984
Merged
Loading
or
/and
usage for MSVC compilation.
#3984