From 38e6f2d117e3a6d3b5d916ddb71670e1c3780cfa Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 11 Oct 2014 15:47:53 +0000 Subject: [PATCH] Compilation fix for Borland compiler bug with ternary operator. Don't use ?: operator with references, Borland wrongly deduces the common type as being an object in this case, so use pointers instead and dereference later. See #16592. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@77986 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/appbase.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/common/appbase.cpp b/src/common/appbase.cpp index 68113d9956..0f647519e4 100644 --- a/src/common/appbase.cpp +++ b/src/common/appbase.cpp @@ -315,9 +315,9 @@ wxAppTraits *wxAppConsoleBase::GetTraitsIfExists() wxAppTraits& wxAppConsoleBase::GetValidTraits() { static wxConsoleAppTraits s_traitsConsole; - wxAppTraits* const traits = wxTheApp ? wxTheApp->GetTraits() : NULL; + wxAppTraits* const traits = (wxTheApp ? wxTheApp->GetTraits() : NULL); - return traits ? *traits : s_traitsConsole; + return *(traits ? traits : &s_traitsConsole); } // ----------------------------------------------------------------------------