From 06f73990f4257f14c5ce4fbe69873d2111746e14 Mon Sep 17 00:00:00 2001
From: Guillaume Damiand <guillaume.damiand@liris.cnrs.fr>
Date: Wed, 22 Mar 2017 17:41:58 -0400
Subject: [PATCH] Small modifs to minimize diff with master.

---
 .../Combinatorial_map_internal_functors.h     |  9 ---------
 .../include/CGAL/Linear_cell_complex_traits.h | 19 ++++++++-----------
 2 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/Combinatorial_map/include/CGAL/internal/Combinatorial_map_internal_functors.h b/Combinatorial_map/include/CGAL/internal/Combinatorial_map_internal_functors.h
index 56702208d26..f47ef0bbe34 100644
--- a/Combinatorial_map/include/CGAL/internal/Combinatorial_map_internal_functors.h
+++ b/Combinatorial_map/include/CGAL/internal/Combinatorial_map_internal_functors.h
@@ -216,10 +216,6 @@ struct Test_is_valid_attribute_functor
    * ie all the darts belonging to a i-cell are linked to the same attribute.
    * @param adart a dart.
    * @param amark a mark used to mark darts of the i-cell.
-   * @param reverseextremity to inverse the convention between source and
-   *        target of a dart. With false (default), a dart is associated with
-   *        a 0-attribute for its source (origin);
-   *        with true this is for its target (as in hds or surface mesh).
    * @return true iff all the darts of the i-cell link to the same attribute.
    */
   typedef typename CMap::size_type size_type;
@@ -243,11 +239,6 @@ struct Test_is_valid_attribute_functor
     typename CMap::template Attribute_const_handle<i>::type
         a=amap.template attribute<i>(adart);
 
-    if (i==0 && reverseextremity)
-    {
-      a=amap->template attribute<i>(amap->template beta<2>(adart));
-    }
-
     unsigned int nb = 0;
     for ( typename
             CMap::template Dart_of_cell_basic_const_range<i>::const_iterator
diff --git a/Linear_cell_complex/include/CGAL/Linear_cell_complex_traits.h b/Linear_cell_complex/include/CGAL/Linear_cell_complex_traits.h
index d434d041daa..dbf122e396d 100644
--- a/Linear_cell_complex/include/CGAL/Linear_cell_complex_traits.h
+++ b/Linear_cell_complex/include/CGAL/Linear_cell_complex_traits.h
@@ -41,12 +41,11 @@ namespace CGAL {
    *  dD version (for the moment there is only one dD kernel in CGAL).
    */
   template <unsigned int d_,
-            class Kernel_=typename LCC_default_kernel<d_>::type >
-  struct Linear_cell_complex_traits : public Kernel_
+            class Kernel=typename LCC_default_kernel<d_>::type >
+  struct Linear_cell_complex_traits : public Kernel
   {
     static const unsigned int ambient_dimension = d_;
-
-    typedef Kernel_                      Kernel;
+    
     typedef typename Kernel::FT          FT;
     typedef typename Kernel::Point_d     Point;
     typedef typename Kernel::Vector_d    Vector;
@@ -90,12 +89,11 @@ namespace CGAL {
   /** Trait class for Linear_cell_complex class.
    *  2D version specialization.
    */
-  template <class Kernel_>
-  struct Linear_cell_complex_traits<2,Kernel_> : public Kernel_
+  template <class Kernel>
+  struct Linear_cell_complex_traits<2,Kernel> : public Kernel
   {
     static const unsigned int ambient_dimension = 2;
-
-    typedef Kernel_                      Kernel;
+    
     typedef typename Kernel::FT          FT;
     typedef typename Kernel::Point_2     Point;
     typedef typename Kernel::Vector_2    Vector;
@@ -119,12 +117,11 @@ namespace CGAL {
   /** Trait class for Linear_cell_complex class.
    *  3D version specialization.
    */
-  template <class Kernel_>
-  struct Linear_cell_complex_traits<3,Kernel_> : public Kernel_
+  template <class Kernel>
+  struct Linear_cell_complex_traits<3,Kernel> : public Kernel
   {
     static const unsigned int ambient_dimension = 3;
 
-    typedef Kernel_                      Kernel;
     typedef typename Kernel::FT          FT;
     typedef typename Kernel::Point_3     Point;
     typedef typename Kernel::Vector_3    Vector;