From 9ecfb5e75d5f636a1c29c38bf67700dba6090d53 Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Thu, 7 Feb 2013 14:42:50 -0600 Subject: [PATCH] Buildfix for real! --- Source/Core/Core/Src/HW/WiimoteReal/IODummy.cpp | 13 ++++++++----- Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp | 4 ++-- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/Source/Core/Core/Src/HW/WiimoteReal/IODummy.cpp b/Source/Core/Core/Src/HW/WiimoteReal/IODummy.cpp index b22f1c7795..114feebeb7 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/IODummy.cpp +++ b/Source/Core/Core/Src/HW/WiimoteReal/IODummy.cpp @@ -26,9 +26,12 @@ WiimoteScanner::WiimoteScanner() return; } +WiimoteScanner::~WiimoteScanner() +{} + std::vector WiimoteScanner::FindWiimotes(size_t max_wiimotes) { - return std::vector() + return std::vector(); } bool WiimoteScanner::IsReady() const @@ -46,17 +49,17 @@ void Wiimote::Disconnect() return; } -bool Wiimote::IsOpen() const +bool Wiimote::IsConnected() const { - return IsConnected(); + return false; } -int Wiimote::IORead(unsigned char* buf) +int Wiimote::Read(const u8* buf) { return 0; } -int Wiimote::IOWrite(unsigned char* buf, int len) +int Wiimote::Write(const u8* buf, int len) { return 0; } diff --git a/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp b/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp index 1d82a19e1a..407e3b6f4f 100644 --- a/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp +++ b/Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp @@ -73,8 +73,6 @@ HINSTANCE bthprops_lib = NULL; static int initialized = 0; -int PairUp(bool unpair = false); - inline void init_lib() { if (!initialized) @@ -129,6 +127,8 @@ inline void init_lib() namespace WiimoteReal { +int PairUp(bool unpair = false); + WiimoteScanner::WiimoteScanner() { init_lib();