songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
66,651 Commits 3 Branches 156 Tags 963 MiB
Commit Graph

794 Commits

Author SHA1 Message Date
Andreas Fabri 9b4a1f219f no \cite in \brief as doxygen stops the brief description right before the \cite 2015-01-14 09:15:26 +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
Andreas Fabri babaa99826 Merge branch 'CGAL-Getting_Started-GF' 
Approved by the release manager
Conflicts:
	Documentation/doc/Documentation/main.txt
 2015-01-12 11:29:26 +01:00
Sébastien Loriot 0218954ea6 Merge branch 'barycentric_coordinates_2-dmitry' 
Tested in CGAL-4.6-Ic-99 and CGAL-4.6-Ic-100
  Approved by the release manager

Conflicts:
	Installation/changes.html
	Kernel_23/include/CGAL/internal/Projection_traits_3.h
 2015-01-09 10:35:20 +01:00
Andreas Fabri a801f9e185 Improve the examples which illustrate problems with double 2015-01-08 12:28:14 +01:00
Sébastien Loriot ce6342d629 Merge remote-tracking branch 'origin/Stream_support-fix_reading_double-GF' 
improve reading double from streams on windows

Tested in CGAL-4.6-Ic-79
Approved by the release manager
 2014-12-17 22:36:46 +01:00
Laurent Rineau 057924e1d4 Merge remote-tracking branch 'origin/releases/CGAL-4.5-branch' 
That merges the following:
  | commit 5dbfeec3ae
  | Merge: fc407cf 5b9be0f
  | Author: Sébastien Loriot <sebastien.loriot@cgal.org>
  | Date:   Fri Dec 12 15:29:51 2014 +0100
  |
  |     Merge branch 'BSO_2-fix_kernel_conflict-local' into releases/CGAL-4.5-branch
  |
  |     Tested in CGAL-4.5.1-Ic-171
  |
  | commit fc407cfebf
  | Merge: bd2c6f8 0c6153c
  | Author: Laurent Rineau <laurent.rineau@cgal.org>
  | Date:   Mon Dec 1 17:38:48 2014 +0100
  |
  |     Merge branch 'Mesh_3-fix_with_time_stamps-GF' into releases/CGAL-4.5-branch
  |
  |     Bug-fix in Mesh_3 with time stamps.
  |
  |     Tested in CGAL-4.5.1-Ic-168.
  |     Approved by the Release Manager.
  |
  | commit bd2c6f890f
  | Merge: ad53e42 c904f77
  | Author: Laurent Rineau <laurent.rineau@cgal.org>
  | Date:   Fri Nov 28 12:04:55 2014 +0100
  |
  |     Merge branch BGL-make_property_map_lightweight-For_4.5_bugfix-GF' into releases/CGAL-4.5-branch
  |
  |     Bug fix: a property map was not lightweight.
  |
  |     Tested in CGAL-4.5.1-Ic-167.
  |     Approved by the Release Manager.
  |
  | commit ad53e42fb3
  | Merge: 044660e b281d86
  | Author: Laurent Rineau <laurent.rineau@cgal.org>
  | Date:   Fri Nov 28 12:03:30 2014 +0100
  |
  |     Merge remote-tracking branch 'remotes/origin/BGL-fix_example-GF' into releases/CGAL-4.5-branch
  |
  |     Fix the example examples/BGL_triangulation_2/emst.cpp:
  |     the filtered (finite) triangulation was not used.
  |
  |     Tested in CGAL-4.5.1-Ic-167.
  |     Approved by the Release Manager.
  |
  | commit 044660eb48
  | Merge: a096cdf 4464116
  | Author: Laurent Rineau <laurent.rineau@cgal.org>
  | Date:   Fri Nov 28 12:01:50 2014 +0100
  |
  |     Merge branch 'CGAL-fix_sse2_mingw-lrineau' into releases/CGAL-4.5-branch
  |
  |     Fix the SSE macros when MinGW is used.
  |
  |     Tested in CGAL-4.5.1-Ic-167.
  |     Approved by the Release Manager.

Tested in CGAL-4.6-Ic-79.
 2014-12-17 17:05:01 +01:00
