From 16aaf4cda5fd97da12a7f1da8b0a5168fac2e289 Mon Sep 17 00:00:00 2001
From: vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb>
Date: Tue, 11 Oct 2016 13:57:03 +0000
Subject: Problem of merge with tangentialcomplex branch. Redo in an
 integration branch

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

Former-commit-id: fa029e8e90b3e203ea675f02098ec6fe95596f9f
---
 .../gudhi_patches/CGAL/NewKernel_d/Vector/mix.h    | 46 ++++++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100644 src/common/include/gudhi_patches/CGAL/NewKernel_d/Vector/mix.h

(limited to 'src/common/include/gudhi_patches/CGAL/NewKernel_d/Vector/mix.h')

diff --git a/src/common/include/gudhi_patches/CGAL/NewKernel_d/Vector/mix.h b/src/common/include/gudhi_patches/CGAL/NewKernel_d/Vector/mix.h
new file mode 100644
index 00000000..d4cfeeb1
--- /dev/null
+++ b/src/common/include/gudhi_patches/CGAL/NewKernel_d/Vector/mix.h
@@ -0,0 +1,46 @@
+// Copyright (c) 2014
+// INRIA Saclay-Ile de France (France)
+//
+// This file is part of CGAL (www.cgal.org); you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public License as
+// published by the Free Software Foundation; either version 3 of the License,
+// or (at your option) any later version.
+//
+// Licensees holding a valid commercial license may use this file in
+// accordance with the commercial license agreement provided with the software.
+//
+// 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)     : Marc Glisse
+
+#ifndef CGAL_KD_MIX_VECTOR_H
+#define CGAL_KD_MIX_VECTOR_H
+#include <CGAL/Dimension.h>
+namespace CGAL {
+
+template <class Static_, class Dynamic_, class NT_ ,class Dim_, class Max_dim_ = Dim_>
+struct Mix_vector
+: Dynamic_::template Rebind_dimension<Dim_, Max_dim_>::Other
+{
+  template <class D2, class D3 = D2>
+  struct Rebind_dimension {
+    typedef Mix_vector<Static_, Dynamic_, NT_, D2, D3> Other;
+  };
+};
+
+template <class Static_, class Dynamic_, class NT_, int d, class Max_dim_>
+struct Mix_vector<Static_, Dynamic_, NT_, Dimension_tag<d>, Max_dim_>
+: Static_::template Rebind_dimension<Dimension_tag<d>, Max_dim_>::Other
+{
+  template <class D2, class D3 = D2>
+  struct Rebind_dimension {
+    typedef Mix_vector<Static_, Dynamic_, NT_, D2, D3> Other;
+  };
+};
+}
+#endif
+
-- 
cgit v1.2.3