bitwise vs. logical operator

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43858 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2006-12-07 16:29:58 +00:00
parent 61d8dec77f
commit 9e477492e2

View File

@@ -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