summaryrefslogtreecommitdiff
path: root/src/citra
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2014-10-27 21:23:16 -0400
committerbunnei <bunneidev@gmail.com>2014-10-27 21:23:16 -0400
commit19d91a45f50b95e53369444b4a34758e58e96739 (patch)
tree04a99b93c5ed56d4cb9a2579032f5903dba3806b /src/citra
parentae311eb3ef835307dbec4de4d3101bb23cf4c326 (diff)
parentd72708c1f58225f50c5ddecbd6f51580a2d9690b (diff)
Merge pull request #153 from yuriks/add-override
Add override keyword where appropriate
Diffstat (limited to 'src/citra')
-rw-r--r--src/citra/emu_window/emu_window_glfw.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/citra/emu_window/emu_window_glfw.h b/src/citra/emu_window/emu_window_glfw.h
index 638e026ef..7c3072145 100644
--- a/src/citra/emu_window/emu_window_glfw.h
+++ b/src/citra/emu_window/emu_window_glfw.h
@@ -14,16 +14,16 @@ public:
~EmuWindow_GLFW();
/// Swap buffers to display the next frame
- void SwapBuffers();
+ void SwapBuffers() override;
/// Polls window events
- void PollEvents();
+ void PollEvents() override;
/// Makes the graphics context current for the caller thread
- void MakeCurrent();
+ void MakeCurrent() override;
/// Releases (dunno if this is the "right" word) the GLFW context from the caller thread
- void DoneCurrent();
+ void DoneCurrent() override;
static void OnKeyEvent(GLFWwindow* win, int key, int scancode, int action, int mods);