phynexis-deps/cgal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
51,134 Commits 3 Branches 0 Tags
f97d6b8bd9bfbcd2dd622ef897872deef4192f18
Commit Graph
190 Commits
Author SHA1 Message Date
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 c7e68385be remove unused variables and #if 0 buggy non used code 2013-02-26 16:52:55 +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
Andreas Fabri c029f702a3 use more types 2013-02-07 11:02:14 +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 ee5b4683d0 deal with Triangulation_3, Polyhedron,Voronoi, Minkowski_sum_3 2013-01-31 09:47:54 +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 a6b596396c Drop Result and Intersection_traits from Circular_kernel_2 2012-12-10 18:27:49 +01:00
Philipp Möller 03151d7bb7 intersection_return now also uses result_of 2012-12-10 17:20:36 +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 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
Philipp Möller 542f5d9c51 Merged ^/branches/next here 2012-04-16 08:53:21 +00:00
Laurent Rineau 8f59fd9592 Turn QPL into LGPLv3+ 2012-01-13 16:33:35 +00:00
Philipp Möller 58a6c86cbc * fixed include issue 
* some work to make Lazy work with C++11
 2011-12-15 15:45:39 +00:00
Philipp Möller 9dac440ba9 Circular kernel fixed 2011-11-24 17:49:15 +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
Philipp Möller 91d59f8478 Macro to define global functions now respect Intersect_2::Result<> 2011-11-16 17:48:13 +00:00
Philipp Möller 94affd589d Moved the Intersection_result concept into the functors and adapted code in the lazy kernel to that change. 2011-11-15 15:40:22 +00:00
Philipp Möller 9051768cea Introduced Intersection_results as a Kernel concept for use in public APIs in favor over Intersection_traits. 2011-11-15 13:41:14 +00:00
Philipp Möller 450f438518 IT shortcut not circumvents specifying a kernel making it an actual shortcut and nicer for exposure in APIs 2011-11-10 11:06:26 +00:00
Philipp Möller a4e6d57cff Circular_kernel_2 and Circular_kernel_3 now use CGAL_INTERSECTION_VERSION for backwards compatability 2011-11-09 14:29:46 +00:00
Philipp Möller b07e2df018 * Circular_kernel is now Object free, doesn't compile with Lazy yet, 
* hack for ternary function
 2011-08-25 21:40:12 +00:00
Philipp Möller fad504838f * Circular_kernel: - Intersections now use variants 
- removed most internal uses of Object
* Intersections: more traits, typofix, doc typofix, aliases IT23d
 2011-07-20 22:54:03 +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 2bbdde3dc1 backport trunk changes 2011-06-23 12:55:08 +00:00
Monique Teillaud d784ea5019 removed old stuff that was in dont_submit anyway 2011-06-21 06:58:57 +00:00
Sébastien Loriot d5c2355419 merge the modification from experimental packages to 
the candidate branch of the feature + few name bug fixes
 2011-04-12 11:34:37 +00:00
Sébastien Loriot 8ce2048aea add #include<CGAL/config.h> before any directive CGAL_USE_* 2011-03-02 18:52:57 +00:00
Sébastien Loriot 9cbf4274ae due to correction of the traits Filtered_bbox_circular_kernel_2 
in revision 58154, Filtered_bbox_circular_kernel_2<Lazy_circular_kernel_2<K> >
was no longer working.

In Circular_kernel_2: 
  *The Rep type of Circular_arc_2, Line_arc_2 and Circular_arc_point_2 in
   Filtered_bbox_circular_kernel_2 now inherits from the Rep of the kernel
   template parameter. To allow Lazy filtering mechanism on 
   Filtered_bbox_circular_kernel_2::{Circular_arc_2,Line_arc_2,Circular_arc_point_2}
   it was needed to explicit some conversions (with Lazy_circular_kernel, we add another
   implicit construction, thus the compiler cannot find the correct constructor).
In Filtered_kernel:
  *explicit some conversions
 2010-11-10 15:52:53 +00:00
Laurent Rineau 4bc6a941fb Remove a std::cerr from my last commit. Sorry for the pollution. 2010-08-20 14:17:33 +00:00
Laurent Rineau 418d2a5f01 Refactoring of CK_2 Filtered_bbox_circular_kernel_2: 
- The three classes Circular_arc_2, Circular_arc_point_2 and Line_arc_2
    now have a proper base class with bboxes,

  - The functors of Fb_ck_2 now directly use the functors of Ck_2 (without
    bbox filtering) templated by Fb_ck_2: that avoids all creations of
    temporary objects to convert between types CGAL::Foobar_2<CK_2> and
    CGAL::Foobar_2<Fb_ck_2>.

  - The number of functors in bbox_filtered_predicates has been reduced
    quite a lot: all functors that were not using bboxes have been
    removed. They were just forwarding all there calls to the functors
    without filtering. That was useless (and created a lot of temporary
    objects).

As a side effect, Fb_ck_2 now works even with -DCGAL_CFG_MATCHING_BUG_6
(VC++), because of the removal of the temporary objects.
 2010-08-19 10:20:47 +00:00
Andreas Fabri 16010cf531 For VC++ we have to directly derive from Has_qrt 2010-08-10 08:02:28 +00:00
Sébastien Loriot 93a7d05699 Make the benchmark compiling again. 
I try to run some of the mode 'alpha' as described in the
README_benchmark_CK2.txt but this ended up with different
preconditions non validated (for alpha=1,4,5 or 8 with beta=9)
 2010-06-22 09:37: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
Andreas Fabri cc7b417bd4 fix bugs in VC++ workarounds 2010-05-06 09:27:16 +00:00
Sébastien Loriot f295f910f0 change LK:: to CK:: (bug on windows) 2010-05-06 09:19:35 +00:00
Andreas Fabri 83cb1edf06 Reindent and removal of duplicate typedef for Circle_2 2010-05-06 08:20:53 +00:00
Pedro Machado Manhaes de Castro 9ee39b4642 qualified result type issues 2010-04-30 16:41:23 +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
Laurent Rineau 83912b2952 Massive fix of svn:keywords properties, and $URL$ keyword. 2009-10-20 08:59:26 +00:00
Sylvain Pion 8573fe26ce Rename CGALi to internal. 2009-08-24 17:10:04 +00:00
Sylvain Pion 927b432b39 typo : mecanism -> mechanism. 2009-08-10 15:57:03 +00:00
Laurent Rineau fd76a2222d - Remove "using CK::Linear_kernel::Do_intersect_2::operator()" in 
CircularFunctor::Do_intersect_2 because
CK::Linear_kernel::Do_intersect_2::operator() and
CircularFunctor::Do_intersect_2 have exactly the same signature! The Intel
compiler is right to say there is an ambiguity in the matching.
 2009-07-10 08:21:44 +00:00
Efi Fogel 4b22c83e54 cleanup 2009-07-07 08:23:06 +00:00
Sylvain Pion f0ed774e37 Move CGAL::array to namespace CGAL::cpp0x, like tuple. 2009-04-30 14:03:52 +00:00
Pedro Machado Manhaes de Castro 66f53a570b testing calls for VC8 + bug fix 2008-10-31 17:08:32 +00:00
Pedro Machado Manhaes de Castro e7ee6ea845 fix the VC8 compatibility 2008-10-24 23:36:02 +00:00
Andreas Fabri c58989d70e make the linear kernel testsuite work with the circular kernel on VC8 2008-10-24 12:53:39 +00:00