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

diff --git a/src/common/any.cpp b/src/common/any.cpp
index 69bb19c14361c8f100c7e801effbd1ecdf0d2ad8..56e315eb954d7de4874656ce59ba871e358caada 100644 (file)
--- a/src/common/any.cpp
+++ b/src/common/any.cpp
@@ -175,7 +175,7 @@ bool wxConvertAnyToVariant(const wxAny& any, wxVariant* variant)
             // NB: Do not use LONG_MAX here. Explicitly using 32-bit
             //     integer constraint yields more consistent behavior across
             //     builds.
             // NB: Do not use LONG_MAX here. Explicitly using 32-bit
             //     integer constraint yields more consistent behavior across
             //     builds.

-            if ( ll > wxINT32_MAX or ll < wxINT32_MIN )
+            if ( ll > wxINT32_MAX || ll < wxINT32_MIN )

                 *variant = wxLongLong(ll);
             else
                 *variant = (long) wxLongLong(ll).GetLo();
                 *variant = wxLongLong(ll);
             else
                 *variant = (long) wxLongLong(ll).GetLo();