Commit Graph

161 Commits

Author SHA1 Message Date
Laurent Rineau a2bfde2c06 Merge pull request #2869 from afabri/CGAL-fallthrough-GF
Intersections_3: Deal with fallthrough warnings
2018-03-02 16:32:57 +01:00
Andreas Fabri d3027734ca fix indentation 2018-02-23 19:07:36 +00:00
Andreas Fabri ae1923aa2e Deal with Triangle_Line and Triangle_Ray 2018-02-22 17:31:23 +00:00
Laurent Rineau 78e7060525 Merge pull request #2712 from afabri/CGAL-VC+warnlevel_4-GF
Deal with VC++ warnings of level /W4
2018-02-19 14:27:06 +01:00
Andreas Fabri 1170433885 Comment what default means 2018-02-09 14:23:40 +00:00
Andreas Fabri 6f79d2c6f0 fix typo 2018-02-08 15:30:25 +00:00
Andreas Fabri fbc1a9b1d3 Replace last case with default and remove fallthrough 2018-02-08 15:11:48 +00:00
Andreas Fabri e9c652d63f Add several fallthrough 2018-02-08 15:03:39 +00:00
Andreas Fabri 2e14ff9f04 Kernel 2018-01-17 19:59:11 +00:00
Andreas Fabri 7675141f2b AABB_tree 2018-01-17 19:43:47 +00:00
Andreas Fabri 38b2e57b11 PMP 2018-01-17 17:59:35 +00:00
Sébastien Loriot 0698f79aff add SPDX identifier for files under the LGPL-3+ license 2017-11-12 10:17:50 +01:00
Laurent Rineau c826500c7d Merge pull request #1551 from mglisse/Number_types-gmpxx_coercion-glisse
Misc GMPXX fixes
2016-10-20 09:47:39 +02:00
Andreas Fabri 9cd1b0fd62 We declare the third case default so that there is no fallthrough warning 2016-10-17 13:57:39 +02:00
Laurent Rineau b14da4c496 Merge pull request #1568 from lrineau/Intersection-fix_inter_plane_seg-lrineau
Fix a bug in Intersect_3()(Plane_3, Segment_3)
2016-10-17 10:01:21 +02:00
Marc Glisse 030d81e3f7 Fixes for FT=mpq_class.
In particular, the constructor from std::string is explicit.
test_nef_3_io_EPEC is still broken because of that.
2016-10-14 00:37:11 +02:00
Laurent Rineau afb8d3693d Fix a bug in Intersect_3()(Plane_3, Segment_3)
That bug has been detected by a warning:
https://cgal.geometryfactory.com/CGAL/testsuite/CGAL-4.10-Ic-16/Intersections_3/TestReport_lrineau_Ubuntu-latest-GCC6-CXX1z.gz
```
/mnt/testsuite/include/CGAL/Intersections_3/intersection_3_1_impl.h: In function 'typename CGAL::Intersection_traits<K, typename K::Plane_3, typename K::Segment_3>::result_type CGAL::internal::intersection(const typename K::Plane_3&, const typename K::Segment_3&, const K&) [with K = CGAL::Simple_cartesian<CGAL::Gmpq>]':
/mnt/testsuite/include/CGAL/Intersections_3/intersection_3_1_impl.h:1105:13: warning: this statement may fall through [-Wimplicit-fallthrough]
             }
             ^
/mnt/testsuite/include/CGAL/Intersections_3/intersection_3_1_impl.h:1107:9: note: here
         case ON_NEGATIVE_SIDE:
         ^~~~
/mnt/testsuite/include/CGAL/Intersections_3/intersection_3_1_impl.h:1071:9: warning: this statement may fall through [-Wimplicit-fallthrough]
         switch (target_side) {
         ^~~~~~
/mnt/testsuite/include/CGAL/Intersections_3/intersection_3_1_impl.h:1090:5: note: here
     case ON_NEGATIVE_SIDE:
     ^~~~
```

