From ae2721f2c84183cea4e447009a59ce606601702e Mon Sep 17 00:00:00 2001 From: kwolekr Date: Sat, 27 Dec 2014 22:35:05 -0500 Subject: [PATCH] VoxelManipulator: Remove unnecessary deallocation steps --- src/voxel.cpp | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/src/voxel.cpp b/src/voxel.cpp index bd14acb06..1299a5296 100644 --- a/src/voxel.cpp +++ b/src/voxel.cpp @@ -46,21 +46,15 @@ VoxelManipulator::VoxelManipulator(): VoxelManipulator::~VoxelManipulator() { clear(); - if(m_data) - delete[] m_data; - if(m_flags) - delete[] m_flags; } void VoxelManipulator::clear() { // Reset area to volume=0 m_area = VoxelArea(); - if(m_data) - delete[] m_data; + delete[] m_data; m_data = NULL; - if(m_flags) - delete[] m_flags; + delete[] m_flags; m_flags = NULL; } @@ -215,10 +209,8 @@ void VoxelManipulator::addArea(const VoxelArea &area) m_data = new_data; m_flags = new_flags; - if(old_data) - delete[] old_data; - if(old_flags) - delete[] old_flags; + delete[] old_data; + delete[] old_flags; //dstream<<"addArea done"<