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

fix a bug that happens on vc10, because atomics are not initialized

This commit is contained in:
Jane Tournois 2014-12-16 16:42:22 +01:00
parent 88142b2997
commit 90a74c1bb6
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
STL_Extension/include/CGAL/Spatial_lock_grid_3.h
View File

@ -33,7 +33,6 @@
# include <thread> # include <thread>
#endif #endif
#include <tbb/enumerable_thread_specific.h> #include <tbb/enumerable_thread_specific.h>
#include <tbb/recursive_mutex.h>
#include <algorithm> #include <algorithm>
#include <vector> #include <vector>
@ -42,7 +41,6 @@ namespace CGAL {
struct Tag_no_lock {}; struct Tag_no_lock {};
struct Tag_non_blocking {}; struct Tag_non_blocking {};
struct Tag_non_blocking_with_mutexes {};
struct Tag_priority_blocking {}; struct Tag_priority_blocking {};
//***************************************************************************** //*****************************************************************************
@ -527,6 +525,11 @@ 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.resize(num_cells); m_grid.resize(num_cells);
// Explicitly initialize the atomics
std::vector<tbb::atomic<unsigned int> >::iterator it = m_grid.begin();
std::vector<tbb::atomic<unsigned int> >::iterator it_end = m_grid.end();
for ( ; it != it_end ; ++it)
*it = 0;
} }
/// Destructor /// Destructor