From 00a4c160153866eb6f3b8d5a088afefb0046903e Mon Sep 17 00:00:00 2001 From: Paolo Cignoni Date: Thu, 13 Oct 2016 16:52:12 +0200 Subject: [PATCH] Added omp guards, added a this-> as a workaround to a clang error --- Src/MultiGridOctreeData.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Src/MultiGridOctreeData.h b/Src/MultiGridOctreeData.h index 921c4c7..a97aecc 100644 --- a/Src/MultiGridOctreeData.h +++ b/Src/MultiGridOctreeData.h @@ -54,7 +54,9 @@ DAMAGE. #define MAX_MEMORY_GB 0 #include +#ifdef _OPENMP #include +#endif // _OPENMP #include "BSplineData.h" #include "PointStream.h" #include "Geometry.h" @@ -336,7 +338,7 @@ struct DenseNodeData Data& operator[]( const OctNode< TreeNodeData >* node ) { return _data[ node->nodeData.nodeIndex ]; } Data* operator()( const OctNode< TreeNodeData >* node ) { return ( node==NULL || node->nodeData.nodeIndex>=(int)_sz ) ? NULL : &_data[ node->nodeData.nodeIndex ]; } const Data* operator()( const OctNode< TreeNodeData >* node ) const { return ( node==NULL || node->nodeData.nodeIndex>=(int)_sz ) ? NULL : &_data[ node->nodeData.nodeIndex ]; } - int index( const OctNode< TreeNodeData >* node ) const { return ( !node || node->nodeData.nodeIndex<0 || node->nodeData.nodeIndex>=(int)_data.size() ) ? -1 : node->nodeData.nodeIndex; } + int index( const OctNode< TreeNodeData >* node ) const { return ( !node || node->nodeData.nodeIndex<0 || node->nodeData.nodeIndex>=(int)this->_data.size() ) ? -1 : node->nodeData.nodeIndex; } protected: size_t _sz; void _resize( size_t sz ){ DeletePointer( _data ) ; if( sz ) _data = NewPointer< Data >( sz ) ; else _data = NullPointer( Data ) ; _sz = sz; }