From 0fbb1aa5a076e8b3afaa467f5cf17e04afa89b93 Mon Sep 17 00:00:00 2001
From: vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb>
Date: Wed, 28 Sep 2016 06:10:41 +0000
Subject: Move Miscellaneous from CGAL to gudhi

git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/bottleneck_integration@1575 636b058d-ea47-450e-bf9e-a15bfbe3eedb

Former-commit-id: a67dfe43c5915965468481ad4a8560b3a81d02a5
---
 .../include/gudhi/CGAL/Miscellaneous.h             | 51 ----------------------
 .../include/gudhi/Miscellaneous.h                  | 51 ++++++++++++++++++++++
 .../include/gudhi/Planar_neighbors_finder.h        |  2 +-
 3 files changed, 52 insertions(+), 52 deletions(-)
 delete mode 100644 src/Bottleneck_distance/include/gudhi/CGAL/Miscellaneous.h
 create mode 100644 src/Bottleneck_distance/include/gudhi/Miscellaneous.h

(limited to 'src/Bottleneck_distance')

diff --git a/src/Bottleneck_distance/include/gudhi/CGAL/Miscellaneous.h b/src/Bottleneck_distance/include/gudhi/CGAL/Miscellaneous.h
deleted file mode 100644
index 91632149..00000000
--- a/src/Bottleneck_distance/include/gudhi/CGAL/Miscellaneous.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*    This file is part of the Gudhi Library. The Gudhi library
- *    (Geometric Understanding in Higher Dimensions) is a generic C++
- *    library for computational topology.
- *
- *    Author(s):       Francois Godi
- *
- *    Copyright (C) 2015  INRIA Sophia-Antipolis (France)
- *
- *    This program is free software: you can redistribute it and/or modify
- *    it under the terms of the GNU General Public License as published by
- *    the Free Software Foundation, either version 3 of the License, or
- *    (at your option) any later version.
- *
- *    This program is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU General Public License for more details.
- *
- *    You should have received a copy of the GNU General Public License
- *    along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef SRC_BOTTLENECK_INCLUDE_CGAL_MISCELLANEOUS_H_
-#define SRC_BOTTLENECK_INCLUDE_CGAL_MISCELLANEOUS_H_
-
-#include <gudhi/Internal_point.h>
-
-namespace CGAL {
-
-typedef Gudhi::bottleneck_distance::Internal_point Internal_point;
-
-template <>
-struct Kernel_traits<Internal_point> {
-    struct Kernel {
-        typedef double FT;
-        typedef double RT;
-    };
-};
-
-
-struct Construct_coord_iterator {
-    typedef  const double* result_type;
-    const double* operator()(const Internal_point& p) const
-    { return static_cast<const double*>(p.vec); }
-    const double* operator()(const Internal_point& p, int)  const
-    { return static_cast<const double*>(p.vec+2); }
-};
-
-} //namespace CGAL
-
-#endif  // SRC_BOTTLENECK_INCLUDE_CGAL_MISCELLANEOUS_H_
diff --git a/src/Bottleneck_distance/include/gudhi/Miscellaneous.h b/src/Bottleneck_distance/include/gudhi/Miscellaneous.h
new file mode 100644
index 00000000..91632149
--- /dev/null
+++ b/src/Bottleneck_distance/include/gudhi/Miscellaneous.h
@@ -0,0 +1,51 @@
+/*    This file is part of the Gudhi Library. The Gudhi library
+ *    (Geometric Understanding in Higher Dimensions) is a generic C++
+ *    library for computational topology.
+ *
+ *    Author(s):       Francois Godi
+ *
+ *    Copyright (C) 2015  INRIA Sophia-Antipolis (France)
+ *
+ *    This program is free software: you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation, either version 3 of the License, or
+ *    (at your option) any later version.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef SRC_BOTTLENECK_INCLUDE_CGAL_MISCELLANEOUS_H_
+#define SRC_BOTTLENECK_INCLUDE_CGAL_MISCELLANEOUS_H_
+
+#include <gudhi/Internal_point.h>
+
+namespace CGAL {
+
+typedef Gudhi::bottleneck_distance::Internal_point Internal_point;
+
+template <>
+struct Kernel_traits<Internal_point> {
+    struct Kernel {
+        typedef double FT;
+        typedef double RT;
+    };
+};
+
+
+struct Construct_coord_iterator {
+    typedef  const double* result_type;
+    const double* operator()(const Internal_point& p) const
+    { return static_cast<const double*>(p.vec); }
+    const double* operator()(const Internal_point& p, int)  const
+    { return static_cast<const double*>(p.vec+2); }
+};
+
+} //namespace CGAL
+
+#endif  // SRC_BOTTLENECK_INCLUDE_CGAL_MISCELLANEOUS_H_
diff --git a/src/Bottleneck_distance/include/gudhi/Planar_neighbors_finder.h b/src/Bottleneck_distance/include/gudhi/Planar_neighbors_finder.h
index bf70ed0b..3a748169 100644
--- a/src/Bottleneck_distance/include/gudhi/Planar_neighbors_finder.h
+++ b/src/Bottleneck_distance/include/gudhi/Planar_neighbors_finder.h
@@ -30,12 +30,12 @@
 #include "CGAL/Kd_tree_node.h"
 #include "CGAL/Kd_tree.h"
 #include "CGAL/Orthogonal_incremental_neighbor_search.h"
-#include "CGAL/Miscellaneous.h"
 
 #include <CGAL/Weighted_Minkowski_distance.h>
 #include <CGAL/Search_traits.h>
 
 #include <gudhi/Persistence_diagrams_graph.h>
+#include <gudhi/Miscellaneous.h>
 
 
 namespace Gudhi {
-- 
cgit v1.2.3