changeset 3282:b340d0ab5dd3

* configtool/standalone/wxwin/configtool.cpp, configtool/standalone/wxwin/configtooldoc.cpp, configtool/standalone/wxwin/configtree.cpp, configtool/standalone/wxwin/configtree.h, configtool/standalone/wxwin/filename.cpp, configtool/standalone/wxwin/packagesdlg.cpp, configtool/standalone/wxwin/propertywin.cpp, configtool/standalone/wxwin/runtestsdlg.cpp, configtool/standalone/wxwin/templatesdlg.cpp, ecostest/common/eCosTest.cpp: Silence unused variable warnings with recent GCC. [ Bugzilla 1001950 ]
author jld
date Thu, 13 Mar 2014 15:22:25 +0000
parents f9b94a5b13ac
children 355bcd2cec54
files host/tools/configtool/ChangeLog host/tools/configtool/standalone/wxwin/configtool.cpp host/tools/configtool/standalone/wxwin/configtooldoc.cpp host/tools/configtool/standalone/wxwin/configtree.cpp host/tools/configtool/standalone/wxwin/configtree.h host/tools/configtool/standalone/wxwin/filename.cpp host/tools/configtool/standalone/wxwin/packagesdlg.cpp host/tools/configtool/standalone/wxwin/propertywin.cpp host/tools/configtool/standalone/wxwin/runtestsdlg.cpp host/tools/configtool/standalone/wxwin/templatesdlg.cpp host/tools/ecostest/ChangeLog host/tools/ecostest/common/eCosTest.cpp
diffstat 12 files changed, 44 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/host/tools/configtool/ChangeLog
+++ b/host/tools/configtool/ChangeLog
@@ -5,6 +5,16 @@ 2014-03-13  Andy Jackson  <andy@xylanta.
 	  standalone/wxwin/configtree.cpp: Silence "set but unused" variable
 	warnings with recent GCC. [ Bugzilla 1001949 ]
 	* standalone/common/ecosconfig.cxx: Update copyright string.
+	* standalone/wxwin/configtool.cpp,
+	  standalone/wxwin/configtooldoc.cpp,
+	  standalone/wxwin/configtree.cpp,
+	  standalone/wxwin/configtree.h,
+	  standalone/wxwin/filename.cpp,
+	  standalone/wxwin/packagesdlg.cpp,
+	  standalone/wxwin/propertywin.cpp,
+	  standalone/wxwin/runtestsdlg.cpp,
+	  standalone/wxwin/templatesdlg.cpp: Silence unused variable warnings
+	with recent GCC. [ Bugzilla 1001950 ]
 
 2014-02-28  Andy Jackson  <andy@xylanta.com>
 
--- a/host/tools/configtool/standalone/wxwin/configtool.cpp
+++ b/host/tools/configtool/standalone/wxwin/configtool.cpp
@@ -781,6 +781,8 @@ bool ecApp::InitializeHelpController()
 
             wxGetApp().GetHelpController().SetBookBasePath(htmlDir);
         }
+#else
+        CYG_UNUSED_PARAM(ecConfigToolDoc *, doc);
 #endif
         return TRUE;
     }
--- a/host/tools/configtool/standalone/wxwin/configtooldoc.cpp
+++ b/host/tools/configtool/standalone/wxwin/configtooldoc.cpp
@@ -355,6 +355,7 @@ bool ecConfigToolDoc::CanGenerateBuildTr
     }
     else
         return FALSE;
+    CYG_UNUSED_PARAM(int, nCount);
 
     return TRUE;
 }
@@ -1308,6 +1309,7 @@ CdlInferenceCallbackResult ecConfigToolD
         wxGetApp().UnlockValues();
 
     }
+    CYG_UNUSED_PARAM(ecConfigToolDoc *, pDoc);
     return rc;
 }
 
@@ -1361,6 +1363,7 @@ void ecConfigToolDoc::CdlTransactionHand
         (CdlValueSource_Inferred == source) ? "inferred" :
         (CdlValueSource_Wizard   == source) ? "wizard"   : "user"));
 */
+        CYG_UNUSED_PARAM(CdlValueSource, source);
         pControlView->Refresh (strName);
     }
 
@@ -2247,6 +2250,7 @@ bool ecConfigToolDoc::SwitchMemoryLayout
         // copy default MLT save files for the selected target/platform from the repository to the build tree if they do not already exist
         CopyMLTFiles();
     }
