From e11d2abe46cee46100ac19ff00f018b21ae861fa Mon Sep 17 00:00:00 2001 From: =?utf8?q?W=C5=82odzimierz=20Skiba?= Date: Thu, 22 Jul 2004 11:49:28 +0000 Subject: [PATCH] Alternate form of condition readable for Borland compiler. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28392 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/dynarray.cpp | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/common/dynarray.cpp b/src/common/dynarray.cpp index 676bd6ba25..f55c594a3b 100644 --- a/src/common/dynarray.cpp +++ b/src/common/dynarray.cpp @@ -493,8 +493,20 @@ int wxSortedArrayString::Index(const wxChar* sz, bool bCase, bool WXUNUSED(bFrom it = std::lower_bound(begin(), end(), sz, wxStringCompareLess(wxStricmpCppWrapper)); - if (it == end() || (bCase ? wxStrcmp : wxStricmp)(it->c_str(), sz) != 0) + if (it == end()) return wxNOT_FOUND; + + if (bCase) + { + if (wxStrcmp(it->c_str(), sz) != 0) + return wxNOT_FOUND; + } + else + { + if (wxStricmp(it->c_str(), sz) != 0) + return wxNOT_FOUND; + } + return it - begin(); } -- 2.50.0