From 58411136ee3eb954dbdf2656f7977c05e806fba8 Mon Sep 17 00:00:00 2001 From: The Dax Date: Sun, 1 Jun 2014 18:32:14 -0400 Subject: [PATCH] Remove the const int, and fix another warning. --- Windows/DinputDevice.cpp | 2 -- Windows/WindowsHost.cpp | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/Windows/DinputDevice.cpp b/Windows/DinputDevice.cpp index 518106258b..7ed812392a 100644 --- a/Windows/DinputDevice.cpp +++ b/Windows/DinputDevice.cpp @@ -143,8 +143,6 @@ DinputDevice::DinputDevice(int devnum) { return; } - const int MAX_NUM_PADS = 4; - if (devnum >= MAX_NUM_PADS) { return; diff --git a/Windows/WindowsHost.cpp b/Windows/WindowsHost.cpp index 3a3b751e9a..62a661cdb0 100644 --- a/Windows/WindowsHost.cpp +++ b/Windows/WindowsHost.cpp @@ -87,7 +87,7 @@ WindowsHost::WindowsHost(HWND mainWindow) { //add first XInput device to respond input.push_back(std::shared_ptr(new XinputDevice())); //find all connected DInput devices of class GamePad - int numDInputDevs = DinputDevice::getNumPads(); + size_t numDInputDevs = DinputDevice::getNumPads(); for (int i = 0; i < numDInputDevs; i++) { input.push_back(std::shared_ptr(new DinputDevice(i)));