Guillaume Damiand
b375202409
Add a function in compact container to test if a pointer is the first or last element of a block.
2017-03-29 12:45:28 -04:00
Simon Giraudot
025c4e9db1
Fix iterator range size type
2017-03-10 15:28:49 +01:00
Clement Jamin
a160851e56
"thread_id" => "thread_priority"
2017-03-09 17:48:50 +01:00
Laurent Rineau
52a2242b60
Merge pull request #1929 from sgiraudot/Point_set_processing-Optimize_grid_simplify-GF
...
Optimizations for grid simplication
2017-03-02 16:55:08 +01:00
Laurent Rineau
366ddb9513
Merge pull request #1939 from lrineau/Mesh_3-fix_determinism-GF
...
Fix non-determinism!
2017-03-02 16:54:50 +01:00
Laurent Rineau
cb5b3acf98
Class Compare_handles_with_or_without_timestamps to replace hacks
...
Previously, each file was using its own implementation of the "compare
handle" function object. This commits adds a new class
`Compare_handles_with_or_without_timestamps` that checks the presence of
`Has_timestamp` in the pointed type, and provides a different
`operator()` depending on that.
2017-03-01 12:08:52 +01:00
Simon Giraudot
b351ec33da
Remove useless backward compat cpp0x
2017-02-27 12:17:46 +01:00
Simon Giraudot
588c8634b9
Add CGAL::cpp11::unordered_set/map using boost or std
2017-02-27 09:56:54 +01:00
Laurent Rineau
ff4da475e3
Merge pull request #1650 from afabri/STL_extensions-static-GF
...
STL_extension: error/warning behavior/handler is not thread safe
2016-11-18 10:58:10 +01:00
Andreas Fabri
fe09323aa7
Make the allocator in CGAL::vector not static
2016-11-02 17:47:19 +01:00
Laurent Rineau
d5e97c734c
Protect another "max"
2016-10-28 14:01:26 +02:00
Jane Tournois
fa72bc0f01
replace std::max by (std::max) for windows
...
same for min
2016-10-27 17:55:40 +02:00
Simon Giraudot
bfcacf9312
Bugfix: typo on boost namespace
2016-10-21 10:28:41 +02:00
Simon Giraudot
2a8cd6b466
Fix boost demangle
2016-10-21 10:28:41 +02:00
Laurent Rineau
b562718efa
Merge pull request #1589 from sloriot/Kernel-boost_apply_visitor_workaround
...
Workaround a bug in boost 1.58 with c++14
2016-10-20 09:47:54 +02:00
Sébastien Loriot
ba6c0758e7
workaround a bug in boost 1.58 with c++14
...
https://svn.boost.org/trac/boost/ticket/11285
2016-10-18 11:41:32 +02:00
Laurent Rineau
7a84cbceea
Merge pull request #1509 from gdamiand/Compact_container-add_debug_function-gdamiand
...
Add index function in Compact container
2016-10-17 10:01:27 +02:00
Guillaume Damiand
f034fe2a92
Move assert; it was at the wrong place.
2016-10-06 08:38:57 -04:00
Laurent Rineau
223c1cf5a4
Merge pull request #1530 from lrineau/Installation-compute_dependencies-GF
...
Compute and fix packages dependencies
2016-10-05 13:11:04 +02:00
Laurent Rineau
434cbcf0bb
Add missing includes
2016-09-30 15:23:15 +02:00
Laurent Rineau
1aefb3b0f3
include <CGAL/config.h>, not <CGAL/basic.h>
2016-09-30 15:23:14 +02:00
Guillaume Damiand
0cf192cd44
Add index function in Compact container (usefull to debug)
2016-09-28 17:14:07 -04:00
Maxime Gimeno
8469c45336
Enhance Prevent_deref API and use it.
2016-09-28 10:48:07 +02:00
Maxime Gimeno
3eb1f4ca69
Clean-up
...
- Clean-up
- Moved Prevent_deref to CGAL/iterator.h
2016-09-28 10:45:46 +02:00
Laurent Rineau
331eac693a
Merge pull request #1467 from lrineau/STL_Extension-fix_CGAL_static_assertion-lrineau
...
Always include <boost/static_assert.hpp>
2016-09-16 15:52:34 +02:00
Laurent Rineau
8fe3f26c6f
Always include <boost/static_assert.hpp>
...
If C++11 `static_assert` cannot be used, `BOOST_STATIC_ASSERT` is used
instead *even with `CGAL_NO_ASSERTIONS`*.
2016-09-16 15:25:23 +02:00
Sébastien Loriot
25be975789
Merge remote-tracking branch 'cgal/releases/CGAL-4.8-branch'
2016-09-16 13:42:24 +02:00
Sebastien Loriot
efd30df215
add missing const
2016-09-15 15:49:02 +02:00
Laurent Rineau
ae3285de1b
Merge fixes from 'cgal/releases/CGAL-4.8-branch'
...
> 3466dee Merge pull request #1378 from sloriot/Polyline_simplification_2-handle_undefined_cost
> 7dd7f12 Merge pull request #1448 from afabri/BGL_graph_traits_OpenMesh-GF
2016-09-13 18:29:33 +02:00
Laurent Rineau
b97b709a8d
Merge pull request #1377 from afabri/BGL-OM_HAS_HASH-GF
...
hash_value is not defined inside an #ifdef OM_HAS_HASH
2016-09-13 18:11:17 +02:00
Sébastien Loriot
3b583dfc3f
if the cost is undefined, remove the element from the queue
2016-08-30 11:34:43 +02:00
Andreas Fabri
ad2ec90426
typo
2016-08-30 10:15:15 +02:00
Andreas Fabri
26de0fbb05
hash_value is not defined inside an #ifdef OM_HAS_HASH
2016-08-29 23:25:06 +02:00
Laurent Rineau
be8b97eaeb
Fix CGAL_NO_ASSERTIONS
...
- `CGAL_NO_ASSERTIONS` was used *before* it was potentially modified by
the `NDEBUG` macro.
- I have also added a macro `CGAL_DEBUG` that allows to disable `assert`
but not CGAL assertions, using:
-DNDEBUG -DCGAL_DEBUG
2016-08-29 19:25:50 +02:00
Laurent Rineau
0c690014b7
Remove all usage of CGAL_LEDA_VERSION
...
Now, LEDA version >= 6.0 is required if `CGAL_USE_LEDA` is toggled.
2016-08-25 14:38:16 +02:00
Sebastien Loriot
3204aeedf6
simplify empty()
2016-07-06 17:25:57 +02:00
Andreas Fabri
4c78fb44bc
Add specializations for the OM handle classes
2016-06-08 10:42:45 +02:00
Andreas Fabri
d84be563f8
Add hash_value and specialization of hash for OpenMesh
2016-06-06 19:10:58 +02:00
Andreas Fabri
ca6a306815
Rename TimeStamper::key() to hash_value() and let it return a size_t
2016-04-19 17:03:52 +02:00
Laurent Rineau
9176624834
Restore the determinism of Mesh_3
...
Note that, by default, `Triangulation_3::remove` is not deterministic:
it iterates on a `std::map` (or a `boost::unordered_map`) where the key
type is a triple of vertex handles: the order of that iteration depends
on the comparison (or hashing) of pointers.
2016-04-19 13:56:07 +02:00
Andreas Fabri
7ce7a68cd0
Make Triple hashable
2016-04-15 20:49:54 +02:00
Laurent Rineau
a67bc9822e
Merge pull request #895 from afabri/CGAL-LGPL-GF
...
Move infrastructure files into infrastructure packages and change their license
2016-03-29 11:08:43 +02:00
Andreas Fabri
d12e511097
Change license to LGPL for files that were moved from point set processing to STL_extension and Property_map
2016-03-09 17:04:07 +01:00
Andreas Fabri
324daa0b78
move value_traits
2016-03-09 16:35:49 +01:00
Andreas Fabri
eb90e8e3e1
Include consistently <CGAL/property_map.h>
2016-02-24 12:09:36 +01:00
Simon Giraudot
c20bbba168
Work-around C++0x tuple bug with GCC4.4
2016-02-04 18:24:18 +01:00
Andreas Fabri
4f33354ace
Use CGAL_USE
2016-01-21 09:24:15 +01:00
Sebastien Loriot
4e9448cb9e
Merge pull request #451 from GilesBathgate/throwing-destructors
...
Introduces a CGAL_destructor_assertion macro.
2016-01-14 14:08:10 +01:00
Sébastien Loriot
0e64f5b1be
add missing `empty()` function and make_range overload for pair of iterators
2015-12-29 16:55:49 +01:00
Giles Bathgate
9645135ff5
Introduces a CGAL_destructor_assertion macro.
...
This macro can safely be called from a destructor, even when
the stack is currently unwinding, and thus prevents uncatchable
exceptions.
2015-11-23 16:47:59 +00:00
Laurent Rineau
330a0e75a2
Merge pull request #385 from cjamin/CGAL_headers_only-gdamiand_cjamin
...
CGAL headers only, step 0
2015-10-13 16:37:38 +02:00
Andreas Fabri
2b43a79e0a
Add hashing to the concurent compact container
2015-10-05 10:15:24 +02:00
Guillaume Damiand
cf1c0ea0ca
Merge branch 'CGAL_headers_only-gdamiand_cjamin-OLD' into CGAL_headers_only-gdamiand_cjamin
2015-10-01 09:12:55 +02:00
Andreas Fabri
a2f954ebf9
Merge branch 'Intersections_3-snippet2example-GF-old' into Intersections_3-snippet2example-GF
2015-09-18 12:56:29 +02:00
Laurent Rineau
a3187fd35e
Merge pull request #285 from janetournois/CGAL-support_msvc2015-GF
...
Initial support for MSVC 2015
2015-08-27 16:34:29 +02:00
Laurent Rineau
0fd6f2fa59
Merge pull request #288 from afabri/CGAL-add_hash-GF
...
No longer forward declare struct std:hash
Fixes issues #287 and #274 .
2015-08-27 15:41:50 +02:00
Andreas Fabri
4183f6ba69
fixed comment
2015-08-23 15:20:19 +02:00
Andreas Fabri
bf975ead95
No longer forward declare struct std:hash
2015-08-23 14:30:54 +02:00
Jane Tournois
d52bbfaef9
fix the iterator type in mutable_priority_queue,
...
boost 1.59 still contains this bug too
2015-08-17 15:51:19 +02:00
Laurent Rineau
08666dce25
Merge pull request #179 from afabri/CGAL-add_hash-GF
...
Add boost::hash and std::hash
https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/hash
Conflicts:
Installation/changes.html
2015-07-17 15:39:18 +02:00
Sébastien Loriot
2668d83d4e
Merge pull request #150 from 'cjamin/Point_set_shape_detection_3-cjamin'
...
Add an algorithm to fit geometric primitives on a point set
Conflicts:
Installation/changes.html
Polyhedron/demo/Polyhedron/CMakeLists.txt
2015-07-17 14:32:09 +02:00
Sébastien Loriot
50595505c4
Merge branch 'Fix_warnings-GF'
...
Fixes warnings in various packages
Successfully tested in CGAL-4.7-Ic-87
Approved by the release Manager
2015-07-17 14:21:21 +02:00
Laurent Rineau
25df59411d
Merge branch 'releases/CGAL-4.6-branch'
...
Fix a miscompilation by clang-3.6.x
https://github.com/CGAL/cgal/pull/161
2015-07-15 17:02:02 +02:00
Sébastien Loriot
d26e112cf4
fix warnings
2015-07-15 16:57:38 +02:00
Laurent Rineau
17857e15d3
Same patch for <CGAL/Concurrent_compact_container.h>
...
Patch similar to the previous commit.
2015-07-15 11:33:51 +02:00
Laurent Rineau
c774546e1b
A better fix, using operator->()
2015-07-14 18:02:40 +02:00
Andreas Fabri
2dea6db3bb
Merge branch 'CGAL-add_hash-GF-old' into CGAL-add_hash-GF
...
Conflicts:
Surface_mesh/include/CGAL/Surface_mesh/Surface_mesh.h
2015-07-06 10:51:23 +02:00
Laurent Rineau
2591e6cc7d
Fix a miscompilation by clang-3.6.x
...
Fix issue #139
2015-07-03 17:28:11 +02:00
Guillaume Damiand
d67542fb59
Add is_xxx_used in cmap for dart and attributes; add tests in CMap and LCC.
2015-06-22 16:50:56 +02:00
Guillaume Damiand
a0b569b83d
Remove asserts that avoir to increment/decrement iterators on removed elements.
2015-06-17 09:51:20 +02:00
Guillaume Damiand
a423368960
Add also is_used in Concurrent_compact_container to be consistent
2015-06-16 19:48:01 +02:00
Guillaume Damiand
25e28a9cf0
Add is_used function (in code and doc)
2015-06-16 12:29:59 +02:00
Clement Jamin
1097079153
Merge branch 'Point_set_shape_detection_3-cjamin-old' into Point_set_shape_detection_3-cjamin
2015-06-12 16:04:59 +02:00
Andreas Fabri
dadb129147
g++ needs a forward declaration for std::hash
2015-06-02 08:46:20 +02:00
Andreas Fabri
b6850d35c0
#include <functional> and suppress struct/class warning for VC10
2015-06-01 10:42:52 +02:00
Andreas Fabri
cf058cba9c
do not use hash of pointers so that our specializations for handles are injective
2015-05-27 17:02:00 +02:00
Andreas Fabri
425cdf0b0c
derive from unary_function; Add #define switch to hash underlying pointer
2015-05-27 12:19:55 +02:00
Andreas Fabri
8c20bd91c2
Replace CGAL::get() with CGAL::get_pointee_or_identity() and remove using get::
2015-05-13 16:18:31 +02:00
Andreas Fabri
b7f9849599
Replace CGAL::get() with CGAL::get_pointee_or_identity() and remove using get::
2015-04-30 11:31:21 +02:00
Sébastien Loriot
5006193a57
add missing size() function
2015-04-29 15:18:54 +02:00
Andreas Fabri
6f42513e58
divide by sizeof(pointee) for Compact_container
2015-04-27 13:44:18 +02:00
Andreas Fabri
79459e8fb8
remove free functions in Iterator_range
2015-04-21 11:57:45 +02:00
Andreas Fabri
d74567a177
WIP
2015-04-20 16:11:08 +02:00
Andreas Fabri
89b4f37411
divide by sizeof(pointee) in the hash
2015-04-20 14:32:52 +02:00
Andreas Fabri
0c2a568d73
better coverage of the combinations of mesh and map classes
2015-04-20 10:40:03 +02:00
Sébastien Loriot
d36593eb72
add missing const and remove debug output
2015-04-17 17:22:26 +02:00
Andreas Fabri
832208d815
simplifications
2015-04-17 15:49:21 +02:00
Andreas Fabri
205a594a77
add specializations of hash and add tests
2015-04-17 10:21:14 +02:00
Clement Jamin
ed3113f89d
Code clean-up
2015-03-16 17:01:49 +01:00
Clement Jamin
8bd1fd196c
Revert "Temporary CGAL_EXPORT redef"
...
This reverts commit 5aaa7e8f4f .
It was already there!
2015-03-16 15:13:02 +01:00
Clement Jamin
5aaa7e8f4f
Temporary CGAL_EXPORT redef
2015-03-16 14:51:32 +01:00
Guillaume Damiand
9c78897ba5
Merge branch 'CGAL_headers_only-gdamiand_cjamin-old' into CGAL_headers_only-gdamiand_cjamin
2015-03-16 14:00:43 +01:00
Andreas Fabri
962ef07812
Add hash_value for Compact_container, Inplace_list, Index
2015-03-12 16:21:56 +01:00
Andreas Fabri
1f989622e7
replace \code with real examples
2015-02-09 10:54:24 +01:00
Andreas Fabri
cc4192a628
Merge branch 'Surface_mesh-fixes-GF'
...
Approved by the release manager
Conflicts:
STL_Extension/include/CGAL/Iterator_range.h
2015-01-26 16:54:03 +01:00
Andreas Fabri
8e801bbc80
no need to use boost::range_iterator
2015-01-19 09:00:21 +01:00
Andreas Fabri
06cc350143
include a boost header instead of a forward declaration as the number of template arguments changed
2015-01-16 09:54:34 +01:00
Laurent Rineau
beda93fd8e
The declaration of boost::range has changed
...
Use the header <boost/range.hpp>, instead of a forward declaration.
2015-01-13 15:34:02 +01:00
Andreas Fabri
8929fd43c1
Merge branch 'Triangulation_2-NewPolylineConstraint-GF'
...
Approved by the release manager
Conflicts:
Documentation/resources/how_to_cite_cgal.bib.in
2015-01-12 11:44:32 +01:00
Andreas Fabri
6e36a853a9
Merge branch 'Surface_mesh-new_package-GF'
...
Approved by the release manager
Conflicts:
Documentation/doc/Documentation/dependencies
Documentation/resources/how_to_cite_cgal.bib.in
Installation/changes.html
2015-01-12 11:27:35 +01:00
Laurent Rineau
040916239f
That cast operator is useless
...
Intel Compiler even warns about that:
.../include/CGAL/Iterator_range.h(51): warning #597 :
""CGAL::Iterator_range<I>::operator [...]" will not be called for
implicit or explicit conversions
operator Base() const
^
2014-12-31 12:49:09 +01:00
Sébastien Loriot
d4f875782c
use boost::tuple if using clang and libc++
2014-12-30 12:18:14 +01:00
Jane Tournois
175c4b321e
Merge branch 'releases/CGAL-4.5-branch'
...
Approved by the release manager
2014-12-19 11:31:32 +01:00
Laurent Rineau
4a7929c611
Fix license header: should be LGPLv3+
2014-12-18 16:51:32 +01:00
Jane Tournois
90a74c1bb6
fix a bug that happens on vc10, because atomics are not initialized
2014-12-16 16:42:22 +01:00
Jane Tournois
88142b2997
fix compilation for TBB 4.3
...
this partial specialization was only used for testing, so it can be removed
The problem comes from the std::vector of mutex(s), which can't be copied
using the std::vector operator=
2014-12-16 13:02:39 +01:00
Clement Jamin
93a007616a
Header-only CGAL_Core
2014-12-15 21:34:29 +01:00
Jane Tournois
3a5a65f264
update branch
2014-12-08 17:30:41 +01:00
Clement Jamin
e18e59a72a
Header-only for package Kinetic_data_structures
2014-12-02 20:41:19 +01:00
Andreas Fabri
59aab9ba49
two step renaming in order to capitalize
2014-11-26 17:17:56 +01:00
Andreas Fabri
8f54ee3fa2
two step renaming in order to capitalize
2014-11-26 17:17:43 +01:00
Andreas Fabri
4355794781
iterator_range moved the package
2014-11-12 14:40:51 +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
bc30ff8d98
Add assertions_impl
2014-10-30 18:51:45 +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
34a9d85575
adress some remarks of the reviews
2014-10-06 12:44:24 +02:00
Andreas Fabri
1979820571
cleanup
2014-10-01 12:27:20 +02:00
Andreas Fabri
8e83b04cb5
move iterator_range.h from BGL to STL_Extension
2014-10-01 09:37:11 +02:00
Andreas Fabri
8dfbe2eba4
Remove class Range again, and put functionality into iterator_range
2014-10-01 09:36:10 +02:00
Andreas Fabri
5cee5c6348
Remove the typedefs for the iterators as we offer ranges
...
Remove the free functions for accessing properties
2014-09-30 11:28:45 +02:00
Andreas Fabri
08a033ffb4
Integrate remarks from the review by Michael and Guillaume.
...
Switch from pair of iterators to a range class
2014-09-26 16:53:37 +02:00
Andreas Fabri
43b8390a70
Merge branch 'Triangulation_2-NewPolylineConstraint-GF-old' into Triangulation_2-NewPolylineConstraint-GF
2014-08-08 12:47:15 +02:00
Laurent Rineau
333854f38a
Fix the license of two files
...
Trivial fix for master.
2014-07-31 16:19:05 +02:00
Laurent Rineau
3deb8e7910
Merge branch 'Mesh_3-compare_index-GF-old' into Mesh_3-compare_index-GF
...
Create an integration branch for 'Mesh_3-compare_index-GF': a new branch
created from 'master', where I merged the previous version of
'Mesh_3-compare_index-GF'.
There was a conflict with two features recently merged into 'master' for
CGAL-4.5:
- the move of two files from include/CGAL/Mesh_3/ to include/CGAL/. See
the small feature:
http://cgal.org/wiki/Features/Small_Features/New_constructor_in_Label_mesh_domain_3_and_new_function_wrapper
- parallelism for Triangulation_3 and Mesh_3:
http://cgal.org/wiki/Features/Parallel_Mesh_3
Conflicts:
Combinatorial_map/include/CGAL/Cell_attribute.h
Mesh_3/include/CGAL/Implicit_mesh_domain_3.h
Mesh_3/include/CGAL/Labeled_image_mesh_domain_3.h
Mesh_3/include/CGAL/Mesh_3/Sliver_perturber.h
Mesh_3/include/CGAL/Polyhedral_mesh_domain_3.h
Mesh_3/test/Mesh_3/test_meshing_3D_image.cpp
Mesh_3/test/Mesh_3/test_meshing_polyhedron.cpp
Mesh_3/test/Mesh_3/test_meshing_polyhedron_with_features.cpp
Polyhedron/demo/Polyhedron/Polyhedron_type.h
STL_Extension/include/CGAL/Compact_container.h
STL_Extension/test/STL_Extension/test_Compact_container.cpp
I also modified the following files during the conflict resolution:
Linear_cell_complex/include/CGAL/Cell_attribute_with_point.h
Mesh_3/include/CGAL/Labeled_mesh_domain_3.h
Mesh_3/include/CGAL/Polyhedral_mesh_domain_with_features_3.h
2014-07-18 15:47:14 +02:00
Clement Jamin
fbf824c711
Merge branch 'Mesh_3-parallel-cjamin'
...
This branch introduces parallel algorithms in Triangulation_3 and Mesh_3,
as well as a Concurrent_compact_container. The corresponding features are:
https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Parallel_triangulation_3
https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Parallel_Mesh_3
Tested in CGAL-4.5-Ic-98.
Approved by the Release Manager.
2014-07-17 19:08:24 +02:00
Clement Jamin
2ae815910e
Switch to LGPL
2014-07-17 18:36:21 +02:00
Andreas Fabri
b1f4afbd33
Macros MUST be prefixed with CGAL_
...
-pedantic does not like extra semicolons
todo: cleanup: The macro is there twice.
2014-07-09 15:41:08 +02:00
Sébastien Loriot
2aadba50d7
Merge branch 'BGL-redesign_final-GF'
...
Introduces a redesign of the CGAL extension of the BGL API
Successfully tested in CGAL-4.5-Ic-90
Approved by the Release Manager
Conflicts:
Surface_mesh_segmentation/test/Surface_mesh_segmentation/test_compute_sdf_values_and_segment_exact_rational.cpp
2014-07-08 19:45:16 +02:00
Clement Jamin
f742be081b
Fix spaces
2014-07-08 15:40:29 +02:00
Clement Jamin
f7396790ff
Fix merge function
...
Fixes memory leaks, and maybe some other potential problems
2014-07-07 13:41:33 +02:00
Clement Jamin
a9887cbe9f
Remove a useless constructor that was causing an error
2014-07-04 11:56:02 +02:00
Sébastien Loriot
fee85470c1
Merge branch 'Triangulation_3-determinism-gf' into to-be-tested/Triangulation_3-determinism-gf
...
Conflicts:
.gitattributes
Matrix_search/include/CGAL/rectangular_3_center_2.h
Spatial_sorting/include/CGAL/spatial_sort.h
2014-07-03 16:34:46 +02:00
Clement Jamin
6aeaf509cf
Add line break at the end of the file
2014-07-02 09:03:21 +02:00
Clement Jamin
e3abf7fc40
Merge branch 'Mesh_3-parallel-cjamin-old' into Mesh_3-parallel-cjamin
2014-07-01 10:38:14 +02:00
Sébastien Loriot
675d26e884
add non-documented remove_const fcts to turn a const-iterator to an iterator
2014-06-24 16:35:10 +02:00
Clement Jamin
6ed794da5b
Replace ">>" by "> >"
2014-06-19 19:09:31 +02:00
Clement Jamin
c9c8335811
More code clean-up
2014-05-27 13:46:34 +02:00
Clement Jamin
dfe800bc40
Clean-up debug code (global lock)
2014-05-27 12:16:29 +02:00
Clement Jamin
de485dfc10
Use s_iterator_to and remove the constructor I had added temporarily
2014-05-23 17:17:16 +02:00
Sébastien Loriot
c7df582fc2
Revert "add the time stamper mecanism into In_place_list"
...
This reverts commit 5e2ab7fddc .
2014-05-22 11:18:55 +02:00
Sébastien Loriot
2d14739716
additional fixes for Combinatorial map package
2014-05-21 18:47:33 +02:00
Sébastien Loriot
3fa09693a3
Merge branch 'Mesh_3-compare_index-GF-old' into Mesh_3-compare_index-GF
...
Conflicts:
Mesh_3/include/CGAL/Mesh_3/Detect_features_in_polyhedra.h
Mesh_3/include/CGAL/Mesh_domain_with_polyline_features_3.h
Mesh_3/include/CGAL/Mesh_polyhedron_3.h
Mesh_3/test/Mesh_3/test_meshing_polylines_only.cpp
STL_Extension/include/CGAL/Compact_container.h
STL_Extension/test/STL_Extension/test_Compact_container.cpp
2014-05-21 18:24:17 +02:00
Sébastien Loriot
5e2ab7fddc
add the time stamper mecanism into In_place_list
2014-05-21 16:33:54 +02:00
Sébastien Loriot
1bffc44ed4
factorize the mecanism to define the time stamper in a container
2014-05-21 16:30:32 +02:00
Sébastien Loriot
c6fa3f4a3a
add missing namespace
2014-05-21 12:51:20 +02:00
Sébastien Loriot
82f9a83e2d
move the Time stamper into a separate file
2014-05-21 12:20:50 +02:00
Sébastien Loriot
cbd50574e4
clean up comments, include and copyright
2014-05-21 12:08:12 +02:00
Andreas Fabri
2f967ba6e4
the testsuite for the new version of the Constrained_triangulation_plus_2 passes
2014-05-19 15:57:24 +02:00
Andreas Fabri
85b29aed5f
treat merge conflicts
2014-05-15 16:09:24 +02:00
Clement Jamin
f3c00442fd
Merge branch 'Mesh_3-parallel-cjamin-old' into Mesh_3-parallel-cjamin
2014-05-14 19:05:40 +02:00