AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

compilation warning fix for Intel C++

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11637 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2001-09-18 18:22:44 +00:00
parent 55e80573e2
commit 1d8dd65e62
2 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/unix/mimetype.cpp
View File

@ -119,7 +119,6 @@ public:
wxString GetVerb (size_t i) wxString GetVerb (size_t i)
{ {
if (i < 0) return wxEmptyString;
if (i > GetCount() ) return wxEmptyString; if (i > GetCount() ) return wxEmptyString;
wxString sTmp = Item(i).BeforeFirst(wxT('=')); wxString sTmp = Item(i).BeforeFirst(wxT('='));
return sTmp; return sTmp;
@ -127,7 +126,6 @@ public:
wxString GetCmd (size_t i) wxString GetCmd (size_t i)
{ {
if (i < 0) return wxEmptyString;
if (i > GetCount() ) return wxEmptyString; if (i > GetCount() ) return wxEmptyString;
wxString sTmp = Item(i).AfterFirst(wxT('=')); wxString sTmp = Item(i).AfterFirst(wxT('='));
return sTmp; return sTmp;
@ -197,7 +195,6 @@ public:
wxString GetVerb (size_t i) wxString GetVerb (size_t i)
{ {
if (i < 0) return wxEmptyString;
if (i > GetLineCount() ) return wxEmptyString; if (i > GetLineCount() ) return wxEmptyString;
wxString sTmp = GetLine(i).BeforeFirst(wxT('=')); wxString sTmp = GetLine(i).BeforeFirst(wxT('='));
return sTmp; return sTmp;
@ -205,7 +202,6 @@ public:
wxString GetCmd (size_t i) wxString GetCmd (size_t i)
{ {
if (i < 0) return wxEmptyString;
if (i > GetLineCount() ) return wxEmptyString; if (i > GetLineCount() ) return wxEmptyString;
wxString sTmp = GetLine(i).AfterFirst(wxT('=')); wxString sTmp = GetLine(i).AfterFirst(wxT('='));
return sTmp; return sTmp;

14
src/unix/utilsunx.cpp
View File

@ -606,6 +606,13 @@ long wxExecute(wxChar **argv,
// there is no return after successful exec() // there is no return after successful exec()
_exit(-1); _exit(-1);
// some compilers complain about missing return - of course, they
// should know that exit() doesn't return but what else can we do if
// they don't?
#if defined(__VMS) || defined(__INTEL_COMPILER)
return 0;
#endif
} }
else // we're in parent else // we're in parent
{ {
@ -681,13 +688,6 @@ long wxExecute(wxChar **argv,
return exitcode; return exitcode;
#endif // wxUSE_GUI #endif // wxUSE_GUI
} }
#ifdef __VMS
// VMS does not recognise exit as a return and complains about
// a missing return
// I think VMS is wrong in this
// JJ
return 0;
#endif
} }
#undef ERROR_RETURN_CODE #undef ERROR_RETURN_CODE