Sébastien Loriot
1bffc44ed4
factorize the mecanism to define the time stamper in a container
2014-05-21 16:30:32 +02:00
Sébastien Loriot
c6fa3f4a3a
add missing namespace
2014-05-21 12:51:20 +02:00
Sébastien Loriot
82f9a83e2d
move the Time stamper into a separate file
2014-05-21 12:20:50 +02:00
Sébastien Loriot
cbd50574e4
clean up comments, include and copyright
2014-05-21 12:08:12 +02:00
Andreas Fabri
2f967ba6e4
the testsuite for the new version of the Constrained_triangulation_plus_2 passes
2014-05-19 15:57:24 +02:00
Andreas Fabri
85b29aed5f
treat merge conflicts
2014-05-15 16:09:24 +02:00
Clement Jamin
f3c00442fd
Merge branch 'Mesh_3-parallel-cjamin-old' into Mesh_3-parallel-cjamin
2014-05-14 19:05:40 +02:00
Marc Glisse
897f585f12
Merge branch 'Kernel_d-rewrite-glisse-old' into Kernel_d-rewrite-glisse
...
Need the Interval_nt/long interoperability for Eigen.
2014-05-07 18:41:17 +02:00
Marc Glisse
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
Laurent Rineau
bcdfdf5335
Cleanup trailing spaces
2014-04-16 15:42:46 +02:00
Clement Jamin
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
Laurent Rineau
a2ef3c10f0
Change the name of timestamp policies
2014-04-16 12:36:40 +02:00
Laurent Rineau
1396d65b48
Test the time stamper policy in the testsuite
2014-04-16 12:34:30 +02:00
Laurent Rineau
28e60a5460
Cosmetic changes
2014-04-16 12:33:57 +02:00
Laurent Rineau
36e61bf091
Fix the implementation of CC_ts_impl_aux
...
CC_ts_impl_aux is the new name of CC_ts_impl_impl
2014-04-16 12:24:14 +02:00
Laurent Rineau
cf3eee72ae
Add comments
2014-04-16 12:22:49 +02:00
Laurent Rineau
75c61a687d
New implementation of Has_timestamp
2014-04-15 18:07:23 +02:00
Jane Tournois
993541644c
move Has_timestamp to STL_extension/include/CGAL directory
...
to avoid that Compact_container depends on Mesh_3
2014-03-27 13:57:47 +01:00
Laurent Rineau
458dcbf96d
Add a comment that says why a warning must be disabled
2014-03-26 17:36:19 +01:00
Andreas Fabri
fa9d5b7f93
Suppress a warning issued by VC12
2014-03-26 09:16:02 +01:00
Laurent Rineau
b54be0ee3c
Update the copyright header
2014-03-25 16:42:23 +01:00
Marc Glisse
3168c851a1
Merge branch 'Kernel_d-rewrite-glisse-old' into Kernel_d-rewrite-glisse
...
Conflicts:
Kernel_d/doc_tex/Kernel_d/kernel_representation_d.tex
Kernel_d/doc_tex/Kernel_d_ref/Homogeneous_d.tex
Kernel_d/doc_tex/Kernel_d_ref/Kernel.tex
Kernel_d/doc_tex/Kernel_d_ref/main.tex
Resolved by dropping those files.
2014-03-12 12:38:08 +01:00
Clement Jamin
157cd0465f
Merge branch 'Mesh_3-parallel-cjamin-old' into Mesh_3-parallel-cjamin
...
Conflicts:
Mesh_3/demo/Mesh_3/Mesh_3_optimization_plugin_cgal_code.cpp
Mesh_3/doc/Mesh_3/Concepts/MeshCellBase_3.h
Mesh_3/include/CGAL/Mesh_3/C3T3_helpers.h
Mesh_3/include/CGAL/Mesh_3/Mesh_complex_3_in_triangulation_3_base.h
Mesh_3/include/CGAL/Mesh_3/Mesh_global_optimizer.h
Mesh_3/include/CGAL/Mesh_3/Sliver_perturber.h
Mesh_3/include/CGAL/Mesh_3/Slivers_exuder.h
Mesh_3/include/CGAL/Mesh_3/Triangulation_helpers.h
Mesh_3/include/CGAL/Mesh_3/config.h
Mesh_3/include/CGAL/Mesh_3/vertex_perturbation.h
Mesh_3/include/CGAL/Polyhedral_mesh_domain_3.h
Mesh_3/include/CGAL/exude_mesh_3.h
Mesh_3/test/Mesh_3/test_meshing_utilities.h
Triangulation_3/include/CGAL/Triangulation_cell_base_with_circumcenter_3.h
2014-03-10 17:01:03 +01:00
Jane Tournois
6af720cde8
remove useless typename(s)
2014-02-21 17:14:13 +01:00
Jane Tournois
9d19ac0f96
add a "less" function to CGAL_time_stamper
...
and handle null pointers given to comparison
it is necessary for example in Triangulation_3::remove_3D
2014-02-21 14:41:41 +01:00
Jane Tournois
22153ac273
make private the time_stamp_ variable
...
and add time_stamp() and set_time_stamp() methods everywhere
2014-02-20 16:18:49 +01:00
Jane Tournois
0740b3652f
add class Has_timestamp not to modify the API of Compact_container
...
- use the Has_timestamp operator in Compact_container
- add partial specialization to classes that need the time stamp (i.e.
Mesh_vertex_base, Compact_mesh_cell_base_3 and Mesh_cell_base_3)
- remove "ts" from classes where they were actually needed for compilation
purpose only (i.e. Kd_tree_node and Triangulation_ds_cell_base_3)
- rename "ts" to time_stamp_
2014-02-20 15:53:36 +01:00
Jane Tournois
b3eccc5905
determinism : add a template parameter to Compact_container
...
we add a template parameter to Compact_container that is able to
set and get the "time stamps" stored in Vertex_handle, Cell_handle etc.
We previously made sure that these pointers are always compared using
the operator< of CC_iterator, inside Compact_container.h
2014-02-18 17:25:50 +01:00
Jane Tournois
6db28ed43d
move ts from Tds to Compact_container
...
Tds now is back to its original version (not different from master)
2014-02-14 17:15:33 +01:00
Andreas Fabri
83546c53b1
Add a time stamp in vertices and cells of triangulations and polyhedra
...
and use this for operator< of handles in order to make mesh generation
deterministic
2014-02-13 19:46:34 +01:00
Laurent Rineau
da3d641efe
Add comments to #ifndef/endif
2014-01-31 16:50:20 +01:00
Laurent Rineau
3ed92e1c1a
Merge branch 'STL_Extension-Boolean_tag_Boost_Integral_Constant-lrineau'
...
Small feature:
cgal.org/wiki/Features/Small_Features/Boolean_tag_is_a_Boost_Integral_Constant
Now CGAL::Boolean_tag<true> and CGAL::Boolean_tag<true> are model of the
Boost concept "Integral Constant".
Tested in CGAL-4.4-Ic-84.
2014-01-09 17:54:28 +01:00
Clement Jamin
c81531bc80
Oops, I removed a line by mistake
2013-12-20 15:11:36 +01:00
Clement Jamin
28c5fde142
Add an increment policy to the Compact_container, and an operator[]
2013-12-20 15:03:37 +01:00
Sébastien Loriot
59f476b5b4
Merge branch 'STL_Extension-fix_make_sorted_pair-local'
...
Bug-fix when using make_sorted_pair on different types
Successfully tested in CGAL-4.4-Ic-62
Approved by the release manager
2013-12-20 08:44:23 +01:00
Sébastien Loriot
3adb58e046
better support of heterogeneous but compatible types
2013-12-17 20:37:19 +01:00
Clement Jamin
5d1eacf16f
rename get_erase_counter => erase_counter
...
And add it to the concept ObjectWithEraseCounter
2013-12-12 07:23:07 +01:00
Laurent Rineau
dc6c20cfdb
merge branch origin/Fix_leak-STL_Extension-GF
...
Remove memory leaks detected by AddressSanitizer.
Tested in CGAL-4.4-Ic-54 and CGAL-4.4-Ic-55.
Approved by the release manager.
2013-12-11 13:42:31 +01:00
Marc Glisse
8ddf8255d5
Merge branch 'Kernel_d-rewrite-glisse-old' into Kernel_d-rewrite-glisse
...
Hopefully the doc will be easier to build this way.
2013-11-23 12:34:18 +01:00
Clement Jamin
ec8e949d21
Merge branch 'Mesh_3-parallel-cjamin-old' into Mesh_3-parallel-cjamin
2013-11-21 10:50:55 +01:00
Marc Glisse
b319b31825
Assume refcount>0 when copying.
...
Hopefully it will help compilers understand that destructing a copy
can't bring the counter to 0.
2013-11-16 12:14:44 +01:00
Andreas Fabri
d8da1137cc
Fix a memory leak in Handle_with_policy:
...
A rep that points to another rep is like a handle
So if such a rep gets deleted the reference counter must be decremented
2013-11-15 16:20:01 +01:00
Andreas Fabri
61298d3925
Fix memory leak in Compact_container::merge()
...
We forgot to merge all_items
2013-11-08 13:55:40 +01:00
Sébastien Loriot
fd0e7756d5
add missing include
...
trivial bugfix
2013-10-29 13:05:44 +01:00
Sébastien Loriot
5f9ab81512
add the function make_sorted_pair
2013-10-18 10:44:54 -07:00
Sébastien Loriot
6a30252a82
remove not needed include directive
2013-10-18 09:22:14 -07:00
Clement Jamin
6b65ad71da
Changes in the "lock data structure" concept and models
...
The concept is now much more generic (SurjectiveLockDataStructure).
The names have been changed accordingly.
2013-10-16 12:17:56 +02:00
Clement Jamin
29525dfcb7
Back-quotes for could_lock_zone and true + minor fixes + replace 0 by NULL
2013-10-15 10:27:35 +02:00
Clement Jamin
a199ec9332
Rename params
2013-10-14 18:07:50 +02:00
Clement Jamin
e03b9aa762
get_cc_iterator => cc_iterator
2013-10-14 17:50:37 +02:00
Clement Jamin
5ff923bcfb
Bug fix: use the right namespace (CCC_internal)
2013-10-02 10:48:59 +02:00
Clement Jamin
2706cbfeff
Compact_container: erase counter strategy is now automatically deduced from T.
...
If the T::increment_erase_counter() function exists, then the erase counter
value will be updated by the Compact_container.
2013-09-30 18:25:41 +02:00
Clement Jamin
41929ed520
Merge branch 'Mesh_3-parallel-cjamin-old' into Mesh_3-parallel-cjamin
...
Conflicts:
Mesh_3/doc/Mesh_3/Concepts/MeshCellBase_3.h
Mesh_3/dont_submit
Triangulation_3/doc/TDS_3/CGAL/Triangulation_data_structure_3.h
Triangulation_3/doc/TDS_3/Concepts/TriangulationDataStructure_3.h
Triangulation_3/doc/Triangulation_3/CGAL/Delaunay_triangulation_3.h
Triangulation_3/doc/Triangulation_3/CGAL/Regular_triangulation_3.h
Triangulation_3/doc/Triangulation_3/CGAL/Triangulation_3.h
Triangulation_3/doc/Triangulation_3/PackageDescription.txt
2013-09-25 11:47:43 +02:00
Andreas Fabri
6c547e5663
Mainly added includes
2013-09-13 22:24:30 +02:00
Andreas Fabri
4a9be1f608
put the 'deprecated' macro at the right spot and add a testsiuite
2013-09-10 11:37:08 +02:00
Laurent Rineau
224a54303a
Make Tag_true and Tag_false be models of the Boost Integral Constant model
...
http://www.boost.org/libs/mpl/doc/refmanual/integral-constant.html
2013-08-27 17:07:24 +02:00
Marc Glisse
7c574d3dd8
Rename Filtered_predicate since it isn't compatible with the old version.
2013-07-22 14:23:08 +02:00
Marc Glisse
dafdb45786
Move is_iterator changes back to the original file.
2013-07-19 21:55:34 +02:00
Clement Jamin
838439b038
Merge branch 'Mesh_3-parallel-cjamin-old' into Mesh_3-parallel-cjamin
...
Conflicts:
Bounding_volumes/doc/Bounding_volumes/CGAL/Approximate_min_ellipsoid_d.h
Installation/cmake/modules/FindTBB.cmake
Installation/cmake/modules/UseTBB.cmake
Mesh_3/doc/Mesh_3/CGAL/Mesh_triangulation_3.h
Mesh_3/doc/Mesh_3/Mesh_3.txt
Mesh_3/include/CGAL/Mesh_triangulation_3.h
Surface_mesher/doc/Surface_mesher/Surface_mesher.txt
2013-07-11 09:58:51 +02:00
Clement Jamin
8b0edee1f4
Merge branch 'concurrency_in_cgal-cjamin-old' into concurrency_in_cgal-cjamin
2013-07-03 17:17:34 +02:00
Clement Jamin
206b20bc15
Merge branch 'Mesh_3-parallel-cjamin-old' into Mesh_3-parallel-cjamin
2013-07-02 17:37:50 +02:00
Clement Jamin
119675c970
Keep a copy of the bbox
2013-07-02 12:53:34 +02:00
Clement Jamin
44355c9f11
Rename get_cc_handle => get_cc_iterator
2013-06-27 17:00:00 +02:00
Clement Jamin
c8afb5e76a
Use of an std::vector instead of a dynamic array
2013-06-27 14:01:52 +02:00
Sébastien Loriot
c09ec2beaa
Merge branch 'Kernel-replace_object-pmoeller'
...
Successfully tested in CGAL-4.3-Ic-59
Approved by the release manager
Conflicts:
Kernel_23/doc/Kernel_23/CGAL/intersections.h
Kernel_23/doc_tex/Kernel_23_ref/intersection.tex
Kernel_d/doc/Kernel_d/Kernel_d.txt
STL_Extension/doc/STL_Extension/CGAL/iterator.h
2013-06-14 14:26:05 +02:00
Sébastien Loriot
b30d3daa2b
do not use exception in Object::assign. g++3.4 produces a segfault with -O2
2013-06-12 17:39:31 +02:00
Clement Jamin
bc360c8b13
Changes for GCC compilation + removed some trailing spaces
2013-06-07 17:40:53 +02:00
Clement Jamin
0e51e92656
Introduces a new CC_safe_handle class
...
Helper class which embed a `Compact_container` (or `Concurrent_compact_container`) iterator and is able to know if the pointee has been erased since the creation of the `CC_safe_handle` instance.
2013-06-06 16:49:23 +02:00
Sébastien Loriot
0c9656f553
add missing overload of operator= if EDG is defined
2013-06-04 16:53:05 +02:00
Sébastien Loriot
2997e8ae08
Dispatch_(or_drop_)output_iterator<V,O> now accepts a tuple V put in it ...
...
...and makes the correct dispatch to the output iterators in O
2013-05-31 17:20:47 +02:00
Clement Jamin
bbb5fec836
The Parallel_tag inherits Sequential_tag
2013-05-31 10:44:41 +02:00
Clement Jamin
81f9c675c5
P3::x/y/z() functions can now be any model of the concept of RealEmbeddable
2013-05-30 13:38:58 +02:00
Clement Jamin
f5fae5ab23
Smaller tag names + removed "Tag_non_blocking_with_mutexes" from documentation
2013-05-28 15:38:20 +02:00
Clement Jamin
127926aa14
Proof-reading + minor changes
...
Renamed unlock_all_tls_locked_locations => unlock_all_points_locked_by_this_thread
2013-05-28 15:07:20 +02:00
Clement Jamin
4a3a43d0e6
Minor fix + output
2013-05-23 17:48:32 +02:00
Clement Jamin
3a4caaaa1c
Changed the place of the erase counters.
...
Changed Compact_container_strategy_XXX::Uses_erase_counter type + moved the erase counters from Triangulation_ds_xxx_base_3 to Mesh_xxx_base_3.
2013-04-16 15:31:36 +02:00
Clement Jamin
2c2e1e3d7d
Code factorization + "manual" min/max for slightly better performance
2013-03-29 17:14:50 +01:00
Clement Jamin
1d3205942a
It's a bit faster not to use min/max to compute grid cell coords
2013-03-27 17:49:24 +01:00
Andreas Fabri
8a45fcea5a
Merge branch 'OLD' into Triangulation_2-NewPolylineConstraint-GF
...
Conflicts:
Triangulation_2/doc/Triangulation_2/Triangulation_2.txt
2013-03-21 13:41:53 +01:00
Sébastien Loriot
d6905c61be
Merge branch 'Kernel-replace_object-pmoeller-old' into Kernel-replace_object-pmoeller
...
Conflicts:
AABB_tree/include/CGAL/AABB_tree.h
Circular_kernel_2/include/CGAL/Circular_kernel_2/internal_functions_on_line_arc_2.h
Intersections_3/include/CGAL/Intersections_3/intersection_3_1_impl.h
Kernel_23/doc/Kernel_23/CGAL/intersections.h
Kernel_23/doc/Kernel_23/Concepts/FunctionObjectConcepts.h
STL_Extension/doc/STL_Extension/CGAL/iterator.h
2013-03-14 10:29:31 +01:00
Clement Jamin
b12a5e3c59
Implemented the "merge" function in the Concurrent_compact_container
2013-03-12 17:00:54 +01:00
Clement Jamin
6616582b14
Replaced tabs with spaces
2013-03-12 15:40:25 +01:00
Clement Jamin
8e800fdece
Replaced tabs with spaces
2013-03-12 15:39:25 +01:00
Clement Jamin
cad7496099
Removed "merge" and "reserve" since they are not implemented
2013-03-11 18:43:10 +01:00
Clement Jamin
1f0e994a00
Renamed a few functions + tabs to spaces conversion + benchmark output + minor changes
2013-03-11 15:46:27 +01:00
Clement Jamin
a7cfd06598
Replaced the unused pair<bool,int> returned by try_lock by a simple bool.
2013-03-08 16:47:37 +01:00
Clement Jamin
2796e63b86
Minor fix: "Base" doesn't need to be public.
2013-03-08 16:38:16 +01:00
Clement Jamin
3eae2927e7
Merge branch 'Mesh_3-parallel-cjamin-old' into Mesh_3-parallel-cjamin
2013-03-04 15:50:57 +01:00
Clement Jamin
2263fdf765
Clean-up
2013-02-28 15:05:35 +01:00
Clement Jamin
ab25d848b1
Moved the "no_spin" function parameter to a template parameter.
2013-02-22 15:47:32 +01:00
Clement Jamin
64a624c168
Removed some useless "virtual" + bugfix for the non-blocking specialization classes.
2013-02-22 13:42:18 +01:00
Laurent Rineau
2d8da664a3
Merge branch 'CGAL-fix_warnings-gdamiand'
...
Conflicts:
.gitignore
Skin_surface_3/examples/Skin_surface_3/CMakeLists.txt
2013-02-22 13:02:37 +01:00
Laurent Rineau
3f894697bc
New macros CGAL_assume(EX) and CGAL_assume_code(CODE)
...
CGAL_assume(EX) is like CGAL_assertion, but is not disabled in release
mode. In debug mode, it is similar to CGAL_assertion(). In release mode, it
uses builtins of the compilateur, like the MSVC __assume or the g++/clang
__builtin_unreachable to give an hint to the compiler that some situation
in the code cannot happen.
2013-02-20 18:34:15 +01:00
Clement Jamin
dac0e1c104
Moved Spatial_grid_lock_data_structure_3.h to STL_Extension
2013-02-18 16:44:00 +01:00
Clement Jamin
bce43fbb8e
Improved the way parallelism is handle in Mesh_3/Triangulation_3
...
Added a better support for parallelism in Triangulation_3.
Simplified how to enable/disable concurrency in Mesh_3.
Moved the Compact_container stategies to a new file.
2013-02-15 18:07:43 +01:00
Laurent Rineau
d19578725b
Fix warnings
2013-02-07 18:15:23 +01:00
Laurent Rineau
29c05b900b
Mark BOOST_STATIC_ASSERT with 'CGAL_UNUSED'
...
In order to fix such a warning from g++-4.8:
warning: typedef ‘boost_static_assert_typedef_241’ locally defined but
not used [-Wunused-local-typedefs]
then:
- create one macro CGAL_UNUSED that is "__attribute__ ((__unused__))"
with g++ or empty otherwise,
- use it after BOOST_STATIC_ASSERT in the definition of
CGAL_static_assertion.
2013-02-07 18:15:23 +01:00
Clement Jamin
cd83c4680a
Tags for concurrency
2013-02-06 18:15:25 +01:00
Sébastien Loriot
93df4bd3d5
typo while replacing boost::result_of to cpp11::result_of
2013-02-04 19:53:56 +01:00
Sébastien Loriot
f0f34d45fa
workaround to force the usage of the tr1 implementation of result_of from boost
...
see http://www.boost.org/doc/libs/1_52_0/libs/utility/utility.htm#result_of
2013-02-04 11:30:28 +01:00
Andreas Fabri
f9cd5ec08a
Merge remote-tracking branch 'origin/Triangulation_2-NewPolylineConstraint-GF' into Triangulation_2-NewPolylineConstraint-GF
...
Conflicts:
.gitattributes
2013-01-21 14:33:33 +01:00
Philipp Möller
0f34f2a89e
Merge branch 'Maintenance-include-less-boost-pmoeller'
2012-12-21 09:44:18 +01:00
Sébastien Loriot
82b2ebc865
apply the cpp0x namespace renaming in all files
2012-12-19 11:33:17 +01:00
Philipp Möller
71ea8e6e22
Minimal boost includes
...
Replace type_traits.hpp and utility.hpp with the respective
fine-grained includes.
2012-12-14 18:13:59 +01:00
Philipp Möller
a9cdb27b78
Remove tautological precondition
2012-12-12 11:28:57 +01:00
Philipp Möller
728cfaa456
Remove CGAL::Overload
...
Equivalent and better functionality is provided by
http://www.boost.org/libs//functional/overloaded_function/doc/html/index.html
2012-12-07 18:00:46 +01:00
Philipp Möller
d198458ca7
Merge branch 'origin-gsoc2011-boost_object-pmoeller' into Kernel-replace_object-pmoeller
...
Conflicts:
.gitattributes
AABB_tree/doc_tex/AABB_tree_ref/AABBGeomTraits.tex
AABB_tree/doc_tex/AABB_tree_ref/AABBTraits.tex
AABB_tree/doc_tex/AABB_tree_ref/AABB_traits.tex
AABB_tree/include/CGAL/AABB_traits.h
AABB_tree/include/CGAL/AABB_tree.h
AABB_tree/test/AABB_tree/AABB_test_util.h
Arrangement_on_surface_2/doc_tex/Arrangement_on_surface_2/arr_queries.tex
Arrangement_on_surface_2/doc_tex/Arrangement_on_surface_2_ref/Arr_trapezoid_ric_point_location.tex
Arrangement_on_surface_2/doc_tex/Arrangement_on_surface_2_ref/intro.tex
Arrangement_on_surface_2/include/CGAL/Arr_batched_point_location.h
Arrangement_on_surface_2/include/CGAL/Arr_point_location/Arr_lm_generator_base.h
Arrangement_on_surface_2/include/CGAL/Arr_point_location/Arr_lm_random_generator.h
Arrangement_on_surface_2/include/CGAL/Arr_point_location/Arr_trapezoid_ric_pl_impl.h
Arrangement_on_surface_2/include/CGAL/Arr_point_location/Arr_walk_along_line_pl_impl.h
Arrangement_on_surface_2/include/CGAL/Arr_trapezoid_ric_point_location.h
Arrangement_on_surface_2/test/Arrangement_on_surface_2/point_location.cpp
Circular_kernel_2/include/CGAL/Circular_kernel_2/internal_functions_on_line_arc_2.h
Circular_kernel_3/include/CGAL/Circular_kernel_3/internal_functions_on_circular_arc_3.h
Circular_kernel_3/include/CGAL/Circular_kernel_3/internal_functions_on_line_arc_3.h
Circular_kernel_3/include/CGAL/Circular_kernel_3/internal_functions_on_sphere_3.h
Filtered_kernel/include/CGAL/Lazy.h
Filtered_kernel/include/CGAL/Lazy_kernel.h
Intersections_2/include/CGAL/Triangle_2_Iso_rectangle_2_intersection.h
Intersections_2/test/Intersections_2/test_intersections_2.cpp
Intersections_3/test/Intersections_3/test_intersections_3.cpp
Kernel_23/doc_tex/Kernel_23_ref/intersection.tex
Kernel_23/include/CGAL/Kernel/Type_mapper.h
Kernel_d/doc_tex/Kernel_d_ref/Kernel.tex
2012-12-04 17:57:53 +01:00
Sébastien Loriot
14c8641377
Convert all CRLF files to LF
2012-12-04 16:44:49 +01:00
Philipp Möller
465c5b265a
Shuffle two undocumented headers backwards.
...
Also change the 2 places they were used in.
2012-11-17 02:16:32 +01:00
Philipp Möller
09e65b9c40
Drop the include guard and remove assert_equal_types
...
The include guard is unnecessary (tags.h is part of basic and no one
else defines it anymore) and it shouldn't be used anyway.
assert_equal_types doesn't do it's job completely and it's usage in
Nef_2 has been replaced.
2012-11-17 01:56:05 +01:00
Clément Jamin
4e1f8aa4f8
Merge from next
2012-10-15 08:28:01 +00:00
Laurent Rineau
7bc300794d
Fix last errors in headers of CGAL foundations
...
All were missing #include.
2012-10-08 09:03:50 +00:00
Philipp Möller
91f88474a8
The conditional code does not only require variadic templates but also
...
a variadic implementation of tuple. One would think that you never run
in a situation where you only have variadics but no tuple. But thanks
to clang pretending to be a gcc 4.2.1, some configuration code might
think otherwise.
2012-10-05 18:15:46 +00:00
Laurent Rineau
5c757a0a4d
Fix/Improve all #include of all STL_Extension headers
2012-10-05 14:24:38 +00:00
Clément Jamin
2366fee1e1
Merge from next
2012-09-28 14:51:02 +00:00
Philipp Möller
ab5c017c08
Unconditionally disable NO_TR1 defines.
...
Those cause trouble, because on MSVC the include paths for tr1
components are different from gcc. Instead of fixing up the include
paths depending on platform, just never use a tr1 component. Nothing
of value is lost compared to the boost equivalents and it removes
another code-path.
2012-09-28 13:15:14 +00:00
Laurent Rineau
90414d195f
Move <CGAL/Testsuite/use.h> to <CGAL/use.h> (in the Installation package)
...
That is a followup to the following commit:
| ------------------------------------------------------------------------
| r71090 | pmoeller | 2012-08-07 13:04:32 +0200 (Tue, 07 Aug 2012) | 6 lines
| Changed paths:
| M /branches/next/Alpha_shapes_2/include/CGAL/Alpha_shape_2.h
| M /branches/next/Circulator/include/CGAL/circulator.h
| M /branches/next/Convex_decomposition_3/include/CGAL/Convex_decomposition_3/Reflex_vertex_searcher.h
| M /branches/next/Intersections_3/test/Intersections_3/bbox_other_do_intersect_test.cpp
| M /branches/next/Kernel_d/include/CGAL/Cartesian_d.h
| M /branches/next/Mesh_3/include/CGAL/IO/File_medit.h
| M /branches/next/Mesh_3/include/CGAL/Mesh_cell_criteria_3.h
| M /branches/next/Mesh_3/include/CGAL/Mesh_edge_criteria_3.h
| M /branches/next/Mesh_3/include/CGAL/Mesh_facet_criteria_3.h
| M /branches/next/Mesh_3/include/CGAL/make_mesh_3.h
| M /branches/next/Nef_2/include/CGAL/Bounded_kernel.h
| M /branches/next/Nef_2/include/CGAL/Nef_polyhedron_2.h
| M /branches/next/Nef_3/include/CGAL/Nef_3/ID_support_handler.h
| M /branches/next/Nef_3/include/CGAL/Nef_3/Infimaximal_box.h
| M /branches/next/Nef_3/include/CGAL/Nef_3/vertex_cycle_to_nef_3.h
| M /branches/next/Nef_3/include/CGAL/Nef_polyhedron_3.h
| M /branches/next/Nef_3/test/Nef_3/nef_union_error_llvm.cpp
| M /branches/next/Nef_S2/include/CGAL/Nef_S2/SM_overlayer.h
| M /branches/next/OpenNL/include/CGAL/OpenNL/blas.h
| M /branches/next/Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_3.h
| M /branches/next/Point_set_processing_3/include/CGAL/mst_orient_normals.h
| M /branches/next/QP_solver/include/CGAL/QP_solver/QP_functions_impl.h
| M /branches/next/STL_Extension/include/CGAL/iterator.h
| M /branches/next/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_simple_site_2.h
| M /branches/next/Subdivision_method_3/include/CGAL/Polyhedron_decorator_3.h
| M /branches/next/Subdivision_method_3/include/CGAL/Subdivision_mask_3.h
| M /branches/next/Surface_mesher/include/CGAL/Surface_mesh_default_criteria_3.h
| M /branches/next/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Adaptation_traits_functors.h
| M /branches/next/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Default_site_inserters.h
| M /branches/next/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Default_site_removers.h
|
| WARNFIX: Silence a good part of unused variable/parameter warnings.
|
| Wextra results in a dreadful wall of yellow in the test-suite and is
| scary when using CGAL. Reduce some of the noise by silencing the
| obvious cases with CGAL_USE or comments.
|
| ------------------------------------------------------------------------
The reason is that everything from CGAL/Testsuite/ is removed in public
releases (that was discussed at a CGAL developers meetings, long ago). That
means that r71090 introduced compilation errors undetectable by the tests
of internal releases. I hope that the minutes of that developers meeting
say that I was against the removal of headers between internal and public
releases! -- Laurent Rineau
2012-08-09 15:34:08 +00:00
Philipp Möller
79b30908d5
WARNFIX: Silence a good part of unused variable/parameter warnings.
...
Wextra results in a dreadful wall of yellow in the test-suite and is
scary when using CGAL. Reduce some of the noise by silencing the
obvious cases with CGAL_USE or comments.
2012-08-07 11:04:32 +00:00
Clément Jamin
68fbaa4373
Bugfix + minor changes
2012-07-11 14:21:17 +00:00
Clément Jamin
41f9cbe411
Sequential Mesh_3 can now be compiled by GCC.
2012-07-09 15:44:58 +00:00
Laurent Rineau
69ef17087e
Fix a warning of clang
...
The warning was:
In file included from [...]/cmake/platforms/x86-64_Linux-2.6_llvm-clang-with-g++-4.6.2_F16/test/Algebraic_foundations/Chinese_remainder_traits.cpp:34:
In file included from [...]/include/CGAL/Polynomial.h:44:
In file included from [...]/include/CGAL/Flattening_iterator.h:24:
In file included from [...]/include/CGAL/Nested_iterator.h:29:
[...]/include/CGAL/iterator.h:1240:10: warning: class template 'Derivator' was previously declared as a struct template [-Wmismatched-tags]
friend class internal::Derivator;
^
[...]/include/CGAL/iterator.h:1193:8: note: previous use is here
struct Derivator
^
[...]/include/CGAL/iterator.h:1240:10: note: did you mean struct here?
friend class internal::Derivator;
^~~~~
struct
[...]/include/CGAL/iterator.h:1299:10: warning: class template 'Derivator' was previously declared as a struct template [-Wmismatched-tags]
friend class internal::Derivator;
^
[...]/include/CGAL/iterator.h:1193:8: note: previous use is here
struct Derivator
^
[...]/include/CGAL/iterator.h:1299:10: note: did you mean struct here?
friend class internal::Derivator;
^~~~~
struct
2 warnings generated.
2012-06-20 10:18:05 +00:00
Clément Jamin
b268598665
Replace LINKED_WITH_TBB by CGAL_LINKED_WITH_TBB.
2012-06-13 09:33:08 +00:00
Clément Jamin
b948543cc6
Use of a Tag (template parameter) to activate/deactivate concurrency in Mesh_3, instead of #ifdef macros.
2012-06-09 08:52:37 +00:00
Philipp Möller
dd7403c765
Change the namespace to cpp11 and add an alias cpp0x.
2012-05-24 11:23:21 +00:00
Philipp Möller
5953dd364d
Add front/back, splicing and swap to Skiplist.
2012-05-15 08:17:19 +00:00
Philipp Möller
75378f55ce
Merged ^/branches/next for the test-suite run.
2012-05-10 17:34:30 +00:00
Philipp Möller
cfea03d54b
Dropped out-dated examples, simplify.cpp example compiles.
2012-05-10 13:35:00 +00:00
Philipp Möller
ba92d7b9df
Added erase member function.
2012-05-10 09:50:01 +00:00
Philipp Möller
38228d6982
Added conversions to Skiplist, integrated it somewhat into
...
constraint_hierarchy, merged some code there and added a Default to
the triangulation.
2012-05-09 13:39:36 +00:00
Philipp Möller
58d0e82be4
Drop the storage container from Skiplist and use the all container
...
instead for storage.
2012-05-09 10:25:14 +00:00
Philipp Möller
c6e35c0990
Switched Skiplist to use boost::intrusive internally to get non-const
...
iterators.
2012-05-04 16:49:51 +00:00
Philipp Möller
117e3a9211
Add Skiplist and tests in STL_Extension.
2012-05-04 13:35:30 +00:00
Clément Jamin
7d1d94f42e
Merge from next
2012-04-24 16:24:13 +00:00
Philipp Möller
17797b7271
Merge next into this branch. There have been conflicts in the
...
AABB_tree documentation, Intersections_3 and Arrangement_on_surface_2.
The merge also introduced a regression for a bug fixed in R68387 which
fixed a bug in Triangle_3 Segment_3 intersections. The relevant
testcase is in triangle_other_intersection_test.cpp.
2012-04-24 15:06:19 +00:00
Laurent Rineau
4c186e9417
Oops: std::tr1::get(std::pair) is in <tr1/utility>
2012-04-20 10:34:06 +00:00
Laurent Rineau
66ec3ee6b8
I was wrong: get<N>(std::pair) was already in TR1.
...
Strange that it is not in Boost.
2012-04-20 10:30:10 +00:00
Laurent Rineau
a40c0bf6a8
A branch to extend the CGAL::cpp0x::get function template in <CGAL/tuple.h>
2012-04-19 12:28:12 +00:00
Philipp Möller
542f5d9c51
Merged ^/branches/next here
2012-04-16 08:53:21 +00:00
Laurent Rineau
eef911bc02
New MPL type checking: is_streamable
...
is_streamable is a meta-function that checks if a type is streamable
is_streamable<T>::value is true iff the type T has stream operators <<
and >>. Otherwise it is false.
That commit adds a new header, used nowhere, and a new test. That cannot
break anything. I do it directly to 'next', with my own approval.
2012-04-13 10:40:12 +00:00
Laurent Rineau
f22ae81a91
Trivial bug: add missing #include
...
If CGAL::cpp0x::tuple is Boosts implementation, one wants equality operator
operator==.
Add the corresponding test in test/STL_Extension/.
2012-04-12 14:35:20 +00:00
Clément Jamin
69272e4d9a
Test with a worksharing strategy (based on TBB task scheduler) + test with parallel_do.
2012-04-10 13:23:51 +00:00
Laurent Rineau
1f45a55986
Merge changes from next;
2012-04-05 10:23:08 +00:00
Philipp Möller
042482d986
Removed unused Identity_iterator
...
Identity_iterator was neither documented nor used anywhere throughout
the code base and served no real purpose and can easier be implemented
(if really needed) with iterator_adaptor or the iterator helpers in
boost operators.
2012-03-23 17:25:52 +00:00
Clément Jamin
512f0b12bd
Missing "mutable" on the mutex
2012-03-22 17:50:17 +00:00
Clément Jamin
4ccf8e0447
First working parallel version. It's not faster than the sequential one, but not slower neither (depends if you're optimistic or not). The good news is that we found all (?) the sections to protect or to make thread-local.
2012-03-22 17:07:03 +00:00
Clément Jamin
d56d031aa7
Added a constructor to enable conversion from Filter_iterator to const Filter_iterator.
...
Added an end() member function.
2012-03-15 15:07:16 +00:00
Clément Jamin
9aefad0454
Added a few comments
2012-03-15 14:59:43 +00:00
Clément Jamin
09de63eb4a
Brand new Concurrent_compact_container, not based on tbb::concurrent_vector as it was causing compiler nightmare (C1060).
...
Anyway, it's faster and much more scalable... so no regrets.
2012-03-14 17:06:13 +00:00
Clément Jamin
401568c63c
Added the option to use Boost filter_iterator, and a few member functions.
2012-03-09 17:34:19 +00:00
Clément Jamin
1192e188cc
Creates a Concurrent_compact_container, based on tbb::concurrent_vector. Some member functions (size, etc.) are missing. To be continued...
2012-03-09 11:44:41 +00:00
Clément Jamin
5a5d838497
Added an operator< to Filter_iterator
2012-03-09 11:43:02 +00:00
Laurent Rineau
cb38257cd2
Reimplementation of std::nth_element and std::random_shuffle
...
For the use of Spatial_sorting, we want an implementation of nth_element
and random_shuffle that produces the same result on all platforms, for a
given seeded random generator.
2012-03-09 11:37:14 +00:00
Philipp Möller
9fbb25d335
* forgot to prettify entirely
2012-03-07 14:07:14 +00:00
Philipp Möller
9881058185
* added the implementation of random_shuffle to STL_Extension
2012-03-07 14:00:44 +00:00
Clément Jamin
7137347f95
Added::process_a_batch_of_elements(...) which use parallel_for to insert batch of facets/cells. For now, the body is protected by a scoped_lock to avoid races => no speedup!
2012-03-07 13:57:16 +00:00
Clément Jamin
9ae59efaaf
Merge from next
2012-02-15 15:58:17 +00:00
Clément Jamin
4051f03a62
Added a "Strategy" template parameter which allows to optionally add a counter of "erase" (= put on free list) inside each element.
2012-02-13 09:04:24 +00:00
Laurent Rineau
0b760d0fbb
Remove warnings about static assertions
2012-01-23 12:29:17 +00:00
Sébastien Loriot
3795b8dc9c
revert part of my commit 67333
...
(windows testsuite was actually broken so it was working:)
2012-01-20 15:01:53 +00:00
Sébastien Loriot
a1fdcd6170
explicitly check that the Interval template parameter is an interval.
...
MSVC is not able to eliminate the function even when the functor used
is Null_functor that has no result_type.
2012-01-20 13:08:32 +00:00
Sébastien Loriot
45e7c06392
revert r67297.
...
Fix test it in candidates
2012-01-19 10:08:57 +00:00
Sébastien Loriot
f17ccbb823
explicitly check that the Interval template parameter is an interval.
...
MSVC is not able to eliminate the function even when the functor used
is Null_functor that has no result_type.
2012-01-19 08:49:20 +00:00
Andreas Fabri
cebb7314bc
Fix for Windows 'min/max' bug
2012-01-18 11:05:35 +00:00
Laurent Rineau
5b5dd33848
merge changes from next
2012-01-09 12:33:39 +00:00
Philipp Möller
b8a96e9114
Merged next to this branch.
2011-12-06 17:11:01 +00:00
Philipp Möller
0e0a200646
* Using result_of instead of Qualified_result_of
...
* limited refactoring in the lazy kernel
* still bugs in circular_3
* still specialization problem with iso_rectangle
2011-11-23 17:52:38 +00:00
Sébastien Loriot
5fd945cd3c
is_iterator now requests the type to be either a pointer or
...
to provide all 5 nested types provided by iterator_traits
2011-11-23 11:29:15 +00:00
Philipp Möller
c935a9dbc1
Fixed a crash when calling type() on an uninitialized Object
2011-11-15 15:05:20 +00:00
Philipp Möller
71c1a44f4f
Safe bool conversion for object including tests
2011-11-08 11:01:59 +00:00
Philipp Möller
69add44ef4
Object switched to any internally
2011-11-07 16:22:56 +00:00
Philipp Möller
64450662ac
Overload now uses tuples directly and has improved documentation
2011-11-04 17:54:15 +00:00
Marc Glisse
dc3b382bd4
Simplify the code and help with thread-safety by reading the return value of operator--.
2011-10-29 07:18:10 +00:00
Laurent Rineau
1efe6ff9c4
merge from next, again
2011-10-13 10:25:40 +00:00
Laurent Rineau
b41acfcc5e
Revert those two commits:
...
| ------------------------------------------------------------------------
| r65838 | afabri | 2011-10-12 13:01:14 +0200 (Wed, 12 Oct 2011) | 5 lines
| Changed paths:
| M /branches/next/STL_Extension/include/CGAL/assertions.h
|
| When CGAL_NO_ASSERTIONS, fix CGAL_static_assertion
|
| CGAL_static_assertion cannot be "static_cast<void>(0)" because that
| macro can also be used in a class or namespace scope.
|
| ------------------------------------------------------------------------
| r65833 | lrineau | 2011-10-11 23:43:39 +0200 (Tue, 11 Oct 2011) | 6 lines
| Changed paths:
| M /branches/next/STL_Extension/include/CGAL/assertions.h
|
| Avoid a warning with -ansi -pedantic when CGAL_NO_ASSERTIONS
|
| When CGAL_NO_ASSERTIONS is defined (when NDEBUG is defined, for example),
| "CGAL_static_assertion(true);" must not be expanded to ";", to avoid a
| pedantic warning "extra ;".
|
| ------------------------------------------------------------------------
That was just a very wrong way to fix a pedantic warning: the new
implementations were buggy.
2011-10-13 10:24:14 +00:00
Marc Glisse
4fff839d84
Revert, was supposed to go to candidates...
2011-10-12 15:00:55 +00:00
Marc Glisse
03ff622be8
Help with a future thread-safe version (and make the code shorter).
2011-10-12 14:41:53 +00:00
Laurent Rineau
5946c69608
merge from next
2011-10-12 13:52:06 +00:00
Andreas Fabri
eba24795fa
When CGAL_NO_ASSERTIONS, fix CGAL_static_assertion
...
CGAL_static_assertion cannot be "static_cast<void>(0)" because that
macro can also be used in a class or namespace scope.
2011-10-12 11:01:14 +00:00
Laurent Rineau
44be6552ef
Avoid a warning with -ansi -pedantic when CGAL_NO_ASSERTIONS
...
When CGAL_NO_ASSERTIONS is defined (when NDEBUG is defined, for example),
"CGAL_static_assertion(true);" must not be expanded to ";", to avoid a
pedantic warning "extra ;".
2011-10-11 21:43:39 +00:00
Sébastien Loriot
91a5327fa8
change LGPLv2 -> LGPLv3
2011-10-10 13:48:25 +00:00
Andreas Fabri
cbfe32ce37
Add declspecs for Visual C++ so that we can build dlls
2011-10-05 19:12:23 +00:00
Sébastien Loriot
62a6daf1da
add to Compact_container iterator type operators > >= and <=
2011-10-04 11:25:45 +00:00
Laurent Rineau
fdd69b61a3
Rename macro of Compact_container to avoid potential future conflict
...
Add the _COMPACT_CONTAINER_ infix:
CGAL_INIT_BLOCK_SIZE -> CGAL_INIT_COMPACT_CONTAINER_BLOCK_SIZE
CGAL_INCREMENT_BLOCK_SIZE -> CGAL_INCREMENT_COMPACT_CONTAINER_BLOCK_SIZE
2011-09-29 14:21:10 +00:00
Guillaume Damiand
71d1d6f56a
Add reserve method in compact container (include file, plus ref manual, plus test).
2011-09-27 12:01:42 +00:00
Sébastien Loriot
dff6dda8b3
Remove from copyright holder
...
Freie Universitaet Berlin (Germany), Martin-Luther-University Halle-Wittenberg
(Germany) and RISC Linz (Austria) as they transfer the copyright to other
sites.
2011-09-21 19:46:31 +00:00
Sébastien Loriot
7ec484eac7
merge next into feature branch
2011-09-09 06:44:09 +00:00
Guillaume Damiand
a29c905ee0
Replace BOOST_STATIC_ASSERT by CGAL_static_assertion.
2011-08-31 14:30:07 +00:00
Philipp Möller
f9b288db90
Merged branch ^/branches/features/gsoc2011-copy_n-pmoeller.
...
Small feature page: https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/Replace_copy_n
2011-08-26 14:34:10 +00:00
Laurent Rineau
1e3c229440
merge from next
2011-08-26 13:55:12 +00:00
Philipp Möller
cc01731a34
Fixed a namespace bug with C++0x disabled
2011-08-25 10:11:06 +00:00
Marc Glisse
ab56912a06
s/static_assert/CGAL_static_assertion_msg/
2011-08-08 16:48:34 +00:00
Philipp Möller
353241ec7d
Interoperability for Dispatch_output_iterator with variants, documentation and tests
2011-07-22 01:22:32 +00:00
Philipp Möller
83fc8e4bf3
Added implicit conversion from variant to object
2011-07-20 19:26:15 +00:00
Philipp Möller
ab7b592514
Made optional< variant > to Object conversion safer
2011-07-15 13:57:25 +00:00
Philipp Möller
6580eb504d
merged next
2011-07-05 09:15:29 +00:00
Andreas Fabri
01f978de36
partial undo: remove debug output
2011-06-30 22:11:47 +00:00
Andreas Fabri
7dbddbc945
Add CR in the last line to quiet Intel C++
2011-06-30 22:09:49 +00:00
Philipp Möller
a67a03d297
Fixed naming and include guard
2011-06-23 14:02:53 +00:00
Philipp Möller
d98d1d057f
Object: Made implicit conversion from optional<variant> safer
...
Overload: Added generalised overloads and tests
2011-06-23 13:09:49 +00:00
Philipp Möller
b4c1504975
Added conversion from optional<variant<...>>
2011-06-22 15:27:48 +00:00
Philipp Möller
ba7f258db8
Added implicit conversion from variant to object
...
Added test
2011-06-22 15:19:20 +00:00
Laurent Rineau
4cf99c4a3d
Fix mutable_queue.hpp with old Boost versions
...
boost/property_map.hpp has moved in recent Boost versions.
2011-06-21 10:22:47 +00:00
Sébastien Loriot
f488e75869
BUGFIX: change internal boost namespace to boost_ to avoid ambiguities
...
of boost:: in internal namespace (vs ::boost::)
2011-06-17 13:22:42 +00:00
Sébastien Loriot
b80fd74b73
BUGFIX: this is safer to compare to the size of indices
2011-06-17 13:07:06 +00:00
Sébastien Loriot
acb0950398
BUGFIX (together with 64192,64193,64194):
...
Modifiable_priority_queue no longer depends on non-documented
boost code. This code has been copied into CGAL.
Modify boost's mutable_queue to have a constructor initializing
indices of elements not in the queue to the maximum number of elements.
Update pop to maintain this property
2011-06-17 13:04:58 +00:00
Sébastien Loriot
2254e9b4f8
reverse modifications of Modifiable_priority_queue.h should not be modified in 64193
2011-06-17 12:48:11 +00:00
Sébastien Loriot
cacb699937
put boost file inside namespace CGAL::internal::boost
...
add URL and ID tags
update #ifndef macros
2011-06-17 12:45:16 +00:00
Sébastien Loriot
6838175967
plain copy of files from the release 1.46.1 (BOOST_VERSION 104601)
...
from undocumented stuff for internal use in CGAL (Mofiable_priority_queue.h).
Modifications of these files to come in another commit
2011-06-17 12:38:15 +00:00
Sébastien Loriot
65d6249062
missing include
2011-06-17 08:46:36 +00:00
Guillaume Damiand
d2d010909f
merge with next
2011-06-09 13:51:23 +00:00
Philipp Möller
fb85f14247
Added the imports to namespace cpp0x.
2011-06-07 12:04:59 +00:00
Philipp Möller
3144673c5b
Deprecated successor and predecessor
2011-06-07 10:44:21 +00:00
Marc Glisse
dd2aba7fe6
The goal was to be able to use iterator_traits safely, so we don't want arrays...
2011-05-30 15:27:09 +00:00
Sébastien Loriot
1ad7bac55b
change license from QPL to LGPL
2011-05-24 13:03:39 +00:00
Marc Glisse
d64e8a9371
Fix misinterpretation of decay
2011-05-13 18:37:13 +00:00
Guillaume Damiand
c283ac6689
Backport of modifs made in Linear_cell_complex-gdamiand branch.
2011-05-10 07:14:42 +00:00
Guillaume Damiand
046cc5a048
merge from next and from candidates/Combinatorial_map
2011-05-05 12:29:06 +00:00
Sébastien Loriot
0a1b070ed1
temporary fix for visual
2011-04-29 14:32:31 +00:00
Sébastien Loriot
5921eca974
A null functor should not defined a result_type
...
nor a second_argument_type (this allows using SFINAE
on some functions).
2011-04-13 08:26:09 +00:00
Sébastien Loriot
b30c983e3c
bugfix: the derivation must be public
2011-03-17 10:16:30 +00:00
Marc Glisse
879c4eb81c
Enable implicit Lazy_exact_nt conversions only if there exists an implicit
...
conversion between the exact types.
I'll add something similar for explicit conversions if required.
2011-03-08 10:27:31 +00:00
Sébastien Loriot
d19e13d863
move Modifiable_priority_queue in STL_Extension as it is used by Mesh_3
2011-02-15 16:24:09 +00:00
Guillaume Damiand
261ad9eaf3
Add the 4 operators < <= > >= to compare iterators.
...
Now we can compare two handles (as for example Halfedge_haldle) which is usefull for example to define directly a std::set<Halfedge_handle> (or a std::map) without need to define a comparator class.
NOTE: this modification was preapproved by the released manager.
2011-02-15 12:50:21 +00:00
Marc Glisse
f01ec07125
New is_iterator test for immediate use in PCA.
2011-01-18 10:50:05 +00:00
Andreas Fabri
00a7b64e89
Declare the operator const
2010-12-12 21:32:16 +00:00
Sébastien Loriot
f6afbd8a94
correct filter_output_iterator:
...
operator*, operator++ and operator++(int) was not working with all possible iterators
2010-09-02 06:30:35 +00:00
Laurent Rineau
49c71b30ac
Merge CGAL-3.7-branch:
...
| ------------------------------------------------------------------------
| r58172 | lrineau | 2010-08-20 11:21:30 +0200 (Fri, 20 Aug 2010) | 3 lines
| Changed paths:
| M /branches/CGAL-3.7-branch/Arithmetic_kernel/test/Arithmetic_kernel/CMakeLists.txt
|
| Fix buggy CMake logic: the GMP_arithmetic_kernel.cpp must me configured
| only once.
|
| ------------------------------------------------------------------------
| r58173 | lrineau | 2010-08-20 11:25:35 +0200 (Fri, 20 Aug 2010) | 2 lines
| Changed paths:
| M /branches/CGAL-3.7-branch/BGL/examples/BGL_arrangement_2
| M /branches/CGAL-3.7-branch/BGL/examples/BGL_arrangement_2/dual.cpp
| M /branches/CGAL-3.7-branch/BGL/examples/BGL_arrangement_2/primal.cpp
|
| Fix warning about deprecated included headers.
|
| ------------------------------------------------------------------------
| r58174 | lrineau | 2010-08-20 11:39:25 +0200 (Fri, 20 Aug 2010) | 3 lines
| Changed paths:
| M /branches/CGAL-3.7-branch/Boolean_set_operations_2/test/Boolean_set_operations_2/test_polygon_validation.cpp
|
| Modify the test file so that the check function do not display warnings
| that result in a 'w' in the testsuite.
|
| ------------------------------------------------------------------------
| r58175 | lrineau | 2010-08-20 11:45:26 +0200 (Fri, 20 Aug 2010) | 9 lines
| Changed paths:
| M /branches/CGAL-3.7-branch/GraphicsView/demo/Bounding_volumes/Bounding_volumes.cpp
|
| Fix warnings:
|
| test/Bounding_volumes_Demo/Bounding_volumes.cpp: In constructor `MainWindow::MainWindow()':
| test/Bounding_volumes_Demo/Bounding_volumes.cpp:71: warning: `MainWindow::P' will be initialized after
| test/Bounding_volumes_Demo/Bounding_volumes.cpp:120: warning: base `CGAL::Qt::DemosMainWindow'
| test/Bounding_volumes_Demo/Bounding_volumes.cpp:120: warning: when initialized here
| test/Bounding_volumes_Demo/Bounding_volumes.cpp: In member function `void MainWindow::update()':
| test/Bounding_volumes_Demo/Bounding_volumes.cpp:247: warning: comparison between signed and unsigned integer expressions
|
| ------------------------------------------------------------------------
| r58177 | lrineau | 2010-08-20 11:47:06 +0200 (Fri, 20 Aug 2010) | 3 lines
| Changed paths:
| M /branches/CGAL-3.7-branch/Min_circle_2/include/CGAL/Min_circle_2.h
|
| Fix warning:
| include/CGAL/Min_circle_2.h:197: warning: comparison between signed and unsigned integer expressions
|
| ------------------------------------------------------------------------
| r58178 | lrineau | 2010-08-20 11:49:09 +0200 (Fri, 20 Aug 2010) | 4 lines
| Changed paths:
| M /branches/CGAL-3.7-branch/STL_Extension/include/CGAL/assertions.h
|
| Avoid a warning if NDEBUG and CGAL_NDEBUG are both defined:
|
| include/CGAL/assertions.h:59:1: warning: "CGAL_NDEBUG" redefined
|
| ------------------------------------------------------------------------
| r58179 | lrineau | 2010-08-20 11:50:54 +0200 (Fri, 20 Aug 2010) | 8 lines
| Changed paths:
| M /branches/CGAL-3.7-branch/GraphicsView/include/CGAL/Qt/GraphicsViewCircularArcInput.h
|
| Fix a warning:
|
| include/CGAL/Qt/GraphicsViewCircularArcInput.h: In constructor 'CGAL::Qt::GraphicsViewCircularArcInput<K>::GraphicsViewCircularArcInput(QObject*, QGraphicsScene*) [with K = CGAL::Circular_kernel_2<CGAL::Cartesian<CGAL::Quotient<CGAL::MP_Float> >, CGAL::Algebraic_kernel_for_circles_2_2<CGAL::Quotient<CGAL::MP_Float> > >]':
| cmake/platforms/i686_Linux-2.6_g++-4.1.2_CentOS-5.1/test/Circular_kernel_2_Demo/Circular_kernel_2.cpp:107: instantiated from here
| include/CGAL/Qt/GraphicsViewCircularArcInput.h:73: warning: 'CGAL::Qt::GraphicsViewCircularArcInput<CGAL::Circular_kernel_2<CGAL::Cartesian<CGAL::Quotient<CGAL::MP_Float> >, CGAL::Algebraic_kernel_for_circles_2_2<CGAL::Quotient<CGAL::MP_Float> > > >::scene_' will be initialized after
| include/CGAL/Qt/GraphicsViewCircularArcInput.h:68: warning: 'int CGAL::Qt::GraphicsViewCircularArcInput<CGAL::Circular_kernel_2<CGAL::Cartesian<CGAL::Quotient<CGAL::MP_Float> >, CGAL::Algebraic_kernel_for_circles_2_2<CGAL::Quotient<CGAL::MP_Float> > > >::count'
| include/CGAL/Qt/GraphicsViewCircularArcInput.h:79: warning: when initialized here
|
| ------------------------------------------------------------------------
| r58180 | lrineau | 2010-08-20 11:56:19 +0200 (Fri, 20 Aug 2010) | 21 lines
| Changed paths:
| M /branches/CGAL-3.7-branch/Convex_hull_d/include/CGAL/Delaunay_d.h
|
| Fix warnings:
|
| include/CGAL/Delaunay_d.h: In member function 'CGAL::Delaunay_d<R_, Lifted_R_>::Simplex_iterator& CGAL::Delaunay_d<R_, Lifted_R_>::Simplex_iterator::operator++() [with R_ = CGAL::Cartesian_d<double, CGAL::Linear_algebraCd<double, std::allocator<double> > >, Lifted_R_ = CGAL::Cartesian_d<double, CGAL::Linear_algebraCd<double, std::allocator<double> > >]':
| include/CGAL/Delaunay_d.h:1011: instantiated from 'std::list<typename CGAL::Delaunay_d<R_, Lifted_R_>::Simplex_handle, std::allocator<typename CGAL::Delaunay_d<R_, Lifted_R_>::Simplex_handle> > CGAL::Delaunay_d<R_, Lifted_R_>::all_simplices(CGAL::Delaunay_d<R_, Lifted_R_>::Delaunay_voronoi_kind) const [with R_ = CGAL::Cartesian_d<double, CGAL::Linear_algebraCd<double, std::allocator<double> > >, Lifted_R_ = CGAL::Cartesian_d<double, CGAL::Linear_algebraCd<double, std::allocator<double> > >]'
| cmake/platforms/i686_Linux-2.6_g++-4.3.3_CentOS-5.1-O2/test/Convex_hull_d/delaunay_d-test.cpp:74: instantiated from here
| include/CGAL/Delaunay_d.h:229: warning: suggest parentheses around && within ||
| include/CGAL/Delaunay_d.h: In member function 'CGAL::Delaunay_d<R_, Lifted_R_>::Simplex_iterator& CGAL::Delaunay_d<R_, Lifted_R_>::Simplex_iterator::operator++() [with R_ = CGAL::Homogeneous_d<CGAL::Gmpz, CGAL::Linear_algebraHd<CGAL::Gmpz, std::allocator<CGAL::Gmpz> > >, Lifted_R_ = CGAL::Homogeneous_d<CGAL::Gmpz, CGAL::Linear_algebraHd<CGAL::Gmpz, std::allocator<CGAL::Gmpz> > >]':
| include/CGAL/Delaunay_d.h:1011: instantiated from 'std::list<typename CGAL::Delaunay_d<R_, Lifted_R_>::Simplex_handle, std::allocator<typename CGAL::Delaunay_d<R_, Lifted_R_>::Simplex_handle> > CGAL::Delaunay_d<R_, Lifted_R_>::all_simplices(CGAL::Delaunay_d<R_, Lifted_R_>::Delaunay_voronoi_kind) const [with R_ = CGAL::Homogeneous_d<CGAL::Gmpz, CGAL::Linear_algebraHd<CGAL::Gmpz, std::allocator<CGAL::Gmpz> > >, Lifted_R_ = CGAL::Homogeneous_d<CGAL::Gmpz, CGAL::Linear_algebraHd<CGAL::Gmpz, std::allocator<CGAL::Gmpz> > >]'
| cmake/platforms/i686_Linux-2.6_g++-4.3.3_CentOS-5.1-O2/test/Convex_hull_d/delaunay_d-test.cpp:162: instantiated from here
| include/CGAL/Delaunay_d.h:229: warning: suggest parentheses around && within ||
| include/CGAL/Delaunay_d.h: In constructor 'CGAL::Delaunay_d<R_, Lifted_R_>::Simplex_iterator::Simplex_iterator(CGAL::Delaunay_d<R_, Lifted_R_>*, typename CGAL::Convex_hull_d<Lifted_R_>::Simplex_iterator, CGAL::Delaunay_d<R_, Lifted_R_>::Delaunay_voronoi_kind) [with R_ = CGAL::Cartesian_d<double, CGAL::Linear_algebraCd<double, std::allocator<double> > >, Lifted_R_ = CGAL::Cartesian_d<double, CGAL::Linear_algebraCd<double, std::allocator<double> > >]':
| include/CGAL/Delaunay_d.h:575: instantiated from 'CGAL::Delaunay_d<R_, Lifted_R_>::Simplex_iterator CGAL::Delaunay_d<R_, Lifted_R_>::simplices_begin(CGAL::Delaunay_d<R_, Lifted_R_>::Delaunay_voronoi_kind) [with R_ = CGAL::Cartesian_d<double, CGAL::Linear_algebraCd<double, std::allocator<double> > >, Lifted_R_ = CGAL::Cartesian_d<double, CGAL::Linear_algebraCd<double, std::allocator<double> > >]'
| include/CGAL/Delaunay_d.h:1011: instantiated from 'std::list<typename CGAL::Delaunay_d<R_, Lifted_R_>::Simplex_handle, std::allocator<typename CGAL::Delaunay_d<R_, Lifted_R_>::Simplex_handle> > CGAL::Delaunay_d<R_, Lifted_R_>::all_simplices(CGAL::Delaunay_d<R_, Lifted_R_>::Delaunay_voronoi_kind) const [with R_ = CGAL::Cartesian_d<double, CGAL::Linear_algebraCd<double, std::allocator<double> > >, Lifted_R_ = CGAL::Cartesian_d<double, CGAL::Linear_algebraCd<double, std::allocator<double> > >]'
| cmake/platforms/i686_Linux-2.6_g++-4.3.3_CentOS-5.1-O2/test/Convex_hull_d/delaunay_d-test.cpp:74: instantiated from here
| include/CGAL/Delaunay_d.h:213: warning: suggest parentheses around && within ||
| include/CGAL/Delaunay_d.h: In constructor 'CGAL::Delaunay_d<R_, Lifted_R_>::Simplex_iterator::Simplex_iterator(CGAL::Delaunay_d<R_, Lifted_R_>*, typename CGAL::Convex_hull_d<Lifted_R_>::Simplex_iterator, CGAL::Delaunay_d<R_, Lifted_R_>::Delaunay_voronoi_kind) [with R_ = CGAL::Homogeneous_d<CGAL::Gmpz, CGAL::Linear_algebraHd<CGAL::Gmpz, std::allocator<CGAL::Gmpz> > >, Lifted_R_ = CGAL::Homogeneous_d<CGAL::Gmpz, CGAL::Linear_algebraHd<CGAL::Gmpz, std::allocator<CGAL::Gmpz> > >]':
| include/CGAL/Delaunay_d.h:575: instantiated from 'CGAL::Delaunay_d<R_, Lifted_R_>::Simplex_iterator CGAL::Delaunay_d<R_, Lifted_R_>::simplices_begin(CGAL::Delaunay_d<R_, Lifted_R_>::Delaunay_voronoi_kind) [with R_ = CGAL::Homogeneous_d<CGAL::Gmpz, CGAL::Linear_algebraHd<CGAL::Gmpz, std::allocator<CGAL::Gmpz> > >, Lifted_R_ = CGAL::Homogeneous_d<CGAL::Gmpz, CGAL::Linear_algebraHd<CGAL::Gmpz, std::allocator<CGAL::Gmpz> > >]'
| include/CGAL/Delaunay_d.h:1011: instantiated from 'std::list<typename CGAL::Delaunay_d<R_, Lifted_R_>::Simplex_handle, std::allocator<typename CGAL::Delaunay_d<R_, Lifted_R_>::Simplex_handle> > CGAL::Delaunay_d<R_, Lifted_R_>::all_simplices(CGAL::Delaunay_d<R_, Lifted_R_>::Delaunay_voronoi_kind) const [with R_ = CGAL::Homogeneous_d<CGAL::Gmpz, CGAL::Linear_algebraHd<CGAL::Gmpz, std::allocator<CGAL::Gmpz> > >, Lifted_R_ = CGAL::Homogeneous_d<CGAL::Gmpz, CGAL::Linear_algebraHd<CGAL::Gmpz, std::allocator<CGAL::Gmpz> > >]'
| cmake/platforms/i686_Linux-2.6_g++-4.3.3_CentOS-5.1-O2/test/Convex_hull_d/delaunay_d-test.cpp:162: instantiated from here
| include/CGAL/Delaunay_d.h:213: warning: suggest parentheses around && within ||
|
| ------------------------------------------------------------------------
| r58181 | lrineau | 2010-08-20 12:11:35 +0200 (Fri, 20 Aug 2010) | 3 lines
| Changed paths:
| M /branches/CGAL-3.7-branch/Installation/test/Installation/link_to_CGAL_Qt4.cpp
|
| Fix a warning:
| test/Installation/link_to_CGAL_Qt4.cpp:11: warning: the address of 'f' will never be NULL
|
| ------------------------------------------------------------------------
| r58182 | lrineau | 2010-08-20 12:15:14 +0200 (Fri, 20 Aug 2010) | 3 lines
| Changed paths:
| M /branches/CGAL-3.7-branch/Jet_fitting_3/include/CGAL/Monge_via_jet_fitting.h
|
| Fix a warning:
| include/CGAL/Monge_via_jet_fitting.h:425: warning: comparison between signed and unsigned integer expressions
|
| ------------------------------------------------------------------------
| r58183 | lrineau | 2010-08-20 12:19:36 +0200 (Fri, 20 Aug 2010) | 4 lines
| Changed paths:
| M /branches/CGAL-3.7-branch/Min_circle_2/include/CGAL/Min_circle_2.h
| M /branches/CGAL-3.7-branch/Min_circle_2/test/Min_circle_2/test_Min_circle.cpp
|
| Fix warnings:
| "comparison between signed and unsigned integer expressions"
| and "unsigned is always >= 0"
|
| ------------------------------------------------------------------------
| r58184 | lrineau | 2010-08-20 12:22:35 +0200 (Fri, 20 Aug 2010) | 2 lines
| Changed paths:
| M /branches/CGAL-3.7-branch/Min_ellipse_2/test/Min_ellipse_2/test_Min_ellipse_2.cpp
|
| Fix warnings about comparison between signed and unsigned.
|
| ------------------------------------------------------------------------
2010-08-20 12:57:32 +00:00
Marc Glisse
6ea5914309
Import fix for narrowing conversions from the relevant LWG issue
2010-07-08 09:12:23 +00:00
Laurent Rineau
b122410e54
Fix a warning (unused parameter).
2010-06-29 12:37:23 +00:00
Sébastien Loriot
26dcdbcba2
removed non-need copy constructor added to drop_or_dispatch_output_iterator
...
in revision 56902
2010-06-21 09:48:18 +00:00
Sébastien Loriot
d9a4f82a66
add copy constructor to Dispatch and drop output iterators (needed by MSVC10)
...
(only in the non-variadic case for the moment)
2010-06-21 09:19:41 +00:00
Sébastien Loriot
54b0fbc99a
add helper functions tuple_size and tuple_element for CGAL::cpp0x:tuple
...
This is defined in cpp0x and tr1 but not in boost: in case boost::tuple
is used, it relies on internal boost struct.
2010-06-14 16:24:10 +00:00
Sébastien Loriot
52317dd49f
add python script (replace_CGAL_NAMESPACE.py) to replace CGAL_BEGIN_NAMESPACE and CGAL_END_NAMESPACE
...
by namespace CGAL { and } //namespace CGAL. in all .h and .cpp files
in a directory.
Apply it to all packages in the trunk
Remove macro definition from the config.h file.
2010-06-09 07:37:13 +00:00
Fernando Cacciola
75e7d64cd1
Renamed nested type T to Handled_type to work around VC name-lookup bugs
2010-05-19 13:30:47 +00:00
Marc Glisse
ca42e510e3
Qualify call to base class function (for intel).
2010-04-23 10:03:59 +00:00
Marc Glisse
08b8848282
Use this-> more consistently for begin and end.
2010-04-23 08:09:14 +00:00
Fernando Cacciola
a12e6dc61c
Fixed id() and identical() so they don't cast to 'long'
2010-03-25 13:17:21 +00:00
Michael Kerber
85d1292973
Introduced typedefs for template parameter
2010-03-03 16:25:15 +00:00
Sylvain Pion
85dc12f2a7
Remove empty lines at beginning and end of files
...
(apply Scripts/developer_scripts/remove_empty_lines.pl).
2010-02-01 12:55:28 +00:00
Sylvain Pion
f06dc5554a
Add two functions to check (more efficiently than naively, namely O(sqrt(n))
...
instead of O(n)) whether an iterator belongs to the range [begin(), end()).
bool owns(const_iterator pos);
bool owns_dereferencable(const_iterator pos);
This is useful for speeding up some debug function at the triangulation level.
2010-01-23 17:26:16 +00:00
Sylvain Pion
a55becf097
Add debugging aid : after erasing an element, zero out the corresponding memory
...
area in order to detect misuses of deleted elements early.
2010-01-14 20:18:24 +00:00
Sylvain Pion
c281d3c234
Avoid "Incrementing an invalid iterator".
2010-01-06 15:44:15 +00:00
Sylvain Pion
b9a62e057c
Add a convenience function for the idiom "if(obj.is<Point>())"...
2009-12-16 16:09:04 +00:00
Sylvain Pion
9ac83df64a
Add assertions that catch cases where we increment or decrement an iterator
...
which has been erase()'d.
2009-11-15 20:47:58 +00:00
Sylvain Pion
5fda817f95
Remove a few "warning: extra ';'" with g++ -pedantic.
2009-11-14 11:49:52 +00:00
Sylvain Pion
19a5490ea4
Kill a warning of gcc in -pedantic mode.
2009-11-13 12:20:21 +00:00
Sylvain Pion
2f3c5bf500
Merged revisions 52226 via svnmerge from
...
svn+ssh://scm.gforge.inria.fr/svn/cgal/branches/STL_Extension_Complexity_tags
........
r52226 | spion | 2009-10-09 13:43:18 +0200 (Fri, 09 Oct 2009) | 2 lines
Code+doc+tests for complexity tags Fast, Compact, Location_policy, Fast_location and Compact_location.
........
2009-11-03 15:17:02 +00:00
Stéphane Tayeb
8dceee4164
Add include<CGAL/assertions.h> in *_assertion files.
2009-10-07 13:16:13 +00:00
Stéphane Tayeb
770492c1c7
Use new version of script create_assertions.sh to generate *_assertions.h files.
...
Diffs are:
* #undef added
* in old files, (void)0 is replaced by static_cast<void>(0)
* in old files, lines as "# define CGAL_xxx_assertion 1" are added
* in point_set_processing_assertions.h, surface_mesh_parameterization_assertions.h, surface_reconstruction_points_assertions.h, "|| defined(CGAL_NDEBUG)" is replaced by "|| defined (NDEBUG)"
* protective macros (if any) are removed
* included files if any (<CGAL/assertions.h>, <CGAL/trace.h>) are removed
2009-10-07 07:49:44 +00:00
Sylvain Pion
8573fe26ce
Rename CGALi to internal.
2009-08-24 17:10:04 +00:00