# HG changeset patch
# User jld
# Date 1393581846 0
# Node ID 047bbfee43f6fde99748d70120c5dfb191146715
# Parent  53088a1817a74e8337e7d24c61d32a5a804cc44b
* standalone/wxwin/appsettings.cpp,
  standalone/wxwin/conflictsdlg.cpp: Silence initialization order
  compiler warnings with recent GCC. [ Bugzilla 1001948 ]

diff --git a/host/tools/configtool/ChangeLog b/host/tools/configtool/ChangeLog
--- a/host/tools/configtool/ChangeLog
+++ b/host/tools/configtool/ChangeLog
@@ -7,6 +7,9 @@ 2014-02-28  Andy Jackson  <andy@xylanta.
 	  standalone/wxwin/settingsdlg.cpp,
 	  standalone/wxwin/templatesdlg.cpp: Eliminate deprecated wxWidgets
 	calls. [ Bugzilla 1001947 ]
+	* standalone/wxwin/appsettings.cpp,
+	  standalone/wxwin/conflictsdlg.cpp: Silence initialization order
+	compiler warnings with recent GCC. [ Bugzilla 1001948 ]
 	* standalone/wxwin/mainwin.cpp, standalone/wxwin/configtool.cpp:
 	Update copyright strings.
 
diff --git a/host/tools/configtool/standalone/wxwin/appsettings.cpp b/host/tools/configtool/standalone/wxwin/appsettings.cpp
--- a/host/tools/configtool/standalone/wxwin/appsettings.cpp
+++ b/host/tools/configtool/standalone/wxwin/appsettings.cpp
@@ -1,7 +1,7 @@
 // ####ECOSHOSTGPLCOPYRIGHTBEGIN####                                        
 // -------------------------------------------                              
 // This file is part of the eCos host tools.                                
-// Copyright (C) 1998, 1999, 2000, 2003, 2005, 2006, 2008 Free Software Foundation, Inc.
+// Copyright (C) 1998, 1999, 2000, 2003, 2005, 2006, 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     
@@ -909,13 +909,13 @@ ecRunTestsSettings::ecRunTestsSettings()
     m_nDownloadTimeoutType(TIMEOUT_SPECIFIED),
     m_bRemote(FALSE),
     m_bSerial(TRUE),
-    m_strPort(wxT("/dev/ttyS0")),
     m_nBaud(38400),
     m_nLocalTCPIPPort(9000),
     m_nReset(RESET_MANUAL),
     m_nResourcePort(1),
     m_nRemotePort(1),
-    m_bFarmed(TRUE),
+    m_bFarmed(TRUE),
+    m_strPort(wxT("/dev/ttyS0")),
     m_strRemoteHost(wxT("")),
     m_strResourceHost(wxT("")),
     m_strLocalTCPIPHost(wxT("")),
diff --git a/host/tools/configtool/standalone/wxwin/conflictsdlg.cpp b/host/tools/configtool/standalone/wxwin/conflictsdlg.cpp
--- a/host/tools/configtool/standalone/wxwin/conflictsdlg.cpp
+++ b/host/tools/configtool/standalone/wxwin/conflictsdlg.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     
@@ -85,11 +85,10 @@ END_EVENT_TABLE()
 
 // Frame constructor
 ecResolveConflictsDialog::ecResolveConflictsDialog(wxWindow* parent, std::list<CdlConflict> conflicts, CdlTransaction transaction, wxList *parConflictsOfInterest):
+    m_Map(wxKEY_INTEGER),
     m_conflicts(conflicts),
     m_Transaction(transaction),
-    m_parConflictsOfInterest(parConflictsOfInterest),
-    m_Map(wxKEY_INTEGER)
-
+    m_parConflictsOfInterest(parConflictsOfInterest)
 {
     // Stop values from being changed by other mechanisms during the
     // duration of this dialog.