+    CYG_UNUSED_PARAM(bool, rc);
 
     if (m_strBuildTree.IsEmpty ()) // load the memory layout from the repository
     {
--- a/host/tools/configtool/standalone/wxwin/configtree.cpp
+++ b/host/tools/configtool/standalone/wxwin/configtree.cpp
@@ -408,6 +408,7 @@ void ecValueWindow::OnMouseEvent(wxMouse
             m_treeCtrl->SelectItem(item);
             ((ecConfigTreeCtrl*) m_treeCtrl)->GetPropertiesMenu()->SetClientData((void*) TRUE);
             PopupMenu(((ecConfigTreeCtrl*) m_treeCtrl)->GetPropertiesMenu(), event.GetX(), event.GetY());
+            CYG_UNUSED_PARAM(ecConfigItem *, configItem);
         }
         else
         {
@@ -904,6 +905,7 @@ void ecSplitterScrolledWindow::OnUpdateR
         ecConfigItem* item = ((ecTreeItemData*) treeCtrl->GetItemData(id))->GetConfigItem();
         
         event.Enable( IsChanged(id, TRUE ) );
+        CYG_UNUSED_PARAM(ecConfigItem *, item);
     }
 }
 
--- a/host/tools/configtool/standalone/wxwin/configtree.h
+++ b/host/tools/configtool/standalone/wxwin/configtree.h
@@ -1,7 +1,7 @@
 // ####ECOSHOSTGPLCOPYRIGHTBEGIN####                                        
 // -------------------------------------------                              
 // This file is part of the eCos host tools.                                
-// Copyright (C) 1998, 1999, 2000, 2008 Free Software Foundation, Inc.      
+// Copyright (C) 1998, 1999, 2000, 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     
@@ -105,7 +105,7 @@ public:
     // enabled/disabled
     int GetStateCount() const { return m_maxStates; };
 
-    void SetStateCount(int count) { m_maxStates; }
+    void SetStateCount(int count) { /* m_maxStates; */ }
     int GetIconId(int state, bool enabled = TRUE) const;
     void SetIconId(int state, bool enabled, int iconId);
 
--- a/host/tools/configtool/standalone/wxwin/filename.cpp
+++ b/host/tools/configtool/standalone/wxwin/filename.cpp
@@ -1,7 +1,7 @@
 // ####ECOSHOSTGPLCOPYRIGHTBEGIN####                                        
 // -------------------------------------------                              
 // This file is part of the eCos host tools.                                
-// Copyright (C) 1998, 1999, 2000, 2003, 2005, 2009 Free Software Foundation, Inc.
+// Copyright (C) 1998, 1999, 2000, 2003, 2005, 2009, 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     
@@ -220,6 +220,7 @@ void ecFileName::ConcatCopy(const wxStri
             return;
         }
     }
+    CYG_UNUSED_PARAM(int, nNewLen);
 }
 
 void ecFileName::Normalize()
--- a/host/tools/configtool/standalone/wxwin/packagesdlg.cpp
+++ b/host/tools/configtool/standalone/wxwin/packagesdlg.cpp
@@ -625,6 +625,8 @@ void ecPackagesDialog::OnClickListBox1(w
         // TODO: check that this works for multiple-selection listboxes
         DisplayDescription(availableList->GetString(sel));
     }
+#else
+    CYG_UNUSED_PARAM(wxListBox *, availableList);
 #endif
     
     ClearSelections(*useList);
@@ -646,6 +648,8 @@ void ecPackagesDialog::OnClickListBox2(w
         // TODO: check that this works for multiple-selection listboxes
         DisplayDescription(useList->GetString(sel));
     }
+#else
+    CYG_UNUSED_PARAM(wxListBox *, useList);
 #endif
     
     ClearSelections(*availableList);
@@ -781,6 +785,8 @@ void ecPackagesDialog::Insert(const wxSt
         m_added.Add(str);
     
     //(added ? useList : availableList) -> Append(str);
+    CYG_UNUSED_PARAM(wxListBox *, availableList);
+    CYG_UNUSED_PARAM(wxListBox *, useList);
 }
 
 bool ecPackagesDialog::IsAdded(const wxString& str)
@@ -967,6 +973,7 @@ void ecPackagesDialog::UpdatePackageDesc
         m_packageDescription = wxEmptyString;
     }
     TransferDataToWindow ();
+    CYG_UNUSED_PARAM(ecConfigToolDoc *, pDoc);
 }
 
 void ecPackagesDialog::UpdateVersionList ()
--- a/host/tools/configtool/standalone/wxwin/propertywin.cpp
+++ b/host/tools/configtool/standalone/wxwin/propertywin.cpp
@@ -1,7 +1,7 @@
 // ####ECOSHOSTGPLCOPYRIGHTBEGIN####                                        
 // -------------------------------------------                              
 // This file is part of the eCos host tools.                                
-// Copyright (C) 1998, 1999, 2000, 2008, 2009 Free Software Foundation, Inc.      
+// Copyright (C) 1998, 1999, 2000, 2008, 2009, 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     
@@ -296,6 +296,7 @@ void ecPropertyListCtrl::Fill(ecConfigIt
 
                     // TODO: set the image for a conflict item
                     // CListCtrl::SetItem (nIndex, 0, LVIF_IMAGE, NULL, bConflictItem ? 1 : 0, 0, 0, 0 );
+                    CYG_UNUSED_PARAM(bool, bConflictItem);
                 }
             }
         }
