summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorRémi Verschelde <remi@verschelde.fr>2016-01-11 12:00:44 +0100
committerRémi Verschelde <remi@verschelde.fr>2016-01-11 12:00:44 +0100
commit7f82c8d7c5cbcb07bddf98a5006706d1f77c4444 (patch)
treec856982194ff120f5351b1c4e1821d98a43c904d /drivers
parentcbdcd99b858d48e14d11ec186b34f7b398cfc11d (diff)
parentcabf9234849508ba7285d1a5bafd3bab692eb80f (diff)
Merge pull request #3230 from touilleMan/issue-55
Remove unnecessary null pointer checks
Diffstat (limited to 'drivers')
-rw-r--r--drivers/convex_decomp/b2Polygon.cpp4
-rw-r--r--drivers/rtaudio/RtAudio.cpp6
-rw-r--r--drivers/unix/os_unix.cpp3
3 files changed, 5 insertions, 8 deletions
diff --git a/drivers/convex_decomp/b2Polygon.cpp b/drivers/convex_decomp/b2Polygon.cpp
index 775f2adfe2..73955d3573 100644
--- a/drivers/convex_decomp/b2Polygon.cpp
+++ b/drivers/convex_decomp/b2Polygon.cpp
@@ -217,8 +217,8 @@ b2Polygon::b2Polygon(b2Triangle& t) {
void b2Polygon::Set(const b2Polygon& p) {
if (nVertices != p.nVertices){
nVertices = p.nVertices;
- if (x) delete[] x;
- if (y) delete[] y;
+ delete[] x;
+ delete[] y;
x = new float32[nVertices];
y = new float32[nVertices];
}
diff --git a/drivers/rtaudio/RtAudio.cpp b/drivers/rtaudio/RtAudio.cpp
index 72ca836907..86981e56d2 100644
--- a/drivers/rtaudio/RtAudio.cpp
+++ b/drivers/rtaudio/RtAudio.cpp
@@ -139,8 +139,7 @@ void RtAudio :: getCompiledApi( std::vector<RtAudio::Api> &apis ) throw()
void RtAudio :: openRtApi( RtAudio::Api api )
{
- if ( rtapi_ )
- delete rtapi_;
+ delete rtapi_;
rtapi_ = 0;
#if defined(__UNIX_JACK__)
@@ -216,8 +215,7 @@ RtAudio :: RtAudio( RtAudio::Api api )
RtAudio :: ~RtAudio() throw()
{
- if ( rtapi_ )
- delete rtapi_;
+ delete rtapi_;
}
void RtAudio :: openStream( RtAudio::StreamParameters *outputParameters,
diff --git a/drivers/unix/os_unix.cpp b/drivers/unix/os_unix.cpp
index 405d84f0f1..8e3fba167f 100644
--- a/drivers/unix/os_unix.cpp
+++ b/drivers/unix/os_unix.cpp
@@ -149,8 +149,7 @@ void OS_Unix::finalize_core() {
if (mempool_dynamic)
memdelete( mempool_dynamic );
- if (mempool_static)
- delete mempool_static;
+ delete mempool_static;
}