Guillaume Damiand d96bdd9d4b According the modifs in master, variables TRANSLATION ROTATION SCALING REFLECTION IDENTITY are always const. 2014-12-17 14:59:19 +01:00
Guillaume Damiand bff2e043dc Initialize consts. 2014-12-16 10:30:14 +01:00
Sébastien Loriot 63406293e1 Merge branch 'Projection_traits-add_more_functors-sloriot' into barycentric_coordinates_2-dmitry 
Conflicts:
	Documentation/biblio/cgal_manual.bib
	Documentation/doc/Documentation/Doxyfile.in
	Documentation/doc/Documentation/dependencies
 2014-12-12 14:24:17 +01:00
Sébastien Loriot 5b9be0f8c7 workaround ambiguous call in kernel intersection functions when including BSO_2 2014-12-11 16:33:29 +01:00
Guillaume Damiand 1251bf8b58 Add const for TRANSLATION, ROTATION, SCALING, REFLECTION, IDENTITY 2014-12-04 21:41:38 +01:00
Laurent Rineau af90b1d6bc Restore the initial indentation incorrectly modified by this branch 2014-12-04 13:45:26 +01:00
Andreas Fabri 73d4fe8fee Add % 2014-11-28 18:17:07 +01:00
Andreas Fabri 6f4123db35 cleanup 2014-11-28 16:12:50 +01:00
Andreas Fabri 13928cd516 add missing 'i' and parenthesis 2014-11-27 08:51:46 +01:00
Andreas Fabri 2916850771 use iformat for reading doubles 2014-11-26 16:53:50 +01:00
Jane Tournois 0f9ff7e619 add a typedef for Ray_2 to have Mesh_2 tests compiling 
this actually was a bug.
In the documentation, Projection_traits_xy_3 is said to implement the concept
DelaunayTriangulationTraits_2, that has the type Ray_2.
Now, it's the case
 2014-11-18 12:20:33 +01:00
Guillaume Damiand 87968c0b6e Keep non const version for non header version (TRANSLATION, ROTATION, SCALING, REFLECTION, IDENTITY and primes) 2014-11-15 18:23:55 +01:00
Guillaume Damiand ebc4300334 Header only for random.cpp. 
For the header only version, the global variable default_random no more exist => we need to replace all occurences of default_random by a call to the global function get_default_random().
As usual, no modification for the non header only version.
 2014-11-14 14:20:26 +01:00
Guillaume Damiand e8fe29c79c Ok for the compilation version header only (only for the treated files). 2014-10-31 17:09:48 +01:00
Guillaume Damiand 1182319f5d Redo all the modifs to remove all the cpp files from cgal. 
First step where all the XXX.cpp are copied into XXX_impl.h files.
The macro CGAL_HEADER_ONLY allows to know if impl files need to be
included or not into header files; and allow to decide if functions are
in impl files are inline or not.

Next step: process with static variables for the header only version.
 2014-10-30 16:05:22 +01:00
Andreas Fabri 4be974b230 Improve Getting Started 2014-10-14 18:38:18 +02:00
Sébastien Loriot 0e25bfb122 bug fix in projection traits, Angle_3 != Angle_2 when z is taken into account 
(cherry picked from commit 6c4cd29fb1)

Conflicts:
	Kernel_23/include/CGAL/internal/Projection_traits_3.h
 2014-10-09 10:36:04 +02:00
Sébastien Loriot 6c4cd29fb1 bug fix in projection traits, Angle_3 != Angle_2 when z is taken into account 2014-10-09 10:27:39 +02:00
Sébastien Loriot 6ae7d56bc7 fix dimension typo 2014-10-06 08:13:54 +02:00
Sébastien Loriot 61e40e74a1 add additional functors in the projection traits and a test file 
* Compute_scalar_product_2
  * Collinear_2,
  * Collinear_are_ordered_along_line_2
  * Compute_squared_length_3
 2014-10-03 08:58:33 +02:00
Sébastien Loriot 0b353bb85b Merge remote-tracking branch 'origin/CGAL-use_leda-GF' 
Reintroduce the possibility to use CGAL without GMP
  (to use LEDA number types instead for example).
  The cmake option to set to switch off GMP when building
  the lib is CGAL_DISABLE_GMP.

Tested in CGAL-4.5-Ic-86
Approved by the release manager

ge is necessary,
 2014-07-04 12:02:37 +02:00
