Commit Graph

170 Commits

Author SHA1 Message Date
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 0f8498f3b5 Revert "use relative path in tagfiles, otherwise documentation output cannot be moved"
This reverts commit ea256c954a.

Conflicts:
	Documentation/CMakeLists.txt
2013-06-13 15:21:07 +02:00
Sébastien Loriot ea256c954a use relative path in tagfiles, otherwise documentation output cannot be moved 2013-06-11 12:54:25 +02:00
Laurent Rineau 7b7029fdbc Fix a warning (unused parameter) in Mesh_3 2013-06-05 14:55:22 +02:00
Sébastien Loriot 75ebdeaeeb update the replacement of Object_and_primitive_id ...
... to be a pair< variant<XXX>, Primitive_id > rather than
pair<optional<variant<XXX> >, Primitive_id >

The rational is that the optional around the variant here is not needed
since there is one around the pair.
2013-05-21 18:39:23 +02:00
Sébastien Loriot f97d6b8bd9 s/boost::result_of/cpp11::result_of/g 2013-03-14 10:38:13 +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
Andreas Fabri 22e272627b remove unused variable 2013-03-01 16:24:47 +01:00
Laurent Rineau 220ddbf6b2 New macro CGAL_GCC_VERSION to help preprocessor conditionals on gcc version
And use it in <CGAL/refine_mesh_3.h>
2013-02-27 19:58:02 +01:00
Andreas Fabri 2740aa9c05 use size_type instead of int 2013-02-07 15:16:03 +01:00
Laurent Rineau e87dad0f95 Fix all warnings in demo/Polyhedron/
The compilation was fix g++-4.8, and the flags:
  --std=c++11 -frounding-math Wall -Wno-array-bounds -Wno-uninitialized
2013-02-06 17:03:20 +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 fa16817382 Use result_of for intersections in Mesh_3 2012-12-07 18:00:46 +01:00
Laurent Rineau 60f464cfcb Fix the use of deprecated types no longer in the concept MeshDomain_3 2012-12-07 15:56:21 +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
Laurent Rineau 9a3998357f svn merge --reintegrate \^/branches/features/CGAL_foundations-fix_missing_headers-lrineau 2012-10-10 12:39:36 +00:00
Laurent Rineau f435be98fb Fix an efficiency bug, when FT is not double.
dihedral_angle() returns a double. So values must be converted to double
ASAP.
2012-10-10 12:24:15 +00:00
Laurent Rineau f0118a1311 Revert last commit (commited by error) 2012-10-09 09:28:37 +00:00
Laurent Rineau 648472bdac After a run of detect_packages_license 2012-10-09 09:26:23 +00:00
Laurent Rineau 795c71fc9b Fix headers of Mesh_2 and Mesh_3. All were missing #include.
I found out that way that <CGAL/Mesh_3/Refine_facets.h> and
<CGAL/Mesh_3/Protect_edges_sizing_field> were using global functions
instead of functors of the traits class.

Note also the funny bug that <CGAL/Regular_triangulation_cell_base_3.h> was
depending on <CGAL/Triangulation_vertex_base_3.h>!
2012-10-08 09:33:38 +00:00
Laurent Rineau 6b0bf6078c BUGFIX: backup points attributes before the call to c3t3.remove_from_complex
C3t3::remove_from_complex modifies the in_dimension() of the vertex

(That may have been a bug.)

It is actually a merge from r72577 of
/branches/features/Mesh_3-experimental-GF/Mesh_3
2012-10-04 14:56:03 +00:00
Laurent Rineau 5db6778d2c Add export from c3t3 to tetgen
+ test output_to_medit and output_to_tetgen in test/Mesh_3/test_c3t3.cpp
2012-09-20 14:24:20 +00:00
Laurent Rineau be658460eb Merge changes from next 2012-08-21 09:04:51 +00:00
Laurent Rineau a04891ff93 WARNFIX: fix some warnings triggered by -Wconversion on g++ 2012-08-09 16:06:54 +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
Laurent Rineau db194534c7 First big patch to fix -Wunused-local-typedefs
-Wunused-local-typedefs is a new warning flag of gcc-4.7, and it will enabled
 by -Wall since gcc-4.8 (not yet released).

