From 3e25674957e631f6095b10639b07e8694cf3397c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mael=20Rouxel-Labb=C3=A9?=
 <mael.rouxel.labbe@geometryfactory.com>
Date: Thu, 27 Apr 2017 00:13:08 +0200
Subject: [PATCH] Weighted alpha shape traits are not based on
 RT_euclidean_traits anymore

Similarly to Regular_triangulation_euclidean_traits, the Kernel concept has now
absorbed all the functors that are needed by the alpha shape traits concept and
the weighted alpha shape traits can thus simply be empty shells.
---
 .../Weighted_alpha_shape_euclidean_traits_2.h | 30 ++++++----------
 .../Weighted_alpha_shape_euclidean_traits_3.h | 34 +++++++------------
 2 files changed, 24 insertions(+), 40 deletions(-)

diff --git a/Alpha_shapes_2/include/CGAL/Weighted_alpha_shape_euclidean_traits_2.h b/Alpha_shapes_2/include/CGAL/Weighted_alpha_shape_euclidean_traits_2.h
index 3d86ec4be9b..55f1ca124cb 100644
--- a/Alpha_shapes_2/include/CGAL/Weighted_alpha_shape_euclidean_traits_2.h
+++ b/Alpha_shapes_2/include/CGAL/Weighted_alpha_shape_euclidean_traits_2.h
@@ -12,10 +12,6 @@
 // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 //
-// $URL$
-// $Id$
-// 
-//
 // Author(s)     : Tran Kai Frank DA <Frank.Da@sophia.inria.fr>
 //                 Andreas Fabri <Andreas.Fabri@geometryfactory.com>
 
@@ -24,26 +20,22 @@
 
 #include <CGAL/license/Alpha_shapes_2.h>
 
-// temporarily silenced
-/*
 #define CGAL_DEPRECATED_HEADER "<CGAL/Weighted_alpha_shape_euclidean_traits_2.h>"
-#define CGAL_REPLACEMENT_HEADER "<CGAL/Regular_triangulation_euclidean_traits_2.h>"
 #define CGAL_DEPRECATED_MESSAGE_DETAILS \
-  "The class Weighted_alpha_shape_euclidean_traits_2<K> is deprecated in favor of "\
-  "Regular_triangulation_euclidean_traits_2<K>."
+  "The kernel K can be used directly as traits since weighted points and "\
+  "the associated function objects are now part of the concept Kernel."
 #include <CGAL/internal/deprecation_warning.h>
-*/
-
-#include <CGAL/Regular_triangulation_euclidean_traits_2.h>
 
 namespace CGAL {
 
-template< class R >
-class Weighted_alpha_shape_euclidean_traits_2 : public
-  Regular_triangulation_euclidean_traits_2<R, typename R::FT>
-{};
+template< class K_ >
+class Weighted_alpha_shape_euclidean_traits_2
+  : public K_
+{
+  Weighted_alpha_shape_euclidean_traits_2() { }
+  Weighted_alpha_shape_euclidean_traits_2(const K_& k) : K_(k) { }
+};
 
-} //namespace CGAL
+} // namespace CGAL
 
-
-#endif //CGAL_WEIGHTED_ALPHA_SHAPE_EUCLIDEAN_TRAITS_2_H
+#endif // CGAL_WEIGHTED_ALPHA_SHAPE_EUCLIDEAN_TRAITS_2_H
diff --git a/Alpha_shapes_3/include/CGAL/Weighted_alpha_shape_euclidean_traits_3.h b/Alpha_shapes_3/include/CGAL/Weighted_alpha_shape_euclidean_traits_3.h
index 7c6dc165cd9..c096f5e480b 100644
--- a/Alpha_shapes_3/include/CGAL/Weighted_alpha_shape_euclidean_traits_3.h
+++ b/Alpha_shapes_3/include/CGAL/Weighted_alpha_shape_euclidean_traits_3.h
@@ -12,10 +12,6 @@
 // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 //
-// $URL$
-// $Id$
-// 
-//
 // Author(s)     : Tran Kai Frank DA <Frank.Da@sophia.inria.fr>
 
 #ifndef CGAL_WEIGHTED_ALPHA_SHAPE_EUCLIDEAN_TRAITS_3_H
@@ -23,26 +19,22 @@
 
 #include <CGAL/license/Alpha_shapes_3.h>
 
-// temporarily silenced
-/*
 #define CGAL_DEPRECATED_HEADER "<CGAL/Weighted_alpha_shape_euclidean_traits_3.h>"
-#define CGAL_REPLACEMENT_HEADER "<CGAL/Regular_triangulation_euclidean_traits_3.h>"
 #define CGAL_DEPRECATED_MESSAGE_DETAILS \
-  "The class Weighted_alpha_shape_euclidean_traits_3<K> is deprecated in favor of "\
-  "Regular_triangulation_euclidean_traits_3<K>."
+  "The kernel K can be used directly as traits since weighted points and "\
+  "the associated function objects are now part of the concept Kernel."
 #include <CGAL/internal/deprecation_warning.h>
-*/
-
-#include <CGAL/Regular_triangulation_euclidean_traits_3.h>
 
 namespace CGAL {
 
-template <class K>
-class Weighted_alpha_shape_euclidean_traits_3 : public 
-Regular_triangulation_euclidean_traits_3<K>
-{};
-  
-  
-} //namespace CGAL
-  
-#endif //CGAL_WEIGHTED_ALPHA_SHAPE_EUCLIDEAN_TRAITS_3_H 
+template < class K_ >
+class Weighted_alpha_shape_euclidean_traits_3
+  : public K_
+{
+  Weighted_alpha_shape_euclidean_traits_3() { }
+  Weighted_alpha_shape_euclidean_traits_3(const K_& k) : K_(k) { }
+};
+
+} // namespace CGAL
+
+#endif // CGAL_WEIGHTED_ALPHA_SHAPE_EUCLIDEAN_TRAITS_3_H