Marc Glisse 3b3993aa19 Merge branch 'Kernel_d-rewrite-glisse-old' into Kernel_d-rewrite-glisse 
Conflicts:
	Installation/changes.html
 2014-06-23 17:13:29 +02:00
Sébastien Loriot 0230e979e2 Merge branch 'CGAL-use_leda-GF-OLD' into CGAL-use_leda-GF 
Conflicts:
	Arrangement_on_surface_2/test/Arrangement_on_surface_2/construction_test_suite_generator.cpp
	Arrangement_on_surface_2/test/Arrangement_on_surface_2/test_construction.cpp
	Documentation/doc/Installation.txt
	Kernel_23/include/CGAL/Exact_predicates_exact_constructions_kernel.h
 2014-06-18 22:50:06 +02:00
Sébastien Loriot 0e46afa617 Merge branch 'Convex_hull_3-traits_class_fixes-sloriot' 
Fixes bugs in the 3D convex hull traits concept, in particular due to the
  handling of coplanar points

  Tested in CGAL-4.5-Ic-72
  Approved by the release manager

Conflicts:
	Installation/changes.html
 2014-06-18 09:41:53 +02:00
Sébastien Loriot 4ed2497f2e add missing possible return value 2014-06-10 22:37:27 +02:00
Laurent Rineau 2463459ce6 Doc for the two overloads of Angle_3::operator() 2014-05-21 12:19:13 +02:00
Laurent Rineau 6500bd907f Add Angle_3(Vector_3, Vector_3) 
...by similarity with Angle_2.
 2014-05-21 12:18:49 +02:00
Laurent Rineau 191b01b13b Add Angle_3()(Point_3, Point_3, Point_3, Point_3) 2014-05-21 11:04:59 +02:00
Laurent Rineau 73f4734525 Fix permissions 2014-05-15 18:33:36 +02:00
Marc Glisse 2a387ede81 Remove unused check_dimension_lt. 2014-05-07 19:37:53 +02:00
Marc Glisse cb4ca9d8c8 Don't use Dynamic_dimension_tag::value. 2014-05-07 19:28:33 +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
Efi Fogel 016c40fdbc Fixed typos in documentation---minor fix for master 2014-03-31 23:52:31 +03:00
Efi Fogel 8f80982272 Fixed typos in documentation---minor fix for master 2014-03-31 23:51:23 +03:00
Marc Glisse 09f3db2025 define CGAL_CXX11. 2014-03-12 14:07:47 +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
Sébastien Loriot 9114db9085 restore figure source files removed in 0fa2cacb 
| commit 0fa2cacb60
  | Author: Sébastien Loriot <sebastien.loriot@cgal.org>
  | Date:   Tue Dec 3 17:27:02 2013 +0100
  |
  |     remove doc_tex documentation (including developer manual) and old manual tools
 2014-02-10 14:54:23 +01:00
Sébastien Loriot cc30859ea1 fix typedef 
doc bugfix
 2014-01-30 08:36:36 +01:00
Andreas Fabri a020773bbc fix #include in the manual 2014-01-17 12:42:52 +01:00
Laurent Rineau 972befcc01 Merge branch 'CGAL-fix_io_bad-lrineau' 
Fix the uses of std::basic_ios::bad() across the whole CGAL code, and
use fail() instead.

Tested in CGAL-4.4-Ic-84.
 2014-01-09 17:52:46 +01:00
Laurent Rineau afd4cfbfef Fix a typo 
Equal_2 is not related to Point_3.
 2014-01-08 16:10:58 +01:00
Sébastien Loriot b3de157a24 linking bug in documentation 2013-12-18 17:45:51 +01:00
Laurent Rineau 269ae1ca61 Fix the uses of std::basic_ios::bad(), and use fail() instead. 
bad() implies fail() but std::basic_ios::operator! is actually equivalent
to std::basic_ios::fail(), not bad().

