From 9e477492e29e03c02827b1e42a16cb09a13f5149 Mon Sep 17 00:00:00 2001 From: Paul Cornett Date: Thu, 7 Dec 2006 16:29:58 +0000 Subject: [PATCH] bitwise vs. logical operator git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43858 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/datetime.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common/datetime.cpp b/src/common/datetime.cpp index 43b767754e..315a4e1dc5 100644 --- a/src/common/datetime.cpp +++ b/src/common/datetime.cpp @@ -2472,7 +2472,7 @@ wxString wxDateTime::Format(const wxChar *format, const TimeZone& tz) const // replace all occurrences of year with it bool wasReplaced = fmt2.Replace(strYear, replacement) > 0; // evaluation order ensures we always attempt the replacement. - wasReplaced = (fmt2.Replace(strYear2, replacement2) > 0) | wasReplaced ; + wasReplaced = (fmt2.Replace(strYear2, replacement2) > 0) || wasReplaced; // use strftime() to format the same date but in supported // year -- 2.45.2