Commit Graph

378 Commits

Author SHA1 Message Date
Laurent Rineau e3aad4d079 Fix warnings 2013-06-26 14:49:03 +02:00
Laurent Rineau c6a57e79f1 Fix a warning about unused parameters 2013-06-25 17:43:17 +02:00
Laurent Rineau 01ee3e94b6 Use 'std::istream::operator!()' twice to replace 'operator bool()' (C++11 only)
Fixes a compilation error from clang:

include/CGAL/IO/File_binary_mesh_3.h:39:10: error: no viable conversion from 'std::ostream' (aka 'basic_ostream<char>') to 'bool'
  return os << c3t3;
         ^~~~~~~~~~
2013-06-25 12:53:24 +02:00
Laurent Rineau 27f24bd350 Remove two useless functions 2013-06-24 17:00:04 +02:00
Laurent Rineau 9bee0e2f6a Fix a bug when a cycle is covered by only two balls
When the first point of the cycle is inserted, the radius of its ball is
limited by the third of the distance to a "midpoint" of the cycle.
2013-06-24 16:59:45 +02:00
Jane Tournois 1224038bb2 fix license issues 2013-06-24 14:13:08 +02:00
Sébastien Loriot 0f116f968a use the new return type of Intersect_3 2013-06-21 13:14:46 +02:00
Sébastien Loriot 1a8647a195 fix copy-paste error 2013-06-21 12:49:57 +02:00
Sébastien Loriot 5f43373646 use the new return type of intersection 2013-06-21 12:43:37 +02:00
Sébastien Loriot 02bdcc8603 Revert "remove Robust_intersection_traits_new"
This reverts commit 77b6b2e008.
2013-06-21 12:42:12 +02:00
Sébastien Loriot 77b6b2e008 remove Robust_intersection_traits_new 2013-06-21 12:39:52 +02:00
Sébastien Loriot 483440c8f2 use new return type of intersection 2013-06-21 12:39:20 +02:00
Sébastien Loriot d4d3c405fe Exact_type_selector has been renamed Exact_field_selector 2013-06-21 12:37:33 +02:00
Jane Tournois 404f2e0e3c merge 2013-06-21 10:01:19 +01:00
Jane Tournois 4a1f9cc831 deprecate Mesh_cell_base_3 and use Compact_mesh_cell_base_3 in Mesh_triangulation_3.h 2013-06-20 12:29:46 +02:00
Laurent Rineau 62f9bfc040 Fix warnings 2013-06-19 13:08:13 +02:00
Jane Tournois acc845ef65 promote Compact_mesh_vertex_base to Mesh_vertex_base 2013-06-18 17:49:28 +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 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
Jane Tournois c37c3ca167 remove Mesh_vertex_base_3 and rename Compact_mesh_vertex_base_3.h to Mesh_vertex_base_3.h 2013-05-17 14:50:50 +02:00
Laurent Rineau 29cc781c83 Avoir another segfault due to a const reference to an object that is modified
A const reference only guaranty that the code cannot modify the object
*using that reference*. There is no guaranty that the object will not be
 modified using another reference!
2013-05-06 13:19:23 +02:00
Laurent Rineau 4fae376de3 Avoid a segfault (const ref to a temporary) 2013-05-03 17:13:31 +02:00
Laurent Rineau ea5f79db80 Fix warnings 2013-05-03 15:13:18 +02:00
Jane Tournois 7a530ea7d8 remove just_incident_cells.
The bench I made did not show that it provided any computation time improvement.
2013-04-11 12:48:04 +02:00
Jane Tournois 7582f85841 fix template parameter name : should be MD for MeshDomain, not MT 2013-03-29 17:32:11 +01:00
Jane Tournois abd099e8b6 Intrusive_list : change modificators of next_intrusive and previous_intrusive to functions set_next_intrusive and set_previous_intrusive
(old functions were returning a reference for modification)
2013-03-29 14:05:14 +01:00
Jane Tournois 2594644d60 fix compilation in debug mode when macro is activated, on windows 2013-03-28 16:40:53 +01:00
Jane Tournois d67db385fa Merge branch 'Mesh_3-improvements-GF-old' into Mesh_3-improvements-GF
Conflicts:
	Mesh_3/include/CGAL/refine_mesh_3.h
2013-03-21 11:22:15 +01: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 bc7e2a1d71 Merge remote-tracking branch 'origin/Mesh_3-improvements-GF' into Mesh_3-improvements-GF-new
Mesh_3-improvements-GF-new is fresh fork of master

Conflicts:
	.gitattributes
	AABB_tree/include/CGAL/AABB_tree.h
	GraphicsView/src/CGAL_Qt4/DemosMainWindow.cpp
	Mesh_3/include/CGAL/Mesh_3/C3T3_helpers.h
	Mesh_3/include/CGAL/Mesh_3/Refine_facets_3.h
	Mesh_3/include/CGAL/Polyhedral_mesh_domain_3.h
2013-02-28 17:10:16 +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
Laurent Rineau 892efd0a3a Merge bug fixes into Mesh_3-improvements-GF 2013-02-08 17:39:04 +01:00
Clement Jamin c71cc0fbba Moved the "get_opposite_ordered_edge" call into the "if"...
... so that it doesn't get called for nothing.
2013-02-07 16:02:05 +01:00
Jane Tournois dbfcb44e69 include config.h to use or not compact_mesh_cell_base using the macro 2013-02-07 16:01:19 +01:00
Jane Tournois 6c8863de89 fix the use of inexact_locate 2013-02-07 16:00:22 +01:00
Laurent Rineau 354ddc85fc Fix the case of <CGAL/Mesh_3/implicit_to_labeled_function_wrapper.h>
That header file contains a class named
CGAL::Mesh_3::Implicit_to_labeled_function_wrapper and the naming
guidelines are well followed but the case of the file.

That header file is internal to Mesh_3 and not documented.
2013-02-07 15:29:46 +01:00
Clement Jamin c9cd613991 Optimized fill_modified_vertices (just call insert instead of find+insert) 2013-02-07 15:29:09 +01:00
Laurent Rineau d2a9ca727b Forward the construction with three arguments to the base 2013-02-07 15:27:16 +01:00
Laurent Rineau 0cd47271d8 Fix compilation errors on Windows 2013-02-07 15:27:15 +01:00
Jane Tournois bc37e108ad make end of lines consistent 2013-02-07 15:25:28 +01:00
Jane Tournois b1ebef77d2 remove warning 2013-02-07 15:23:30 +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
Laurent Rineau f68da3f49c Fix a bug when a cyclic 1D-feature intersects other curves
There was a bug in
  <CGAL/Mesh_domain_with_polyline_features_3.h>
and
  <CGAL/Mesh_complex_3_in_triangulation_3.h>
when a cycle (in 1D-features of the the domain) had a cycle that intersected
at least one other curve (at it "first" point).

That first point must be marked as a corner. But the cycle remains a cycle.
2013-01-30 17:08:25 +01:00
Laurent Rineau 5b17407fe5 Always initialize 'nearest_point' 2013-01-30 16:43:09 +01:00