The fix is a big set of removals of unused typedefs (or comments, or moves,
depending on the context).
2012-08-01 13:29:16 +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 aa19d9f3ad Minor whitespace changes, to fit 80 columns 2012-04-18 14:56:31 +00:00
Laurent Rineau 34ea09bc75 Minor whitespace changes, to fit 80 columns 2012-04-18 14:52:49 +00:00
Laurent Rineau bedc217022 Whitespace changes + Polyline renamed to Polyline_and_context
- Rename Polyline to Polyline_with_context: the name was not good
- Reformat the whitespace, to fit 80 columns
2012-04-18 14:45:43 +00:00
Philipp Möller 8f1ce2412c Removed all places where the CGAL_CFG_NO_TMPL_IN_TMPL work-around was
used. Those were mostly in Polyhedron and HalfedgeDS but some places
in Arrangement_2 used it, too. Neither of the parts of Arrangement_2
have been documented.
2012-04-13 13:13:30 +00:00
Laurent Rineau eb52def3db Restore indentation (one line) after a modification by a Windows developer 2012-04-10 12:08:05 +00:00
Laurent Rineau b2d0dcfc58 Remove a warning (unused variable) 2012-01-31 15:03:44 +00:00
Laurent Rineau dbf52257f8 In Polyhedral_mesh_domain_3, add a check that the input polyhedron is
triangulated.
2012-01-18 11:06:11 +00:00
Laurent Rineau 83f0d35e52 Protect calls to min and max with parenthesis 2012-01-17 15:54:58 +00:00
Laurent Rineau 8f59fd9592 Turn QPL into LGPLv3+ 2012-01-13 16:33:35 +00:00
Laurent Rineau ab6628060a Fix a bug in a debug message 2011-12-07 18:10:32 +00:00
Philipp Möller e9748fdf9a Set but not used variables removed for smoother compiling with -Wextra 2011-11-25 14:04:37 +00:00
Philipp Möller 0d528ddb74 Mesh_3 intersections with variants 2011-11-16 14:04:13 +00:00
Laurent Rineau 9d7bc3fcd7 Typo. To be coherent with current documentation of the concept MeshDomain_3
In Mesh_domain_with_polyline_features_3, the type FT must be taken from the
geom traits, and not from the base, because the concept MeshDomain_3 does
not ask for the type FT.
2011-09-30 13:41:09 +00:00
Laurent Rineau 369498d1e5 Cancel revision 64607. There had been a problem with the branch.
| ------------------------------------------------------------------------
  | r64607 | efif | 2011-07-05 17:27:04 +0200 (Tue, 05 Jul 2011) | 1 line
  | 
  | Merged feature-branch Aos_2-new_functors-tau into next
  | ------------------------------------------------------------------------
2011-07-06 11:11:58 +00:00
Laurent Rineau 05a607fabc Fix a bug in PVertex::operator<
PVertex::operator was implementing a <= instead of a strict ordering. That
is incorrect.

Bug found by the debug mode of the STL of MSVC.
2011-06-29 10:53:53 +00:00
Laurent Rineau 15f5aea274 Patch so that SWIG can use this class
For SWIG, iterators must be default-constructible.
2011-05-11 12:44:01 +00:00
Laurent Rineau ffc1186215 - Add a function overload that was documented but not implemented!
- Fix a call in a deprecated function.
- In the tests, add the test of the deprecated functions.
2011-05-11 12:34:50 +00:00
Laurent Rineau 6d500f3605 Make the code conform to the documentation: add C3t3::edges_in_complex_end(Curve_segment_index) 2011-04-19 12:15:22 +00:00
Laurent Rineau aad9d073da Bug in Construct_initial_points if the non-bounding polyhedra are coplanar.
Before this patch, Construct_initial_points did not try to intersect with
the bounding polyhedron, but only with the other polyhedra. That can lead
to a crash if the given polyhedra are a bounding one, and a second
polyhedron that is coplanar. Then the initial points are *all* coplanar,
and then tr.dimension()==2 and an assertion is triggered.

Now Construct_initial_points uses construct_intersection_object(), and the
later tries to intersect with all polyhedra, including the bounding one.
2011-03-23 14:24:26 +00:00
Laurent Rineau c6a63ce5f9 Add an error if the class template Triangle_accessor is instantiated.
Only its specialization (partial or not) should be instantiated.
2011-03-23 11:42:49 +00:00
Sébastien Loriot 0ebdccfa4e update URL and Id tag 2011-03-02 14:59:51 +00:00