68c367a2df
Revert "Revert "Merge branch 'Periodic_3_mesh_3-Extended_mesh_3-MBogdanov'""
...
This reverts commit 2e58135751
2014-05-07 13:56:20 +02:00
89dd491a17
Merge remote-tracking branch 'origin/Number_types-Interval_with_long-glisse'
...
Remove explicit interoperability between Interval_nt and int, so
Interval_nt becomes interoperable with every builtin type (in particular
long) via double.
Approved by the release manager
2014-05-07 13:19:24 +02:00
dc533b4b01
Merge remote-tracking branch 'origin/Number_types-Gmpq_less_boost-glisse'
...
Implement Gmpq+Gmpq directly instead of going through boost, to simplify
the generated code.
Approved by the release manager
2014-05-07 13:18:23 +02:00
be533936fc
Merge remote-tracking branch 'origin/STL_Extension-Handle_for_micro_opt-glisse'
...
Micro-optimization in the constructors of Handle_for.
Approved by the release manager
2014-05-07 13:17:11 +02:00
8aa67dcfa4
add missing const in doc
2014-05-06 16:03:51 +02:00
e5113a2c37
Don't use Boost.Operators for +-*/ of Gmpq.
...
It shouldn't change the performance significantly (the time is spent in
malloc/free and the mpq_* calls), but at least I can follow the
(smaller) generated code.
2014-05-05 20:06:22 +02:00
24d396afb2
Micro-optimization: do the opaque call first so it does not hinder optimizers.
...
(don't expect to measure the difference)
2014-05-05 19:13:31 +02:00
b8bab2041a
Remove the mixed Interval_nt x int operations. They are useless and
...
cause ambiguity with the double operations.
2014-05-05 18:19:08 +02:00
276f2ce4e7
trivial bug-fix for master to export link targets for an external plugin
2014-04-30 15:18:11 +02:00
2ce60b2b51
Merge branch 'Subdivision_method_3-loop_scheme_bugfix-local'
...
trivial bug fix for master
2014-04-25 07:21:15 +02:00
1f3b57e93a
fix Loop scheme sqrt -> square
2014-04-25 07:20:39 +02:00
3169b23528
doc fix: use cgalExample macro
2014-04-24 14:56:33 +02:00
4a115d7655
trivial bug-fix for master: fix namespace
2014-04-22 16:35:18 +02:00
c062a7ac93
Add doc for operator[] and is_used.
2014-04-18 13:42:45 +02:00
fe5d2c519f
trivial bug-fix: add a missing protector
...
(cherry picked from commit 56afa84492
2014-04-18 12:02:30 +02:00
56afa84492
trivial bug-fix: add a missing protector
2014-04-18 11:20:47 +02:00
4bf5d90c85
Merge branch 'STL_extension-Compact_container_as_vector-cjamin'
...
Small feature page: https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/Compact_containers_as_vector
Approved by the release manager
2014-04-18 08:08:56 +02:00
afa40bc6a4
Merge branch 'Periodic_3_triangulation_3_inexact_locate-APelle'
...
- This small feature adds a method to locate point with inexact predicates in
Periodic_3_triangulation_3.
(cf. https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/Add_inexact_locate_in_Periodic_3_triangulation_3 )
- Tested in CGAL-4.5-Ic-13
- Approved by the Release Manager.
2014-04-17 18:30:59 +02:00
2e58135751
Revert "Merge branch 'Periodic_3_mesh_3-Extended_mesh_3-MBogdanov'"
...
This reverts commit 2ec2fb3c8e2ed7784521
2014-04-16 17:37:04 +02:00
2ec2fb3c8e
Merge branch 'Periodic_3_mesh_3-Extended_mesh_3-MBogdanov'
...
- This small feature adds a method to locate point with inexact predicates in
Periodic_3_triangulation_3.
(cf. https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/Add_inexact_locate_in_Periodic_3_triangulation_3 )
- Tested in CGAL-4.5-Ic-12
- Approved by the Release Manager.
2014-04-16 16:22:31 +02:00
2d966627a7
Added Compact_container::operator[]
2014-04-16 15:20:56 +02:00
239b6d0932
Merge branch 'STL_extension-Compact_container_as_vector-cjamin-old' into STL_extension-Compact_container_as_vector-cjamin
2014-04-16 14:14:24 +01:00
57a709ef09
Fix for windows : Polyline is renamed Polyline_3 in a example.
2014-04-16 13:45:59 +02:00
2ed7784521
trivial fix for master
2014-04-15 18:22:22 +02:00
3de04a47de
We construct explictly wrappers in test_labeled_mesh_domain_3.
2014-04-15 17:22:10 +02:00
4910a198f2
periodic_inexact_locate stops also if the max num of turns is reached.
2014-04-15 15:11:07 +02:00
c83840692c
Merge branch 'Stream_support-read_double-GF'
...
Approved by the release manager
2014-04-15 12:19:18 +02:00
163fbd0749
fix typos
2014-04-15 12:03:50 +02:00
f008c28f7f
The implicit wrapper had bad template parameter in test_labeled_mesh_domain_3.
...
Fix a warning : explicit conversion for the return value in
Implicit_multi_domain_to_labeling_function_wrapper.
2014-04-14 18:41:16 +02:00
5a05ba0577
Fix Doxygen bug in the documentation of Mesh_triangulation_3
2014-04-14 15:22:41 +02:00
60016bec63
Remove an extra ';', added by error in previous commits
2014-04-14 14:13:11 +02:00
c537e4ed64
Use the workaround only for VC++ and only starting from VC10
2014-04-11 16:51:04 +02:00
935c23245e
Merge branch 'Snap_rounding_2-kd_tree_replacement-wkhan'
...
* replaced private implementation of kd-tree in Snap_rounding with
officical implementation of Kd_tree in Spatial_search package
* added reserve() and capacity() to Kd_tree
* removed kd_tree package that was only used by Snap_rounding_2
Tested in CGAL-4.5-Ic-6
Approved by the Release Manager
2014-04-11 15:52:32 +02:00
3e94c4c594
Make LSAN more silent
2014-04-11 13:49:49 +02:00
9588e8d91b
Use -isystem for Boost include path
2014-04-11 11:45:44 +02:00
e8134e5f25
Merge branch 'Mesh_3-fix_warnings-lrineau'
...
Fix warnings about unused variables/parameters
Use pragmas, when that is needed (for Boost named parameters)
Tested in CGAL-4.5-Ic-7.
Approved by the Release Manager.
2014-04-11 11:33:11 +02:00
3127f914fb
Merge branch 'Documentation-collect_fig_anchors_in_ref_man-local'
...
figure anchor declare using the cgal macro in the reference
manual pages will now be also collected for the numbering
Tested in CGAL-4.5-Ic-7
2014-04-11 08:53:31 +02:00
cf5d6e041e
Use pragmas to fix warnings
2014-04-10 20:06:04 +02:00
cecf4648f5
Merge branch 'Polyhedron-join_plugin-sloriot'
...
add a plugin in the polyhedron demo to join polyhedra
without no check for auto-intersection
Tested in CGAL-4.5-Ic-6
2014-04-10 17:48:07 +02:00
8576c41a06
the post processing also collects fig anchors in the reference manual pages
2014-04-10 17:43:28 +02:00
01c8cb1ec8
Remove false-positive leaks detection from NVidia libGL
2014-04-10 15:32:11 +02:00
8a4d9ea1b1
Update ref platforms -ansi/-m32
...
The Boost variables where not correct.
2014-04-10 14:48:16 +02:00
15609db9ff
polish
2014-04-10 14:28:16 +02:00
afdeb14bd7
Add a replacement for operator>>(istream&, double&)
2014-04-10 13:10:41 +02:00
7259c76434
Fix warning : Some variables weren't unused in inexact_periodic_locate.
2014-04-09 17:01:49 +02:00
2395b41569
Merge branch 'CMap_bug_vc12-gdamiand'
...
Correct a bug with vc12.
When variadic template are enabled, create_attribute has two versions: a first one with <Args...> and a second one with only one template <t1>. VC12 always use the first version, even when only one parameter is used. Solve this bug by removing the second version and always initialize the ref counting (which was useless for the version with more than 1 template).
* Successfully tested in CGAL-4.4-Ic-4 and CGAL-4.4-Ic-5,
* Approved by the release manager
2014-04-09 15:59:15 +02:00
260a4b1bf3
Fix : Use CGAL::cpp11::get<> instead of the tuple::get<> method.
...
Indeed, tuple::get<> doen't exist for all configurations. (c++11, ...)
2014-04-09 14:18:12 +02:00
8ae6dd8ad4
Fix : Remove 'typename' in the test of the wrapper for multi domain.
2014-04-09 13:35:41 +02:00
dee9fc8235
Merge branch 'Snap_rounding_2-kd_tree_replacement-wkhan-old' into Snap_rounding_2-kd_tree_replacement-wkhan
...
Conflicts:
Installation/changes.html
2014-04-09 10:11:35 +02:00
7a754cf987
Adds the changes in the file Installation/changes.html.
2014-04-08 18:04:04 +02:00
Laurent Rineau
Marc Glisse
Sébastien Loriot
Clement Jamin
Aymeric PELLE
Andreas Fabri
Eric Berberich
Guillaume Damiand