summaryrefslogtreecommitdiff
path: root/src/citra/emu_window/emu_window_sdl2.h
diff options
context:
space:
mode:
authorYuri Kunde Schlesner <yuriks@yuriks.net>2016-09-21 11:29:48 -0700
committerGitHub <noreply@github.com>2016-09-21 11:29:48 -0700
commitd5d2ca8058a0f1c00ab7ca9fe2c058ba47546c0a (patch)
tree8a22ca73ff838f3f0090b29a548ae81087fc90ed /src/citra/emu_window/emu_window_sdl2.h
parent2a910a6d883f2227edc74aacf5b93a58a3dea07c (diff)
parent0e3f0120a8ec2996e73bb6b7b6c9d7531f7a7eb1 (diff)
Merge pull request #2086 from linkmauve/clang-format
Add clang-format as part of our {commit,travis}-time checks
Diffstat (limited to 'src/citra/emu_window/emu_window_sdl2.h')
-rw-r--r--src/citra/emu_window/emu_window_sdl2.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/citra/emu_window/emu_window_sdl2.h b/src/citra/emu_window/emu_window_sdl2.h
index 77279f022..e4d14ef12 100644
--- a/src/citra/emu_window/emu_window_sdl2.h
+++ b/src/citra/emu_window/emu_window_sdl2.h
@@ -5,7 +5,6 @@
#pragma once
#include <utility>
-
#include "common/emu_window.h"
struct SDL_Window;
@@ -47,7 +46,8 @@ private:
void OnResize();
/// Called when a configuration change affects the minimal size of the window
- void OnMinimalClientAreaChangeRequest(const std::pair<unsigned, unsigned>& minimal_size) override;
+ void OnMinimalClientAreaChangeRequest(
+ const std::pair<unsigned, unsigned>& minimal_size) override;
/// Is the window still open?
bool is_open = true;
@@ -55,7 +55,7 @@ private:
/// Internal SDL2 render window
SDL_Window* render_window;
- using SDL_GLContext = void *;
+ using SDL_GLContext = void*;
/// The OpenGL context associated with the window
SDL_GLContext gl_context;