From 0b44214c977aceae6fdcd68bfb3aa311aaf6a86f Mon Sep 17 00:00:00 2001
From: Julian Smart <julian@anthemion.co.uk>
Date: Tue, 13 Nov 2007 10:57:49 +0000
Subject: [PATCH] Resolve '&&' ambiguity

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49890 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 src/common/appbase.cpp  | 4 ----
 src/common/stdpbase.cpp | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/common/appbase.cpp b/src/common/appbase.cpp
index 738d2f311a..27fa04d6b3 100644
--- a/src/common/appbase.cpp
+++ b/src/common/appbase.cpp
@@ -177,11 +177,7 @@ bool wxAppConsoleBase::Initialize(int& argcOrig, wxChar **argvOrig)
 #endif
 
 #ifndef __WXPALMOS__
-#if wxUSE_UNICODE
     if ( m_appName.empty() && (bool) argv )
-#else
-    if ( m_appName.empty() && argv )
-#endif
     {
         // the application name is, by default, the name of its executable file
         wxFileName::SplitPath(argv[0], NULL, &m_appName, NULL);
diff --git a/src/common/stdpbase.cpp b/src/common/stdpbase.cpp
index 6d0609e118..198486075d 100644
--- a/src/common/stdpbase.cpp
+++ b/src/common/stdpbase.cpp
@@ -53,7 +53,7 @@ wxStandardPathsBase& wxStandardPathsBase::Get()
 
 wxString wxStandardPathsBase::GetExecutablePath() const
 {
-    if ( !wxTheApp || !wxTheApp->argv )
+    if ( !wxTheApp || ! (bool) wxTheApp->argv )
         return wxEmptyString;
 
     wxString argv0 = wxTheApp->argv[0];
-- 
2.45.2