Merged trunc to branch

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

Former-commit-id: 20d5120a0702522b632008bfc6a5257c70c849d1

1 files changed, 49 insertions, 0 deletions

diff --git a/src/common/include/gudhi_patches/CGAL/NewKernel_d/Dimension_base.h b/src/common/include/gudhi_patches/CGAL/NewKernel_d/Dimension_base.h
new file mode 100644
index 00000000..be875e63
--- /dev/null
+++ b/src/common/include/gudhi_patches/CGAL/NewKernel_d/Dimension_base.h
@@ -0,0 +1,49 @@
+// 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_DIMENSION_BASE_h
+#define CGAL_KD_DIMENSION_BASE_h
+#include <CGAL/Dimension.h>
+#include <CGAL/assertions.h>
+#include <CGAL/NewKernel_d/utils.h>
+namespace CGAL {
+struct Store_dimension_base {
+	//TODO: add some assertions
+	Store_dimension_base(int dim=UNKNOWN_DIMENSION):dim_(dim){}
+	int dimension()const{return dim_;}
+	void set_dimension(int dim){dim_=dim;}
+	private:
+	int dim_;
+};
+template<class=Dynamic_dimension_tag>
+struct Dimension_base {
+	Dimension_base(int = UNKNOWN_DIMENSION){}
+	int dimension() const { return UNKNOWN_DIMENSION; }
+	void set_dimension(int) {}
+};
+template<int dim_>
+struct Dimension_base<Dimension_tag<dim_> > {
+	Dimension_base(){}
+	Dimension_base(int CGAL_assertion_code(dim)){CGAL_assertion(dim_==dim);}
+	int dimension()const{return dim_;}
+	void set_dimension(int dim){CGAL_assertion(dim_==dim);}
+};
+}
+#endif
+