piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-21 05:09:34 -06:00
Code Issues Packages Projects Releases Wiki Activity

Windows/Linux/whatever build fix.

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5762 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
XTra.KrazzY
2010-06-21 18:25:49 +00:00
parent d0f00cedff
commit 1b5b57bff3
3 changed files with 57 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Source/Core/InputCommon/Src/ControllerInterface/ControllerInterface.h
View File

@ -42,6 +42,9 @@ class ControllerInterface
{
public:
// Forward declarations
class DeviceQualifier;
//
// Device
//
@ -61,6 +64,7 @@ public:
public:
virtual std::string GetName() const = 0;
virtual ~Control() {}
virtual bool operator==(const std::string& name) const;
};
//
@ -100,6 +104,8 @@ public:
virtual void ClearInputState();
virtual bool operator==(const DeviceQualifier& devq) const;
const std::vector<Input*>& Inputs() const { return m_inputs; }
const std::vector<Output*>& Outputs() const { return m_outputs; }
@ -213,7 +219,7 @@ public:
bool UpdateInput();
bool UpdateOutput();
const std::vector<Device*>& Devices() const { return m_devices; }
const std::vector<Device*>& Devices() const { return m_devices; }
private:
bool m_is_init;
@ -221,8 +227,7 @@ private:
void* m_hwnd;
};
// used for std::find n stuff
bool operator==(const ControllerInterface::Device* const dev, const ControllerInterface::DeviceQualifier& devq);
bool operator==(const ControllerInterface::Device::Control* const c, const std::string& name);
std::vector<ControllerInterface::Device*>::const_iterator FindDevice(
const std::vector<ControllerInterface::Device*>& devices, const ControllerInterface::DeviceQualifier& devq);
#endif