diff options
| author |  Rohit Nirmal | 2014-12-03 12:57:57 -0600 |
|---|---|---|
| committer | Rohit Nirmal | 2014-12-03 12:57:57 -0600 |
| commit | 8a624239703c046d89ebeaf3ea13c87af75b550f (patch) | |
| tree | 19546d2b06c71add6140f322a8aab0c918bbd9ca /src/citra | |
| parent | Merge pull request #236 from rohit-n/sign-compare (diff) | |
| download | yuzu-8a624239703c046d89ebeaf3ea13c87af75b550f.tar.gz yuzu-8a624239703c046d89ebeaf3ea13c87af75b550f.tar.xz yuzu-8a624239703c046d89ebeaf3ea13c87af75b550f.zip | |
Change NULLs to nullptrs.
Diffstat (limited to 'src/citra')
| -rw-r--r-- | src/citra/emu_window/emu_window_glfw.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/citra/emu_window/emu_window_glfw.cpp b/src/citra/emu_window/emu_window_glfw.cpp index 697bf4693..982619126 100644 --- a/src/citra/emu_window/emu_window_glfw.cpp +++ b/src/citra/emu_window/emu_window_glfw.cpp | |||
| @@ -76,9 +76,9 @@ EmuWindow_GLFW::EmuWindow_GLFW() { | |||
| 76 | std::string window_title = Common::StringFromFormat("Citra | %s-%s", Common::g_scm_branch, Common::g_scm_desc); | 76 | std::string window_title = Common::StringFromFormat("Citra | %s-%s", Common::g_scm_branch, Common::g_scm_desc); |
| 77 | m_render_window = glfwCreateWindow(VideoCore::kScreenTopWidth, | 77 | m_render_window = glfwCreateWindow(VideoCore::kScreenTopWidth, |
| 78 | (VideoCore::kScreenTopHeight + VideoCore::kScreenBottomHeight), | 78 | (VideoCore::kScreenTopHeight + VideoCore::kScreenBottomHeight), |
| 79 | window_title.c_str(), NULL, NULL); | 79 | window_title.c_str(), nullptr, nullptr); |
| 80 | 80 | ||
| 81 | if (m_render_window == NULL) { | 81 | if (m_render_window == nullptr) { |
| 82 | ERROR_LOG(GUI, "Failed to create GLFW window! Exiting..."); | 82 | ERROR_LOG(GUI, "Failed to create GLFW window! Exiting..."); |
| 83 | exit(1); | 83 | exit(1); |
| 84 | } | 84 | } |
| @@ -123,7 +123,7 @@ void EmuWindow_GLFW::MakeCurrent() { | |||
| 123 | 123 | ||
| 124 | /// Releases (dunno if this is the "right" word) the GLFW context from the caller thread | 124 | /// Releases (dunno if this is the "right" word) the GLFW context from the caller thread |
| 125 | void EmuWindow_GLFW::DoneCurrent() { | 125 | void EmuWindow_GLFW::DoneCurrent() { |
| 126 | glfwMakeContextCurrent(NULL); | 126 | glfwMakeContextCurrent(nullptr); |
| 127 | } | 127 | } |
| 128 | 128 | ||
| 129 | void EmuWindow_GLFW::ReloadSetKeymaps() { | 129 | void EmuWindow_GLFW::ReloadSetKeymaps() { |