diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2016-01-11 12:00:44 +0100 |
|---|---|---|
| committer | Rémi Verschelde <remi@verschelde.fr> | 2016-01-11 12:00:44 +0100 |
| commit | 7f82c8d7c5cbcb07bddf98a5006706d1f77c4444 (patch) | |
| tree | c856982194ff120f5351b1c4e1821d98a43c904d /platform | |
| parent | cbdcd99b858d48e14d11ec186b34f7b398cfc11d (diff) | |
| parent | cabf9234849508ba7285d1a5bafd3bab692eb80f (diff) | |
Merge pull request #3230 from touilleMan/issue-55
Remove unnecessary null pointer checks
Diffstat (limited to 'platform')
| -rw-r--r-- | platform/haiku/audio_driver_media_kit.cpp | 3 | ||||
| -rw-r--r-- | platform/haiku/haiku_direct_window.cpp | 4 | ||||
| -rw-r--r-- | platform/nacl/os_nacl.cpp | 3 | ||||
| -rw-r--r-- | platform/windows/os_windows.cpp | 3 | ||||
| -rw-r--r-- | platform/winrt/os_winrt.cpp | 3 |
5 files changed, 5 insertions, 11 deletions
diff --git a/platform/haiku/audio_driver_media_kit.cpp b/platform/haiku/audio_driver_media_kit.cpp index 96fd868a81..c7eed1c7cd 100644 --- a/platform/haiku/audio_driver_media_kit.cpp +++ b/platform/haiku/audio_driver_media_kit.cpp @@ -118,8 +118,7 @@ void AudioDriverMediaKit::unlock() { } void AudioDriverMediaKit::finish() { - if (player) - delete player; + delete player; if (samples_in) { memdelete_arr(samples_in); diff --git a/platform/haiku/haiku_direct_window.cpp b/platform/haiku/haiku_direct_window.cpp index 3914ee272a..184d64f840 100644 --- a/platform/haiku/haiku_direct_window.cpp +++ b/platform/haiku/haiku_direct_window.cpp @@ -16,9 +16,7 @@ HaikuDirectWindow::HaikuDirectWindow(BRect p_frame) HaikuDirectWindow::~HaikuDirectWindow() { - if (update_runner) { - delete update_runner; - } + delete update_runner; } void HaikuDirectWindow::SetHaikuGLView(HaikuGLView* p_view) { diff --git a/platform/nacl/os_nacl.cpp b/platform/nacl/os_nacl.cpp index 43f6bd9c01..de6a15525b 100644 --- a/platform/nacl/os_nacl.cpp +++ b/platform/nacl/os_nacl.cpp @@ -144,8 +144,7 @@ void OSNacl::finalize_core() { if (mempool_dynamic) memdelete( mempool_dynamic ); - if (mempool_static) - delete mempool_static; + delete mempool_static; }; diff --git a/platform/windows/os_windows.cpp b/platform/windows/os_windows.cpp index 6ac27b7dbf..79d8aa1a0c 100644 --- a/platform/windows/os_windows.cpp +++ b/platform/windows/os_windows.cpp @@ -1144,8 +1144,7 @@ void OS_Windows::finalize_core() { if (mempool_dynamic) memdelete( mempool_dynamic ); - if (mempool_static) - delete mempool_static; + delete mempool_static; TCPServerWinsock::cleanup(); diff --git a/platform/winrt/os_winrt.cpp b/platform/winrt/os_winrt.cpp index 7c4b2dc661..f507c1aae7 100644 --- a/platform/winrt/os_winrt.cpp +++ b/platform/winrt/os_winrt.cpp @@ -345,8 +345,7 @@ void OSWinrt::finalize_core() { if (mempool_dynamic) memdelete( mempool_dynamic ); - if (mempool_static) - delete mempool_static; + delete mempool_static; } |