Mercurial > ecos
changeset 3278:4b1912ce7f4f
* standalone/wxwin/appsettings.cpp,
standalone/wxwin/conflictsdlg.cpp,
standalonw/wxwin/docsystem.cpp,
standalone/wxwin/ecutils.cpp,
standalone/wxwin/packagesdlg.cpp: Silence miscellaneous compiler
warnings with recent GCC. [ Bugzilla 1001951 ]
author | jld |
---|---|
date | Fri, 28 Feb 2014 10:51:15 +0000 |
parents | 047bbfee43f6 |
children | 8cd345c99e6b |
files | host/tools/configtool/ChangeLog host/tools/configtool/standalone/wxwin/appsettings.cpp host/tools/configtool/standalone/wxwin/conflictsdlg.cpp host/tools/configtool/standalone/wxwin/docsystem.cpp host/tools/configtool/standalone/wxwin/ecutils.cpp host/tools/configtool/standalone/wxwin/packagesdlg.cpp |
diffstat | 6 files changed, 20 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/host/tools/configtool/ChangeLog +++ b/host/tools/configtool/ChangeLog @@ -10,6 +10,12 @@ 2014-02-28 Andy Jackson <andy@xylanta. * standalone/wxwin/appsettings.cpp, standalone/wxwin/conflictsdlg.cpp: Silence initialization order compiler warnings with recent GCC. [ Bugzilla 1001948 ] + * standalone/wxwin/appsettings.cpp, + standalone/wxwin/conflictsdlg.cpp, + standalonw/wxwin/docsystem.cpp, + standalone/wxwin/ecutils.cpp, + standalone/wxwin/packagesdlg.cpp: Silence miscellaneous compiler + warnings with recent GCC. [ Bugzilla 1001951 ] * standalone/wxwin/mainwin.cpp, standalone/wxwin/configtool.cpp: Update copyright strings.
--- a/host/tools/configtool/standalone/wxwin/appsettings.cpp +++ b/host/tools/configtool/standalone/wxwin/appsettings.cpp @@ -351,7 +351,7 @@ bool ecSettings::LoadConfig() #ifdef __WXMSW__ SYSTEM_INFO SystemInfo; GetSystemInfo(&SystemInfo); - m_strMakeOptions.Printf(_T("-j%d"),SystemInfo.dwNumberOfProcessors); + m_strMakeOptions.Printf(_T("-j%ld"),SystemInfo.dwNumberOfProcessors); #else long lProcessors; lProcessors = sysconf(_SC_NPROCESSORS_ONLN);
--- a/host/tools/configtool/standalone/wxwin/conflictsdlg.cpp +++ b/host/tools/configtool/standalone/wxwin/conflictsdlg.cpp @@ -312,6 +312,8 @@ void ecResolveConflictsDialog::OnContinu case CdlValueFlavor_Data : str.Printf(_("set %s to %s\n"), (const wxChar*) strName, (const wxChar*) strValue); valuable->set_value (m_Transaction, ecUtils::UnicodeToStdStr (strValue), CdlValueSource_User); + break; + default : break; } } @@ -454,6 +456,8 @@ void ecResolveConflictsDialog::AddConfli break; case CdlValueFlavor_Data : strValue = value.get_value().c_str(); + break; + default : break; }
--- a/host/tools/configtool/standalone/wxwin/docsystem.cpp +++ b/host/tools/configtool/standalone/wxwin/docsystem.cpp @@ -1,7 +1,7 @@ // ####ECOSHOSTGPLCOPYRIGHTBEGIN#### // ------------------------------------------- // This file is part of the eCos host tools. -// Copyright (C) 1998, 1999, 2000, 2003, 2008 Free Software Foundation, Inc. +// Copyright (C) 1998, 1999, 2000, 2003, 2008, 2014 Free Software Foundation, Inc. // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -493,10 +493,11 @@ mainwin=\"eCos Documentation\",\"eCos.hh index.html\n\ \n\ [INFOTYPES]\n" ; - + +/* // When we have the ability to generate a hhk, replace above line with: // mainwin=\"eCos Documentation\",\"eCos.hhc\",\"eCos.hhk\",,\"index.html\",\"http://sources.redhat.com/ecos/\",\"Net Release\",\"http://www.redhat.com/products/ecos/\",\"eCos Product\",0x40060420,,0xc287e,[0,0,762,400],,,,,,,0\n\ - +*/ return TRUE; }
--- a/host/tools/configtool/standalone/wxwin/ecutils.cpp +++ b/host/tools/configtool/standalone/wxwin/ecutils.cpp @@ -1,7 +1,7 @@ // ####ECOSHOSTGPLCOPYRIGHTBEGIN#### // ------------------------------------------- // This file is part of the eCos host tools. -// Copyright (C) 1998, 1999, 2000, 2003, 2008 Free Software Foundation, Inc. +// Copyright (C) 1998, 1999, 2000, 2003, 2008, 2014 Free Software Foundation, Inc. // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -202,7 +202,7 @@ bool ecUtils::StrToItemIntegerType(const const wxString ecUtils::IntToStr(long d,bool bHex) { wxString s; - s.Printf(bHex?wxT("0x%08x"):wxT("%d"),d); + s.Printf(bHex?wxT("0x%08lx"):wxT("%ld"),d); return s; }
--- a/host/tools/configtool/standalone/wxwin/packagesdlg.cpp +++ b/host/tools/configtool/standalone/wxwin/packagesdlg.cpp @@ -789,7 +789,8 @@ bool ecPackagesDialog::IsAdded(const wxS // return (((wxListBox*) FindWindow( ecID_PACKAGES_DIALOG_USE_LIST ))->FindString(str) > -1) ; } - + +#if 0 static int ecPositionInStringList(const wxStringList& list, const wxString& item) { int i; @@ -800,6 +801,7 @@ static int ecPositionInStringList(const i ++; return -1; } +#endif void ecPackagesDialog::DisplayDescription(const wxString& item) {