summaryrefslogtreecommitdiff
path: root/Source/Core
diff options
context:
space:
mode:
authorMaarten ter Huurne <maarten@treewalker.org>2008-08-27 12:33:49 +0000
committerMaarten ter Huurne <maarten@treewalker.org>2008-08-27 12:33:49 +0000
commit105e1c325fd3d58ff2da1a2c50b89ccfe09d139d (patch)
treecf98cbb2f0f0f32dafa0b2a38a535abf8263b06b /Source/Core
parentae7d236fdfc039cc8e8c615fc1f92801b681969b (diff)
Fixed warnings about field initialisation order.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@359 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core')
-rw-r--r--Source/Core/Common/Src/IniFile.cpp4
-rw-r--r--Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp3
-rw-r--r--Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp2
-rw-r--r--Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_WiiMote.cpp6
4 files changed, 7 insertions, 8 deletions
diff --git a/Source/Core/Common/Src/IniFile.cpp b/Source/Core/Common/Src/IniFile.cpp
index fe32a86c7f..e10b65bc20 100644
--- a/Source/Core/Common/Src/IniFile.cpp
+++ b/Source/Core/Common/Src/IniFile.cpp
@@ -37,11 +37,11 @@ IniFile::~IniFile()
Section::Section()
- : name(""), comment(""), lines() {}
+ : lines(), name(""), comment("") {}
Section::Section(const std::string& _name)
- : name(_name), comment(""), lines() {}
+ : lines(), name(_name), comment("") {}
Section::Section(const Section& other)
diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp
index b4c7a83d69..f57108ea95 100644
--- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp
+++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp
@@ -27,10 +27,9 @@
CWII_IPC_HLE_Device_FileIO::CWII_IPC_HLE_Device_FileIO(u32 _DeviceID, const std::string& _rDeviceName )
: IWII_IPC_HLE_Device(_DeviceID, _rDeviceName)
, m_pFileHandle(NULL)
- , m_Seek(0)
, m_FileLength(0)
+ , m_Seek(0)
{
- m_FileLength = 0;
}
// __________________________________________________________________________________________________
diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp
index 188e9880af..7e5187dbcc 100644
--- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp
+++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp
@@ -26,8 +26,8 @@ CWII_IPC_HLE_Device_usb_oh1_57e_305::CWII_IPC_HLE_Device_usb_oh1_57e_305(u32 _De
, m_ACLAnswer(false)
, m_pACLBuffer(NULL)
, m_pHCIBuffer(NULL)
- , scan_enable(0)
, m_State(STATE_NONE)
+ , scan_enable(0)
{
m_WiiMotes.push_back(CWII_IPC_HLE_WiiMote(this, 0));
diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_WiiMote.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_WiiMote.cpp
index 1bbdb30d90..0aeb9b476e 100644
--- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_WiiMote.cpp
+++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_WiiMote.cpp
@@ -117,8 +117,8 @@ struct SL2CAP_CommandConfigurationResponse // 0x05
#define USB_HLE_LOG DSPHLE
CWII_IPC_HLE_WiiMote::CWII_IPC_HLE_WiiMote(CWII_IPC_HLE_Device_usb_oh1_57e_305* _pHost, int _Number)
- : m_pHost(_pHost)
- , m_Name("Nintendo RVL-CNT-01")
+ : m_Name("Nintendo RVL-CNT-01")
+ , m_pHost(_pHost)
{
m_BD.b[0] = 0x11;
m_BD.b[1] = 0x02;
@@ -331,4 +331,4 @@ void CWII_IPC_HLE_WiiMote::CommandCofigurationReq(u8 _Ident, u8* _pData, u32 _Si
SendCommandToACL(_Ident, L2CAP_CONF_RSP, RespLen, TempBuffer);
-}
+}