songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use of an std::vector instead of a dynamic array

This commit is contained in:
Clement Jamin 2013-06-27 14:01:52 +02:00
parent d0ca823aa8
commit c8afb5e76a
1 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
STL_Extension/include/CGAL/Spatial_grid_lock_data_structure_3.h
View File

@ -36,6 +36,7 @@
#include <tbb/recursive_mutex.h> #include <tbb/recursive_mutex.h>
#include <algorithm> #include <algorithm>
#include <vector>
namespace CGAL { namespace CGAL {
@ -489,15 +490,14 @@ public:
int num_cells = int num_cells =
num_grid_cells_per_axis*num_grid_cells_per_axis*num_grid_cells_per_axis; num_grid_cells_per_axis*num_grid_cells_per_axis*num_grid_cells_per_axis;
m_grid = new tbb::atomic<bool>[num_cells]; m_grid.resize(num_cells);
// Initialize grid // Initialize grid (useless?)
for (int i = 0 ; i < num_cells ; ++i) for (int i = 0 ; i < num_cells ; ++i)
m_grid[i] = false; m_grid[i] = false;
} }
~Spatial_grid_lock_data_structure_3() ~Spatial_grid_lock_data_structure_3()
{ {
delete [] m_grid;
} }
bool is_cell_locked_impl(int cell_index) bool is_cell_locked_impl(int cell_index)
@ -525,7 +525,7 @@ public:
protected: protected:
tbb::atomic<bool> * m_grid; std::vector<tbb::atomic<bool> > m_grid;
}; };
@ -551,16 +551,12 @@ public:
{ {
int num_cells = int num_cells =
num_grid_cells_per_axis*num_grid_cells_per_axis*num_grid_cells_per_axis; num_grid_cells_per_axis*num_grid_cells_per_axis*num_grid_cells_per_axis;
m_grid = new tbb::atomic<unsigned int>[num_cells]; m_grid.resize(num_cells);
// Initialize grid
for (int i = 0 ; i < num_cells ; ++i)
m_grid[i] = 0;
} }
/// Destructor /// Destructor
~Spatial_grid_lock_data_structure_3() ~Spatial_grid_lock_data_structure_3()
{ {
delete [] m_grid;
} }
bool is_cell_locked_impl(int cell_index) bool is_cell_locked_impl(int cell_index)
@ -629,7 +625,7 @@ private:
protected: protected:
tbb::atomic<unsigned int> * m_grid; std::vector<tbb::atomic<unsigned int> > m_grid;
typedef tbb::enumerable_thread_specific<unsigned int> TLS_thread_uint_ids; typedef tbb::enumerable_thread_specific<unsigned int> TLS_thread_uint_ids;
TLS_thread_uint_ids m_tls_thread_ids; TLS_thread_uint_ids m_tls_thread_ids;
@ -656,13 +652,12 @@ public:
{ {
int num_cells = int num_cells =
num_grid_cells_per_axis*num_grid_cells_per_axis*num_grid_cells_per_axis; num_grid_cells_per_axis*num_grid_cells_per_axis*num_grid_cells_per_axis;
m_grid = new tbb::recursive_mutex[num_cells]; m_grid.resize(num_cells);
} }
/// Destructor /// Destructor
~Spatial_grid_lock_data_structure_3() ~Spatial_grid_lock_data_structure_3()
{ {
delete [] m_grid;
} }
bool is_cell_locked_impl(int cell_index) bool is_cell_locked_impl(int cell_index)
@ -692,7 +687,7 @@ public:
protected: protected:
tbb::recursive_mutex * m_grid; std::vector<tbb::recursive_mutex> m_grid;
}; };
} //namespace CGAL } //namespace CGAL