]> git.saurik.com Git - wxWidgets.git/commitdiff
fix Sun CC warning about name clash between the method parameters and member variable...
authorVadim Zeitlin <vadim@wxwidgets.org>
Fri, 22 Jun 2007 14:52:37 +0000 (14:52 +0000)
committerVadim Zeitlin <vadim@wxwidgets.org>
Fri, 22 Jun 2007 14:52:37 +0000 (14:52 +0000)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46633 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

src/unix/appunix.cpp

index db90d98ffe103b83e36b585f4c1af304793488ab..691a8a544e04daab546d926dea45781f3c69228d 100644 (file)
 #include <signal.h>
 #include <unistd.h>
 
-bool wxAppConsole::Initialize(int& argc, wxChar** argv)
+// use unusual names for arg[cv] to avoid clashes with wxApp members with the
+// same names
+bool wxAppConsole::Initialize(int& argc_, wxChar** argv_)
 {
-    if ( !wxAppConsoleBase::Initialize(argc,argv) )
+    if ( !wxAppConsoleBase::Initialize(argc_, argv_) )
         return false;
 
     sigemptyset(&m_signalsCaught);