From 64e6c96afa4d1a95b8d6ee74ea910c1cb80ebbd9 Mon Sep 17 00:00:00 2001 From: ROUVREAU Vincent Date: Fri, 14 Jun 2019 14:45:22 +0200 Subject: Remove gudhi_patches for CGAL and CGAL 4.11.0 is now the minimal CGAL version required. Modification of documentation accordingly --- .../gudhi_patches/CGAL/NewKernel_d/Vector/array.h | 165 --------------------- 1 file changed, 165 deletions(-) delete mode 100644 src/common/include/gudhi_patches/CGAL/NewKernel_d/Vector/array.h (limited to 'src/common/include/gudhi_patches/CGAL/NewKernel_d/Vector/array.h') diff --git a/src/common/include/gudhi_patches/CGAL/NewKernel_d/Vector/array.h b/src/common/include/gudhi_patches/CGAL/NewKernel_d/Vector/array.h deleted file mode 100644 index 0ad9bb36..00000000 --- a/src/common/include/gudhi_patches/CGAL/NewKernel_d/Vector/array.h +++ /dev/null @@ -1,165 +0,0 @@ -// 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_VECTOR_ARRAY_H -#define CGAL_VECTOR_ARRAY_H -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include - - - -namespace CGAL { - -// May not be safe to use with dim!=max_dim. -// In that case, we should store the real dim next to the array. -template struct Array_vector { - typedef NT_ NT; - typedef Dim_ Dimension; - typedef Max_dim_ Max_dimension; - template< class D2, class D3=D2 > - struct Rebind_dimension { - typedef Array_vector< NT, D2, D3 > Other; - }; - template struct Property : boost::false_type {}; - - static const unsigned d_=Max_dim_::value; - CGAL_static_assertion(d_ != (unsigned)UNKNOWN_DIMENSION); - - typedef cpp0x::array Vector; - struct Construct_vector { - struct Dimension { - // Initialize with NaN if possible? - Vector operator()(unsigned CGAL_assertion_code(d)) const { - CGAL_assertion(d<=d_); - return Vector(); - } - }; - - struct Iterator { - template - Vector operator()(unsigned CGAL_assertion_code(d),Iter const& f,Iter const& e) const { - CGAL_assertion(d==(unsigned) std::distance(f,e)); - CGAL_assertion(d<=d_); - //TODO: optimize for forward iterators - Vector a; - std::copy(f,e,a.begin()); - return a; - } - }; - -#if 0 - struct Iterator_add_one { - template - Vector operator()(unsigned d,Iter const& f,Iter const& e) const { - CGAL_assertion(d==std::distance(f,e)+1); - CGAL_assertion(d<=d_); - //TODO: optimize - Vector a; - std::copy(f,e,a.begin()); - a.back()=1; - return a; - } - }; -#endif - - struct Iterator_and_last { - template - Vector operator()(unsigned CGAL_assertion_code(d),Iter const& f,Iter const& e,CGAL_FORWARDABLE(T) t) const { - CGAL_assertion(d==std::distance(f,e)+1); - CGAL_assertion(d<=d_); - //TODO: optimize for forward iterators - Vector a; - std::copy(f,e,a.begin()); - a.back()=CGAL_FORWARD(T,t); - return a; - } - }; - - struct Values { -#ifdef CGAL_CXX11 - template - Vector operator()(U&&...u) const { - static_assert(sizeof...(U)<=d_,"too many arguments"); - Vector a={{forward_safe(u)...}}; - return a; - } -#else - -#define CGAL_CODE(Z,N,_) Vector operator()(BOOST_PP_ENUM_PARAMS(N,NT const& t)) const { \ - CGAL_assertion(N<=d_); \ - Vector a={{BOOST_PP_ENUM_PARAMS(N,t)}}; \ - return a; \ -} -BOOST_PP_REPEAT_FROM_TO(1, 11, CGAL_CODE, _ ) -#undef CGAL_CODE - -#endif - }; - - struct Values_divide { -#ifdef CGAL_CXX11 - template - Vector operator()(H const& h,U&&...u) const { - static_assert(sizeof...(U)<=d_,"too many arguments"); - Vector a={{Rational_traits().make_rational(std::forward(u),h)...}}; - return a; - } -#else - -#define CGAL_VAR(Z,N,_) Rational_traits().make_rational( t##N , h) -#define CGAL_CODE(Z,N,_) template Vector \ - operator()(H const&h, BOOST_PP_ENUM_PARAMS(N,NT const& t)) const { \ - CGAL_assertion(N<=d_); \ - Vector a={{BOOST_PP_ENUM(N,CGAL_VAR,_)}}; \ - return a; \ - } - BOOST_PP_REPEAT_FROM_TO(1, 11, CGAL_CODE, _ ) -#undef CGAL_CODE -#undef CGAL_VAR - -#endif - }; - }; - - typedef NT const* Vector_const_iterator; - static Vector_const_iterator vector_begin(Vector const&a){ - return &a[0]; - } - static Vector_const_iterator vector_end(Vector const&a){ - return &a[0]+d_; // Don't know the real size - } - static unsigned size_of_vector(Vector const&){ - return d_; // Don't know the real size - } - -}; - -} -#endif -- cgit v1.2.3