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

Merge pull request #4855 from lrineau/CGAL-fix_LEDA-GF 

A few fixes to our LEDA testsuite
This commit is contained in:
Laurent Rineau 2020-07-23 17:15:14 +02:00
parent 71368f3d0b 66040cb5f3
commit 430954dca3
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
GraphicsView/include/CGAL/Qt/camera_impl.h
View File

@ -1725,6 +1725,11 @@ CGAL_INLINE_FUNCTION
MAT(out, 3, 3) = r3[7]; MAT(out, 3, 3) = r3[7];
return 1; return 1;
} }
#undef MAT
#undef SWAP_ROWS_GLdouble
#undef SWAP_ROWS_DOUBLE
CGAL_INLINE_FUNCTION CGAL_INLINE_FUNCTION
int unProject(GLdouble winx, GLdouble winy, GLdouble winz, GLdouble *modelview, GLdouble *projection, int *viewport, int unProject(GLdouble winx, GLdouble winy, GLdouble winz, GLdouble *modelview, GLdouble *projection, int *viewport,
GLdouble *objX,GLdouble *objY,GLdouble *objZ) GLdouble *objX,GLdouble *objY,GLdouble *objZ)

6
Number_types/include/CGAL/Exact_algebraic.h
View File

@ -49,12 +49,10 @@ typedef unspecified_type Exact_algebraic;
#else // not DOXYGEN_RUNNING #else // not DOXYGEN_RUNNING
#ifdef CGAL_USE_CORE
typedef CORE::Expr Exact_algebraic;
#endif
#ifdef CGAL_USE_LEDA #ifdef CGAL_USE_LEDA
typedef leda_real Exact_algebraic; typedef leda_real Exact_algebraic;
#elif defined CGAL_USE_CORE
typedef CORE::Expr Exact_algebraic;
#endif #endif
#endif #endif

4
Number_types/test/Number_types/Lazy_exact_nt_new.cpp
View File

@ -98,7 +98,8 @@ void test_lazy_exact_nt() {
#ifdef CGAL_USE_CORE #ifdef CGAL_USE_CORE
CGAL_assertion_code(typedef CGAL::Lazy_exact_nt<leda_integer> T1;) CGAL_assertion_code(typedef CGAL::Lazy_exact_nt<leda_integer> T1;)
CGAL_assertion_code(typedef CGAL::Lazy_exact_nt<CORE::Expr> T2;) CGAL_assertion_code(typedef CGAL::Lazy_exact_nt<CORE::Expr> T2;)
CGAL_assertion_code(typedef CGAL::Coercion_traits<T1, T2> CT;) typedef CGAL::Coercion_traits<T1, T2> CT;
CGAL_USE_TYPE(CT);
CGAL_static_assertion((boost::is_same< typename CT::Are_implicit_interoperable,CGAL::Tag_false>::value)); CGAL_static_assertion((boost::is_same< typename CT::Are_implicit_interoperable,CGAL::Tag_false>::value));
CGAL_static_assertion((boost::is_same< typename CT::Are_explicit_interoperable,CGAL::Tag_false>::value)); CGAL_static_assertion((boost::is_same< typename CT::Are_explicit_interoperable,CGAL::Tag_false>::value));
#endif #endif
@ -115,4 +116,3 @@ int main() {
#endif #endif
return 0; return 0;
} }