Laurent Rineau
984c5aa9c4
Merge branch 'Point_set_processing_3-fix_bug_with_Boost_1_54-GF'
...
Workaround the incompatibility between Point_set_processing_3 and Boost
1.54. In the testsuite, the tests that failed because of Boost-1.54 are
no longer compiled.
Tested in CGAL-4.5-Ic-97.
Approved by the Release Manager.
2014-07-16 17:45:40 +02:00
Laurent Rineau
5b376e80e5
Merge remote-tracking branch 'origin/Triangulation_3-fix_adjacent_vertices-GF'
...
Fix a bug in finite_adjacent_vertices when dimension()==0
Tested in CGAL-4.5-Ic-97.
Approved by the Release Manager.
2014-07-16 17:39:51 +02:00
Laurent Rineau
d0570871e7
Fix a warning
2014-07-16 17:06:11 +02:00
Clement Jamin
deb6edcb1f
Wrong variable name.
2014-07-16 17:05:22 +02:00
Clement Jamin
63056df061
Merge branch 'Mesh_3-parallel-cjamin' of ssh://scm.cgal.org/var/git/cgal into Mesh_3-parallel-cjamin
2014-07-16 17:05:08 +02:00
Clement Jamin
dad9162352
Missing "using"
2014-07-16 17:04:47 +02:00
Laurent Rineau
7348b466f3
Fix a warning
...
Otherwise `p` can be used without being initialized.
2014-07-16 16:52:50 +02:00
Andreas Fabri
349d5fcc5a
Arithmetic_kernel -> Exact_integer/rational
2014-07-16 16:52:17 +02:00
Laurent Rineau
bf3937fabc
Reformat the long list of #ifdef/#else
...
And display the typeid of the kernel, for checking.
(cherry picked from commit 8eb51bee7a )
Conflicts:
Triangulation_3/benchmark/Triangulation_3/Triangulation_benchmark_3.cpp
2014-07-16 16:47:33 +02:00
Andreas Fabri
cb09dc9065
Add Leda
...
(cherry picked from commit a25077bf90 )
Conflicts:
Triangulation_3/benchmark/Triangulation_3/Triangulation_benchmark_3.cpp
2014-07-16 16:47:33 +02:00
Andreas Fabri
2aa0f98526
Arithmetic_kernel -> Exact_integer/rational
2014-07-16 16:45:14 +02:00
Clement Jamin
2dd27c4d13
Fix a (minor) data race on the circumcenter cache
2014-07-16 16:35:31 +02:00
Laurent Rineau
f53344ef9b
Let's try to deactivate CGAL_Core and see...
2014-07-16 15:29:54 +02:00
Laurent Rineau
4689ac4db5
Force 53 bits of precision (double with 64 bits only)
...
I have the impression that the `x` value can be different in the two
sides of the kernel checker, because of compiler optimization and
80-bits floating point registers.
2014-07-16 14:53:21 +02:00
Clement Jamin
6f7587c6dd
Fix small differences between master and Mesh_3-parallel
2014-07-16 14:13:40 +02:00
Sébastien Loriot
028b6cc505
remove the Point set demo as all functionalities are now in the Polyhedron demo
2014-07-16 08:34:21 +02:00
Sébastien Loriot
756f502914
introduce the splatting taken from the Point set demo
...
glew.h needs to be included before gl.h, thus the change
of some include directives
There is still a lighting/color bug that I need to fix
2014-07-16 08:32:22 +02:00
Clement Jamin
aa1aa597bb
Restore commit a09ed468 with a bug fix
...
"Thread-safe version of incident_cells and incident_facets"
2014-07-15 20:13:30 +02:00
Clement Jamin
32616470c7
Add parallelism to test_meshing_unit_tetrahedron.cpp
2014-07-15 20:04:35 +02:00
Clement Jamin
2d35c204fb
Remove VERBOSE macro
2014-07-15 19:28:19 +02:00
Mael Rouxel-Labbé
0cface5c3c
Fix Circular_querry.cpp
...
The Fuzzy_sphere bug (c0cbdab ) was previously undetected by
the testsuite because Circular_querry.cpp used circles
with radius that cannot exactly be represented (0.2) in
binary and a point could never exactly be on the circle
(the squared distance would be 0.04 + epsilon and the assertions
did not fail). This attempts to fix it by using decimals
that can exactly be represented.
The testsuite now compiles and runs succesfully locally.
2014-07-15 18:24:51 +02:00
Clement Jamin
db6db80096
Fix identation
2014-07-15 18:11:31 +02:00
Mael Rouxel-Labbé
c0cbdab3d8
Fix a bug in Spatial_searching's fuzzy_sphere
...
The contains() function (and its variations) returned false
for all points on the sphere.
2014-07-15 17:54:45 +02:00
Clement Jamin
d299aa2202
Use different checking intervals for the sequential and the parallel version
2014-07-15 16:30:56 +02:00
Sébastien Loriot
e97efd228f
prevent linking
2014-07-15 14:25:21 +02:00
Sébastien Loriot
bb191be68b
use cmake variable instead of hard-coded lib names
...
trivial bugfix for master
2014-07-15 11:32:52 +02:00
Sébastien Loriot
2dfd63ecd0
using delete instruction if available
...
trivial bugfix for master
2014-07-15 10:03:57 +02:00
Efi Fogel
207f70b167
minor fix for master. traits() => geometry_traits()
2014-07-13 10:27:30 +03:00
Andreas Fabri
cdb0ee6381
trivial bug-fix for master
2014-07-12 19:37:25 +02:00
Sébastien Loriot
a0de599134
a bool that is false can never become true with &&'s
...
did somebody try to use splatting since 5f33a481
trivial bug fix for master
2014-07-12 00:21:36 +02:00
Laurent Rineau
2fd95b6d17
Merge branch 'CGAL-use_leda-GF'
...
Fix the use CMake variable CGAL_DISABLE_GMP.
That variable must be stored in CGALConfig.cmake, so that UseCGAL.cmake
can see it.
Approved by Release Manager.
Tested in CGAL-4.5-Ic-92.
2014-07-11 17:57:16 +02:00
Laurent Rineau
64c5573a85
rm warning
...
(cherry picked from commit c309fde259c04b8e3beb609b3dece1673240ab34)
Trivial fix for master
2014-07-11 16:51:27 +02:00
Laurent Rineau
84fcae4788
Workaround the incompatibility with Boost 1.54
2014-07-11 12:04:42 +02:00
Laurent Rineau
6147850312
Fix remaining warnings
2014-07-11 11:01:24 +02:00
Andreas Fabri
964f04c5fb
Remove unnecessary include and typedef
2014-07-11 09:50:19 +02:00
Andreas Fabri
56deede019
Use CGAL_USE_TYPE
2014-07-11 09:49:55 +02:00
Andreas Fabri
c0be9a38d3
initialize to avoid warning
2014-07-11 09:27:10 +02:00
Laurent Rineau
64fe2b3f8e
Remove warnings
2014-07-10 14:46:12 +02:00
Laurent Rineau
19158bac27
Remove warnings about unused parameters
2014-07-10 14:41:42 +02:00
Sébastien Loriot
d5f7ba8ff3
fix a bug introduced in 31042b8d
...
glDrawElements call expect unsigned int!
trivial bug-fix for master
2014-07-10 00:22:08 +02:00
Sébastien Loriot
5fce0d89f2
remove non-needed conversion operator (because of inheritance)
...
trivial bug-fix for master
2014-07-09 23:54:52 +02:00
Sébastien Loriot
ddc01022d8
remove a warning
...
trivial bug-fix for master
2014-07-09 23:54:51 +02:00
Andreas Fabri
b63488b0e9
remove unused parameters
2014-07-09 16:15:54 +02:00
Efi Fogel
ff308b5696
minor fix for master. Removed description of non-exisiting member functions
2014-07-09 17:12:13 +03:00
Andreas Fabri
13bb5e38aa
remove unused parameters
2014-07-09 16:02:45 +02:00
Andreas Fabri
4ddd31365c
Merge branch 'Mesh_3-parallel-cjamin' of ssh://scm.cgal.org/var/git/cgal into Mesh_3-parallel-cjamin
2014-07-09 15:47:05 +02:00
Andreas Fabri
b1f4afbd33
Macros MUST be prefixed with CGAL_
...
-pedantic does not like extra semicolons
todo: cleanup: The macro is there twice.
2014-07-09 15:41:08 +02:00
Laurent Rineau
b6aeb7cc66
Store CGAL_DISABLE_GMP in CGALConfig.cmake...
...
... and use it in UseCGAL/CGAL_Macros, to avoid re-enabling GMP by
error.
2014-07-09 15:39:44 +02:00
Laurent Rineau
0f5fc963b4
Support QUIETLY in FindTBB.cmake
2014-07-09 15:36:25 +02:00
Andreas Fabri
3aefde776a
Move a function body in the class definition to avoid an ICE with VC12
2014-07-09 15:30:16 +02:00