@@ -360,6 +361,7 @@ void ecPropertyListCtrl::RefreshValue()
         
         // TODO
         // CListCtrl::SetItem (nItem, 0, LVIF_IMAGE, NULL, bConflictItem ? 1 : 0, 0, 0, 0 );
+        CYG_UNUSED_PARAM(bool, bConflictItem);
     }
     
 }
--- a/host/tools/configtool/standalone/wxwin/runtestsdlg.cpp
+++ b/host/tools/configtool/standalone/wxwin/runtestsdlg.cpp
@@ -1,7 +1,7 @@
 // ####ECOSHOSTGPLCOPYRIGHTBEGIN####                                        
 // -------------------------------------------                              
 // This file is part of the eCos host tools.                                
-// Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.            
+// Copyright (C) 1998, 1999, 2000, 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     
@@ -383,7 +383,7 @@ wxString ecRunTestsDialog::TranslatePort
 
 void ecRunTestsDialog::SubmitTests()
 {
-    int iTest;
+//    int iTest;
     int nResources=wxGetApp().GetSettings().GetRunTestsSettings().m_bRemote ? wxMax(1,CTestResource::GetMatchCount (m_ep)):1;
     if(nResources>CeCosTest::InstanceCount){
         if (m_nNextToSubmit >= m_executables->SelectedTestCount()){
@@ -725,6 +725,7 @@ void ecRunTestsExecutablesDialog::Create
 
     parent->SetAutoLayout( TRUE );
     parent->SetSizer( item0 );
+    CYG_UNUSED_PARAM(wxCheckListBox *, listBox);
 }
 
 void ecRunTestsExecutablesDialog::OnCheckAll(wxCommandEvent& event)
@@ -1129,6 +1130,8 @@ void ecRunTestsSummaryDialog::AddResult 
         m_List.SetItemText(nItem,1+i,arstr[i]);
         arstr[i].ReleaseBuffer();
     }
+#else
+    CYG_UNUSED_PARAM(int, nLength);
 #endif
 }
 
--- a/host/tools/configtool/standalone/wxwin/templatesdlg.cpp
+++ b/host/tools/configtool/standalone/wxwin/templatesdlg.cpp
@@ -385,6 +385,7 @@ void ecTemplatesDialog::OnSelHardwareTem
     UpdateDetails (); // display new hardware packages in details box
 
     TransferDataToWindow (); // display new target description
+    CYG_UNUSED_PARAM(wxChoice *, cdlPackageCtrl);
 }
 
 void ecTemplatesDialog::OnSelPackageTemplates(wxCommandEvent& event)
@@ -400,6 +401,7 @@ void ecTemplatesDialog::OnSelPackageTemp
 	m_template = template_i->c_str();
 	
 	UpdateVersionList (wxT("")); // repopulate template versions combo box and select most recent version
+    CYG_UNUSED_PARAM(wxComboBox *, cdlHardwareCtrl);
 }
 
 void ecTemplatesDialog::OnSelPackageVersion(wxCommandEvent& event)
@@ -452,6 +454,8 @@ void ecTemplatesDialog::UpdateVersionLis
 	
 	// enable the version combo box only if there are multiple versions
 	cdlVersionCtrl->Enable (versions.size () > 1);
+    CYG_UNUSED_PARAM(wxComboBox *, cdlHardwareCtrl);
+    CYG_UNUSED_PARAM(wxChoice *, cdlPackageCtrl);
 }
 
 void ecTemplatesDialog::UpdateDetails()
--- a/host/tools/ecostest/ChangeLog
+++ b/host/tools/ecostest/ChangeLog
@@ -2,6 +2,8 @@ 2014-03-13  Andy Jackson  <andy@xylanta.
 
 	* common/eCosTest.cpp: Silence "set but unused" variable warnings
 	with recent GCC. [ Bugzilla 1001949 ]
+	* common/eCosTest.cpp: Silence unused variable warnings	with recent
+	GCC. [ Bugzilla 1001950 ]
 
 2012-04-23  John Dallaway  <john@dallaway.org.uk>
 
--- a/host/tools/ecostest/common/eCosTest.cpp
+++ b/host/tools/ecostest/common/eCosTest.cpp
@@ -1250,7 +1250,7 @@ BOOL WINAPI HandlerRoutine(
                            DWORD dwCtrlType   //  control signal type
                            )
 {
-  dwCtrlType; // eliminate compiler warning
+  CYG_UNUSED_PARAM(DWORD, dwCtrlType);
   return TRUE;
 }
 #endif