For example,
    std::ifstream is(argv[1]);
    if (is.bad()) {
is probably wrong because, in case the file does not exist, only the failbit it set,
and not the badbit.

Other example:
   double x;
   is >> x;
If the stream 'is' does not contains a string that can represent a double,
then failbit is set (and maybe the eofbit if the stream is actually too
short), but not the badbit.

bad() can be used, in case fail() returned true, to discriminate between a
I/O error and a logical error.

See:
  http://en.cppreference.com/w/cpp/io/basic_ios/operator_bool
  http://en.cppreference.com/w/cpp/io/ios_base/iostate
 2013-12-12 16:13:40 +01:00
Jane Tournois a92d14aa35 Merge branch 'master' of ssh://scm.cgal.org/var/git/cgal 2013-12-06 09:55:20 +01:00
Jane Tournois fa530983dd documentation bug fix 2013-12-06 09:54:21 +01:00
Sébastien Loriot 0fa2cacb60 remove doc_tex documentation (including developer manual) and old manual tools 2013-12-03 17:27:02 +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
Sébastien Loriot 435077021e rename function in test 2013-09-27 16:09:31 +02:00
Sébastien Loriot 91705599c9 add a test checking all linear intersection computations with API v1 and v2 2013-09-26 17:30:43 +02:00
Sébastien Loriot c8495dea58 add missing return type for Intersect_2 when using intersection API v1 2013-09-25 18:06:06 +02:00
Laurent Rineau fa7588e6e5 Restore correct permissions of files 
File created by the Windows port of Emacs, and then commited using the
Cygwin version of Git, have incorrect permissions: they are all executable!
Andreas works using that combination of software.
 2013-09-24 11:05:57 +02:00
Laurent Rineau 0ea21c36ab Add more "See Also": refer to the general BoundedSide_[23] functor 2013-09-04 14:04:55 +02:00
Laurent Rineau 61393efa4f Add some "See Also" to HasOn((B|Unb)oundedSide|Boundary)_[23] 2013-09-04 14:02:32 +02:00
Laurent Rineau bc03aaf30b Put doc/ in the global dont_submit file 2013-08-20 10:57:03 +02:00
Sébastien Loriot 9c2f35ed1a using cgalHeading instead of h3 2013-08-07 10:06:49 +02:00
Sébastien Loriot d282ade623 use \cgalCite instead of \cite 
using perl -i -pe 's/\\cite\s*{?([a-zA-Z0-9:-]+)}?/\\cgalCite{$1}/g'
 2013-08-05 18:25:26 +02:00
Sébastien Loriot b2ef3b8673 Merge branch 'doc-remove_gif-local' 
Successfully test in CGAL-4.3-Ic-102

This commit fixes a few issues in the doxygen documentation and in particular
the figure for the generation of latex doc.

Approved by the interim release manager

xplain why this merge is necessary,
 2013-07-26 17:50:07 +02:00
Sébastien Loriot 2dfe8a3d73 workaround for a doxygen bug: remove space after /!* to avoid a verbatim env 
this happens if you have an empty line or the text directly after /!*
to find them in the generated documentation, grep for "pre class=\"fragment\""
(a few of them are legitimate however)
 2013-07-25 14:58:53 +02:00
Sébastien Loriot 143a2181b3 add latex format for \imagei doxygen command 
perl -pe 's/^(\s*)\\image\s+html\s+(.*)\s*$/$1\\image html $2\n$1\\image latex $2\n/' -i
 2013-07-25 11:50:53 +02:00
Sébastien Loriot 74a1ac055e remove pdf files from doxygen doc include path 2013-07-25 11:15:18 +02:00
Sébastien Loriot 519b301130 remove gif files from doxygen doc include path 2013-07-25 11:14:16 +02:00
Sébastien Loriot 4389b0bac8 remove the usage of gif in the doxygen doc as pdflatex does handle them 
replace the files with png
 2013-07-25 11:06:13 +02:00
Marc Glisse 14d2073dd2 Move Dimension.h back to its place. 2013-07-22 15:44:50 +02:00
Sébastien Loriot 08c9214275 doc: last replacements of \R by \mathbb{R} 2013-07-11 07:29:53 +02:00
Sébastien Loriot d4d9bc212b replace in the doc \R by \mathbb{R} 
\R is not a valid latex command
I used: sed -i 's/\\f$\s*\\R/\\f$ \\mathbb{R}/g'
 2013-07-10 17:07:43 +02:00
Sébastien Loriot cd5e88f11f Merge branch 'Kernel_23-Bbox_more_friendly-local' 
Implements Features/Small_Features/More_friendly_bbox
Successfully tested in CGAL-4.3-Ic-74
Approved by the release manager
 2013-06-28 15:05:31 +02:00
Sébastien Loriot 0a460a947b remove deprecation warning 2013-06-26 07:27:59 +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 716f87d2d7 rename Hidden_type to unspecified_type and update its description 2013-06-13 18:48:58 +02:00
Philipp Möller fd0a2b46f4 Merge branch 'Documentation-remove-dxyassist-pmoeller' 2013-06-03 20:37:20 +02:00
Monique Teillaud 6c4357eb2f doc bug fix (following a question by a user on cgal-discuss) 
same as 2d8f2caf54
 2013-06-03 09:06:08 +02:00
Sébastien Loriot 5635183db7 add global functions bbox_2 and bbox_3 in the Kernel 
remove the function from the 2D function from the Polygon package
 2013-05-31 19:44:21 +02:00
Sébastien Loriot 43d4a00db0 add operator+= in bbox classes 2013-05-31 19:09:31 +02:00
Marc Glisse 2bb3b27454 Merge branch 'Kernel_d-doc-glisse' 2013-05-30 22:14:12 +02:00
Ross Hemsley 4d9caf3763 Added names that were missing into the Doxyfile.in entries. 
Also modified Installation/CMakeLists.txt to push the version number variable to the parent level
so that it can be accessed by the documentation
 2013-05-30 17:55:43 +02:00
Philipp Möller d4e379ba82 Small fixes in the generated Doxyfile.in 2013-05-30 15:32:33 +02:00
Ross Hemsley c0690f87f4 Manually inserted tags that could not be generated automatically 
added in options that were in XML but were not moved across to new Doxyfile.in files.
 2013-05-30 14:45:18 +02:00
Philipp Möller 4d469821f7 Generated Doxyfile.in and dependencies 2013-05-30 14:13:47 +02:00
Monique Teillaud 2d8f2caf54 doc bug fix (following a question by a user on cgal-discuss) 2013-05-28 16:50:54 +02:00
Marc Glisse 2b26ecc42b Replace Point_2<R> with R::Point_2. 2013-05-27 15:30:06 +02:00
Sébastien Loriot 57325710ac remove extra typename and remove weird boost implementation detail in example 2013-05-23 14:44:47 +02:00
Sébastien Loriot c67ba90514 Merge branch 'Kernel-replace_object-pmoeller-old' into Kernel-replace_object-pmoeller 
Conflicts:
	Circular_kernel_2/include/CGAL/Circular_kernel_2/Circular_arc_2.h
	Circular_kernel_2/include/CGAL/Circular_kernel_2/internal_functions_on_circle_2.h
	Installation/changes.html
	Kernel_d/doc/Kernel_d/CGAL/intersections_d.h
	Kernel_d/doc/Kernel_d/Concepts/Kernel--Center_of_sphere_d.h
	Kernel_d/doc/Kernel_d/Concepts/Kernel--Compare_lexicographically_d.h
	Kernel_d/doc/Kernel_d/Concepts/Kernel--Component_accessor_d.h
	Kernel_d/doc/Kernel_d/Concepts/Kernel--Compute_coordinate_d.h
	Kernel_d/doc/Kernel_d/Concepts/Kernel--Contained_in_affine_hull_d.h
	Kernel_d/doc/Kernel_d/Concepts/Kernel--Contained_in_linear_hull_d.h
	Kernel_d/doc/Kernel_d/Concepts/Kernel--Contained_in_simplex_d.h
	Kernel_d/doc/Kernel_d/Concepts/Kernel--Equal_d.h
	Kernel_d/doc/Kernel_d/Concepts/Kernel--Has_on_positive_side_d.h
	Kernel_d/doc/Kernel_d/Concepts/Kernel--Intersect_d.h
	Kernel_d/doc/Kernel_d/Concepts/Kernel--Less_coordinate_d.h
	Kernel_d/doc/Kernel_d/Concepts/Kernel--Less_lexicographically_d.h
	Kernel_d/doc/Kernel_d/Concepts/Kernel--Less_or_equal_lexicographically_d.h
	Kernel_d/doc/Kernel_d/Concepts/Kernel--Lift_to_paraboloid_d.h
	Kernel_d/doc/Kernel_d/Concepts/Kernel--Linear_base_d.h
	Kernel_d/doc/Kernel_d/Concepts/Kernel--Linear_rank_d.h
	Kernel_d/doc/Kernel_d/Concepts/Kernel--Linearly_independent_d.h
	Kernel_d/doc/Kernel_d/Concepts/Kernel--Midpoint_d.h
	Kernel_d/doc/Kernel_d/Concepts/Kernel--Orientation_d.h
	Kernel_d/doc/Kernel_d/Concepts/Kernel--Oriented_side_d.h
	Kernel_d/doc/Kernel_d/Concepts/Kernel--Orthogonal_vector_d.h
	Kernel_d/doc/Kernel_d/Concepts/Kernel--Point_dimension_d.h
	Kernel_d/doc/Kernel_d/Concepts/Kernel--Point_of_sphere_d.h
	Kernel_d/doc/Kernel_d/Concepts/Kernel--Point_to_vector_d.h
	Kernel_d/doc/Kernel_d/Concepts/Kernel--Project_along_d_axis_d.h
	Kernel_d/doc/Kernel_d/Concepts/Kernel--Side_of_bounded_sphere_d.h
	Kernel_d/doc/Kernel_d/Concepts/Kernel--Side_of_oriented_sphere_d.h
	Kernel_d/doc/Kernel_d/Concepts/Kernel--Squared_distance_d.h
	Kernel_d/doc/Kernel_d/Concepts/Kernel--Value_at_d.h
	Kernel_d/doc/Kernel_d/Concepts/Kernel--Vector_to_point_d.h
 2013-05-23 13:13:08 +02:00
Sébastien Loriot 7baa997ce1 Merge branch 'Filtered_kernel-ring-glisse' 
This branch adds an additional way to filter predicates that are only doing
operations using a ring number type. In case of failure, a RT is used rather
than an FT which speeds things up.

Successfully tested in CGAL-4.3Ic-37
 2013-05-23 11:15:32 +02:00
Sébastien Loriot e907f9f444 improve Kernel_23, Kernel_d, STL_extension and Arrangemnt doxygen doc 2013-05-23 10:57:36 +02:00
Sébastien Loriot 12e8f44d0f fix doc-tex doc 2013-05-22 08:35:50 +02:00
Sébastien Loriot 7055eb1961 better document intersection() return types for the 2/3 linear kernel 2013-04-16 09:34:31 +02:00
Sébastien Loriot cbbecfbc83 fix intersection/do_intersect groups and links 2013-04-16 09:17:27 +02:00
Sébastien Loriot fff0776446 Merge branch 'Kernel_23-Iso_rectangle_2_Iso_cuboid_3_bbox_constructible' 
Conflicts:
	Kernel_23/include/CGAL/Iso_cuboid_3.h

Tested in CGAL-4.3-Ic-1
 2013-04-16 07:50:38 +02:00
Andreas Fabri f7d7395864 Merge branch 'OLD' into CGAL-use_leda-GF 
Conflicts:
	Boolean_set_operations_2/test/Boolean_set_operations_2/test_polygon_validation.cpp
	Envelope_2/test/Envelope_2/test_envelope_segments.cpp
	Intersections_3/test/Intersections_3/bbox_other_do_intersect_test.cpp
 2013-03-27 20:22:54 +01:00
Laurent Rineau b6ffa7c425 Merge branch 'CGAL-fix_warnings-GF' 
That branch was successfully tested in CGAL-4.2-Ic-205.
 2013-03-27 12:23:31 +01:00
Andreas Fabri 4d2f9280e8 Write an eol 2013-03-22 15:00:04 +01:00
Sébastien Loriot a50888d25d replace the recommanded boost way to have variadic variant by a macro 
This is usually not something I like but the type generated by
the recommanded approach is an internal obfuscated type while
the macro produces a variant<A, B, C> type
 2013-03-22 11:36:26 +01:00
Sébastien Loriot 9fcf46e11a replace CGAL_[kernel/qpe/triangulation/]_assertion by assert in tests 
this should be the case, following our guidelines.

using:
find */test/* -name '*.[hc]*' | xargs sed -i 's/CGAL_assertion/assert/g'
 2013-03-21 10:50:55 +01:00