or -> || (how did that compile on GCC anyway?)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64051 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Jaakko Salli 2010-04-19 14:33:02 +00:00
parent 4403de7616
commit 2dcd173e27

View File

@ -175,7 +175,7 @@ bool wxConvertAnyToVariant(const wxAny& any, wxVariant* variant)
// NB: Do not use LONG_MAX here. Explicitly using 32-bit // NB: Do not use LONG_MAX here. Explicitly using 32-bit
// integer constraint yields more consistent behavior across // integer constraint yields more consistent behavior across
// builds. // builds.
if ( ll > wxINT32_MAX or ll < wxINT32_MIN ) if ( ll > wxINT32_MAX || ll < wxINT32_MIN )
*variant = wxLongLong(ll); *variant = wxLongLong(ll);
else else
*variant = (long) wxLongLong(ll).GetLo(); *variant = (long) wxLongLong(ll).GetLo();