diff options
author | bunnei <bunneidev@gmail.com> | 2015-03-07 18:33:00 -0500 |
---|---|---|
committer | bunnei <bunneidev@gmail.com> | 2015-03-07 18:33:00 -0500 |
commit | 89495fc888a6bba998311f5fef2d65320b49d4d8 (patch) | |
tree | 6d3451d26c6c307ba10c70ea86955acf72e2e640 /src | |
parent | 06bf4715810489548a9a3b5e9274dfc78bc3fc4d (diff) | |
parent | 25633b431d78bb031349f275f202e10207acd62b (diff) |
Merge pull request #638 from bunnei/osx-fix
Fixed EmuWindow typo (fixes OSX build)
Diffstat (limited to 'src')
-rw-r--r-- | src/common/emu_window.cpp | 2 | ||||
-rw-r--r-- | src/common/emu_window.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/common/emu_window.cpp b/src/common/emu_window.cpp index 1082ae26d..6459d2f32 100644 --- a/src/common/emu_window.cpp +++ b/src/common/emu_window.cpp @@ -17,7 +17,7 @@ void EmuWindow::KeyReleased(KeyMap::HostDeviceKey key) { Service::HID::PadButtonRelease(mapped_key); } -EmuWindow::FramebufferLayout EmuWindow::FramebufferLayout::DefaultScreenLayout(int width, int height) { +EmuWindow::FramebufferLayout EmuWindow::FramebufferLayout::DefaultScreenLayout(unsigned width, unsigned height) { ASSERT(width > 0); ASSERT(height > 0); diff --git a/src/common/emu_window.h b/src/common/emu_window.h index b6862030e..f6099fdb6 100644 --- a/src/common/emu_window.h +++ b/src/common/emu_window.h @@ -48,7 +48,7 @@ public: * @param height Window framebuffer height in pixels * @return Newly created FramebufferLayout object with default screen regions initialized */ - static FramebufferLayout DefaultScreenLayout(int width, int height); + static FramebufferLayout DefaultScreenLayout(unsigned width, unsigned height); unsigned width; unsigned height; |