diff options
| author | Emmanuel Leblond <emmanuel.leblond@gmail.com> | 2016-01-04 11:46:16 +0100 |
|---|---|---|
| committer | Emmanuel Leblond <emmanuel.leblond@gmail.com> | 2016-01-04 11:46:16 +0100 |
| commit | cabf9234849508ba7285d1a5bafd3bab692eb80f (patch) | |
| tree | c681c777e8a8867a0bbd955558a92926653ba300 /drivers | |
| parent | cb39db0b02c2d69994e2cd523844a2a9d3087d85 (diff) | |
Remove unnecessary null pointer checks
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/convex_decomp/b2Polygon.cpp | 4 | ||||
| -rw-r--r-- | drivers/rtaudio/RtAudio.cpp | 6 | ||||
| -rw-r--r-- | drivers/unix/os_unix.cpp | 3 |
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 bdf7daf799..be9bfe3166 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; } |