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

Fix a miscompilation by clang-3.6.x 

Fix issue #139
This commit is contained in:
Laurent Rineau 2015-07-03 17:27:46 +02:00
parent adff1e473d
commit 2591e6cc7d
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
STL_Extension/include/CGAL/Compact_container.h
View File

@ -1147,7 +1147,7 @@ namespace internal {
Nullptr_t CGAL_assertion_code(n)) Nullptr_t CGAL_assertion_code(n))
{ {
CGAL_assertion( n == NULL); CGAL_assertion( n == NULL);
return &*rhs == NULL; return rhs == CC_iterator<DSC, Const>();
} }
template < class DSC, bool Const > template < class DSC, bool Const >
@ -1156,7 +1156,7 @@ namespace internal {
Nullptr_t CGAL_assertion_code(n)) Nullptr_t CGAL_assertion_code(n))
{ {
CGAL_assertion( n == NULL); CGAL_assertion( n == NULL);
return &*rhs != NULL; return rhs != CC_iterator<DSC, Const>();
} }
} // namespace internal } // namespace internal

2
STL_Extension/include/CGAL/vector.h
View File

@ -196,7 +196,7 @@ protected:
} }
} }
void deallocate() { void deallocate() {
if ( &*start_) if ( start_ != iterator() )
alloc.deallocate( &*start_, end_of_storage - start_ ); alloc.deallocate( &*start_, end_of_storage - start_ );
} }