Now, the incorrect fallthrough is replaced by the return of the empty
set.
2016-10-12 11:20:07 +02:00
Laurent Rineau 51f5697d3d Add missing #include 2016-09-30 15:23:14 +02:00
Andreas Fabri 1f989622e7 replace \code with real examples 2015-02-09 10:54:24 +01:00
Laurent Rineau e965b6293e Fix compilation errors with C++11 and Boost-1.56
Use *explicit* conversions to `bool`, for boost::shared_ptr and
boost::optional.
2015-01-14 14:47:29 +01:00
Laurent Rineau be079cb5a3 Fix compilation with Boost-1.56 and later
In Boost-1.56 and later, with C++11, boost::optional::operator bool() is
explicit.
2015-01-13 16:21:04 +01:00
Laurent Rineau f85c7e34e1 Bug fix proposed by Jean-Philippe Pons 2014-06-20 16:34:34 +02:00
Laurent Rineau cabf490132 Fix includes 2014-06-20 16:34:22 +02:00
Laurent Rineau ad798d8390 Rename variables 2014-06-20 16:33:01 +02:00
Andreas Fabri fa4697ba59 Add a cheap test, namely if one of the two points of segment or ray is in the bbox
make_mesh_3 without mesh optimizer, and criteria only on facets, is 2-4
faster on data sets like fandisk, rocker-arm.off, cheese.off
2013-12-20 17:07:12 +01:00
Sébastien Loriot 61dfe46ab9 fix regression in the Triangle_3-Triangle_3 intersection computation
this has been introduced when rewriting the code for the removal
of Object
2013-11-28 17:19:52 +01:00
Sébastien Loriot e1b3a2d582 fix incorrect else 2013-09-25 18:09:42 +02:00
Andreas Fabri 6c547e5663 Mainly added includes 2013-09-13 22:24:30 +02:00
Sébastien Loriot a19023e2ef Merge branch 'General-fix_warning-sloriot'
Successfully tested in 4.3-Ic-73
2013-06-27 08:38:30 +02:00
Sébastien Loriot 7dcfef5a53 Merge branch 'Polyhedron-demo_header_cleanup_and_new_plugins-sloriot'
Successfully tested in CGAL-4.3-Ic-68
approved by the Release Manager
2013-06-24 12:30:25 +02:00
Sébastien Loriot bff4e98d01 fix warnings mainly coming from the merge of the replace object feature branch 2013-06-24 08:44:47 +02:00
Sébastien Loriot 496d75c256 update licenses that were incorrect after merging replace object feature branch 2013-06-21 15:06:17 +02:00
Sébastien Loriot 3d23a59a73 Merge branch 'inside_polyhedron_test-GF'
Conflicts:
	Polyhedron/demo/Polyhedron/CMakeLists.txt
2013-06-20 16:34:02 +02:00
iyaz 43c8084ceb Merge branch 'inside_polyhedron_test-GF-old' into inside_polyhedron_test-GF
Conflicts:
	.gitattributes
2013-06-11 17:56:31 +03:00
Sébastien Loriot 88cc2621a1 Result is no longer used 2013-05-23 09:12:52 +02:00
Sébastien Loriot 14429d2b8e fix compilation errors 2013-03-14 18:32:14 +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
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
Sébastien Loriot 0a0d1c1c5d fix conversion warning 2013-02-15 07:20:28 +01:00
Sébastien Loriot 32cd27f1d1 using coercions traits to determine a common type
in case FT is float, we need double as coercion_type
2013-02-14 10:20:35 +01:00
Sébastien Loriot 1ca5410df0 a plane is not a point! 2013-02-09 16:22:51 +01:00
Sébastien Loriot 0b21facc96 we must use the construction object 2013-02-08 09:26:16 +01:00
Philipp Möller 03151d7bb7 intersection_return now also uses result_of 2012-12-10 17:20:36 +01:00
Philipp Möller 81b8604c76 Move Circular intersection results from the traits to result_of 2012-12-10 15:56:09 +01:00
Philipp Möller 4c02c6d1d6 Remove unused variable 2012-12-07 18:00:46 +01:00
Philipp Möller 4764e5d361 call_test should also use result_of 2012-12-06 17:27:23 +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
Marc Glisse a758751485 Remove / comment out unused local typedefs. Fix one place where FT was used instead of RT (homogeneous coordinates, probably never compiled). 2012-07-28 06:21:06 +00:00
Sébastien Loriot f1bdb9c8a7 merge from next 2012-07-10 14:33:09 +00:00