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

Merge pull request #4786 from lrineau/Mesh_3-fix_compilation_error_MSVC2015-GF 

Continue workaround for MSVC2015
This commit is contained in:
Laurent Rineau 2020-06-23 18:49:58 +02:00
parent 3d78df1749 113c3d1d6f
commit bd7d3c498f
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Mesh_3/include/CGAL/Compact_mesh_cell_base_3.h
View File

@ -54,7 +54,7 @@ void set_weighted_circumcenter(T* &t, std::nullptr_t)
t = nullptr;
}
template<typename T>
bool compare_weighted_circumcenter(T* t)
bool is_null(T* t)
{
return t == nullptr;
}
@ -80,7 +80,7 @@ void set_weighted_circumcenter(std::atomic<T*>& t, std::nullptr_t)
}
template<typename T>
bool compare_weighted_circumcenter(std::atomic<T*>& t)
bool is_null(std::atomic<T*>& t)
{
return t.load() == nullptr;
}
@ -302,7 +302,7 @@ public:
public:
void invalidate_weighted_circumcenter_cache() const
{
if (!internal_tbb::compare_weighted_circumcenter(weighted_circumcenter_)) {
if (!internal_tbb::is_null(weighted_circumcenter_)) {
internal_tbb::delete_circumcenter(weighted_circumcenter_);
internal_tbb::set_weighted_circumcenter(weighted_circumcenter_, nullptr);
}
@ -386,7 +386,7 @@ public:
~Compact_mesh_cell_base_3()
{
if(!internal_tbb::compare_weighted_circumcenter(weighted_circumcenter_)){
if(!internal_tbb::is_null(weighted_circumcenter_)){
internal_tbb::delete_circumcenter(weighted_circumcenter_);
internal_tbb::set_weighted_circumcenter(weighted_circumcenter_, nullptr);
}
@ -533,7 +533,7 @@ public:
{
CGAL_static_assertion((boost::is_same<Point_3,
typename GT_::Construct_weighted_circumcenter_3::result_type>::value));
if (weighted_circumcenter_ == nullptr) {
if (internal_tbb::is_null(weighted_circumcenter_)) {
this->try_to_set_circumcenter(
new Point_3(gt.construct_weighted_circumcenter_3_object()
(this->vertex(0)->point(),