From fe1f731e22c2e2bdf0d0bfb7c2e896f09f6dce43 Mon Sep 17 00:00:00 2001
From: Laurent Rineau <laurent.rineau@cgal.org>
Date: Tue, 21 Apr 2020 17:08:57 +0200
Subject: [PATCH] Fix timestamps

---
 Mesh_3/include/CGAL/Mesh_cell_base_3.h        |  3 ---
 Mesh_3/include/CGAL/Mesh_vertex_base_3.h      |  1 -
 .../Remeshing_cell_base_3.h                   | 21 +------------------
 .../Remeshing_vertex_base_3.h                 | 17 +--------------
 4 files changed, 2 insertions(+), 40 deletions(-)

diff --git a/Mesh_3/include/CGAL/Mesh_cell_base_3.h b/Mesh_3/include/CGAL/Mesh_cell_base_3.h
index dbb244bd66a..5c719d22fe6 100644
--- a/Mesh_3/include/CGAL/Mesh_cell_base_3.h
+++ b/Mesh_3/include/CGAL/Mesh_cell_base_3.h
@@ -141,7 +141,6 @@ public:
     , next_intrusive_()
     , previous_intrusive_()
 #endif
-    , time_stamp_(-1)
   {}
 
   Mesh_cell_base_3 (Vertex_handle v0,
@@ -156,7 +155,6 @@ public:
     , next_intrusive_()
     , previous_intrusive_()
 #endif
-    , time_stamp_(-1)
   {}
 
   Mesh_cell_base_3 (Vertex_handle v0,
@@ -175,7 +173,6 @@ public:
     , next_intrusive_()
     , previous_intrusive_()
 #endif
-    , time_stamp_(-1)
   {}
 
   // Default copy constructor and assignment operator are ok
diff --git a/Mesh_3/include/CGAL/Mesh_vertex_base_3.h b/Mesh_3/include/CGAL/Mesh_vertex_base_3.h
index 977782a8932..9ad67147d1b 100644
--- a/Mesh_3/include/CGAL/Mesh_vertex_base_3.h
+++ b/Mesh_3/include/CGAL/Mesh_vertex_base_3.h
@@ -127,7 +127,6 @@ public:
     , next_intrusive_()
     , previous_intrusive_()
 #endif //CGAL_INTRUSIVE_LIST
-    , time_stamp_(-1)
   {}
 
   // Default copy constructor and assignment operator are ok
diff --git a/Tetrahedral_remeshing/include/CGAL/Tetrahedral_remeshing/Remeshing_cell_base_3.h b/Tetrahedral_remeshing/include/CGAL/Tetrahedral_remeshing/Remeshing_cell_base_3.h
index df3678dec4f..038182d89fc 100644
--- a/Tetrahedral_remeshing/include/CGAL/Tetrahedral_remeshing/Remeshing_cell_base_3.h
+++ b/Tetrahedral_remeshing/include/CGAL/Tetrahedral_remeshing/Remeshing_cell_base_3.h
@@ -50,26 +50,7 @@ It has the default value `Triangulation_cell_base_3<Gt>`.
 */
 template<typename Gt,
          typename Cb = CGAL::Triangulation_cell_base_3<Gt> >
-class Remeshing_cell_base_3
-#ifndef DOXYGEN_RUNNING
-  : public CGAL::Mesh_cell_base_3<Gt, internal::Fake_MD_C, Cb>
-#endif
-{
-  typedef CGAL::Mesh_cell_base_3<Gt, internal::Fake_MD_C, Cb> Base;
-  typedef typename Base::Vertex_handle Vertex_handle;
-  typedef typename Base::Cell_handle   Cell_handle;
-
-public:
-  // To get correct cell type in TDS
-  template < class TDS2 >
-  struct Rebind_TDS
-  {
-    typedef typename Cb::template Rebind_TDS<TDS2>::Other Cb2;
-    typedef Remeshing_cell_base_3<Gt, Cb2> Other;
-  };
-
-  using Base::Base;
-};
+using Remeshing_cell_base_3 = CGAL::Mesh_cell_base_3<Gt, internal::Fake_MD_C, Cb>;
 
 }//end namespace Tetrahedral_remeshing
 }//end namespace CGAL
diff --git a/Tetrahedral_remeshing/include/CGAL/Tetrahedral_remeshing/Remeshing_vertex_base_3.h b/Tetrahedral_remeshing/include/CGAL/Tetrahedral_remeshing/Remeshing_vertex_base_3.h
index 148ca815d39..ed1baa454a6 100644
--- a/Tetrahedral_remeshing/include/CGAL/Tetrahedral_remeshing/Remeshing_vertex_base_3.h
+++ b/Tetrahedral_remeshing/include/CGAL/Tetrahedral_remeshing/Remeshing_vertex_base_3.h
@@ -53,22 +53,7 @@ It has the default value `Triangulation_vertex_base_3<Gt>`.
 
 template<typename GT,
          typename Vb = CGAL::Triangulation_vertex_base_3<GT> >
-class Remeshing_vertex_base_3
-#ifndef DOXYGEN_RUNNING
-  : public CGAL::Mesh_vertex_base_3<GT, internal::Fake_MD_V, Vb>
-#endif
-{
-  typedef CGAL::Mesh_vertex_base_3<GT, internal::Fake_MD_V, Vb> Base;
-
-public:
-  // To get correct vertex type in TDS
-  template < class TDS3 >
-  struct Rebind_TDS {
-    typedef typename Vb::template Rebind_TDS<TDS3>::Other Vb3;
-    typedef Remeshing_vertex_base_3<GT, Vb3> Other;
-  };
-
-};
+using Remeshing_vertex_base_3 = CGAL::Mesh_vertex_base_3<GT, internal::Fake_MD_V, Vb>;
 
 }//end namespace Tetrahedral_remeshing