From: Jaakko Salli <jaakko.salli@dnainternet.net>
Date: Mon, 19 Apr 2010 14:33:02 +0000 (+0000)
Subject: or -> || (how did that compile on GCC anyway?)
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/2dcd173e27a0d90586d8ec6236047f1a9e830c6d

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 69bb19c143..56e315eb95 100644
--- 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.
-            if ( ll > wxINT32_MAX or ll < wxINT32_MIN )
+            if ( ll > wxINT32_MAX || ll < wxINT32_MIN )
                 *variant = wxLongLong(ll);
             else
                 *variant = (long) wxLongLong(ll).GetLo();