diff options
| author | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2016-12-02 08:01:50 +0000 |
|---|---|---|
| committer | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2016-12-02 08:01:50 +0000 |
| commit | ee3a59722aa0902c7fbde0f923c558b3b7dbb0b2 (patch) | |
| tree | e42c1b06fa3664cf6504ab0bfdc166134bf00f58 /src/Tangential_complex | |
| parent | 004dac98fde448065a1697ea696a67153ccdb77e (diff) | |
| parent | ce1dd7df37c459e666372a234448383417f38753 (diff) | |
Merge last trunk modifications
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/tangential_test@1812 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Former-commit-id: 2d39f5e9b1dc30044dbb90222296bf2d88a99f82
Diffstat (limited to 'src/Tangential_complex')
| -rw-r--r-- | src/Tangential_complex/include/gudhi/Tangential_complex.h | 38 |
1 files changed, 20 insertions, 18 deletions
diff --git a/src/Tangential_complex/include/gudhi/Tangential_complex.h b/src/Tangential_complex/include/gudhi/Tangential_complex.h index 7cf5c498..e748d3b7 100644 --- a/src/Tangential_complex/include/gudhi/Tangential_complex.h +++ b/src/Tangential_complex/include/gudhi/Tangential_complex.h @@ -121,11 +121,12 @@ class Vertex_data { * \tparam Triangulation_ is the type used for storing the local regular triangulations. We highly recommend to use the default value (`CGAL::Regular_triangulation`). * */ -template < -typename Kernel_, // ambiant kernel -typename DimensionTag, // intrinsic dimension -typename Concurrency_tag = CGAL::Parallel_tag, -typename Triangulation_ = CGAL::Default +template +< + typename Kernel_, // ambiant kernel + typename DimensionTag, // intrinsic dimension + typename Concurrency_tag = CGAL::Parallel_tag, + typename Triangulation_ = CGAL::Default > class Tangential_complex { typedef Kernel_ K; @@ -136,19 +137,20 @@ class Tangential_complex { typedef typename CGAL::Default::Get < - Triangulation_, - CGAL::Regular_triangulation - < - CGAL::Epick_d<DimensionTag>, - CGAL::Triangulation_data_structure - < - typename CGAL::Epick_d<DimensionTag>::Dimension, - CGAL::Triangulation_vertex<CGAL::Regular_triangulation_traits_adapter< - CGAL::Epick_d<DimensionTag> >, Vertex_data >, - CGAL::Triangulation_full_cell<CGAL::Regular_triangulation_traits_adapter< - CGAL::Epick_d<DimensionTag> > > - > - > + Triangulation_, + CGAL::Regular_triangulation + < + CGAL::Epick_d<DimensionTag>, + CGAL::Triangulation_data_structure + < + typename CGAL::Epick_d<DimensionTag>::Dimension, + CGAL::Triangulation_vertex + < + CGAL::Regular_triangulation_traits_adapter< CGAL::Epick_d<DimensionTag> >, Vertex_data + >, + CGAL::Triangulation_full_cell<CGAL::Regular_triangulation_traits_adapter< CGAL::Epick_d<DimensionTag> > > + > + > >::type Triangulation; typedef typename Triangulation::Geom_traits Tr_traits; typedef typename Triangulation::Weighted_point Tr_point; |