diff --git a/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Detail/Edge_collapse_impl.h b/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Detail/Edge_collapse_impl.h index f08dd008554..bcfffe9edac 100644 --- a/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Detail/Edge_collapse_impl.h +++ b/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Detail/Edge_collapse_impl.h @@ -19,8 +19,6 @@ #ifndef CGAL_SURFACE_MESH_SIMPLIFICATION_DETAIL_EDGE_COLLAPSE_IMPL_H #define CGAL_SURFACE_MESH_SIMPLIFICATION_DETAIL_EDGE_COLLAPSE_IMPL_H -#include - namespace CGAL { namespace Surface_mesh_simplification @@ -644,11 +642,6 @@ EdgeCollapse::find_exterior_link_triangle_3rd_ver return r ; } -namespace internal{ - -BOOST_MPL_HAS_XXX_TRAIT_NAMED_DEF(Do_skip_geom_test,Skip_geom_valid_test,false) - -} //namespace CGAL::internal // A collapse is geometrically valid if, in the resulting local mesh no two adjacent triangles form an internal dihedral angle // greater than a fixed threshold (i.e. triangles do not "fold" into each other) @@ -659,7 +652,7 @@ bool EdgeCollapse::Is_collapse_geometrically_vali bool rR = true ; CGAL_ECMS_TRACE(3,"Testing geometrical collapsabilty of v0-v1=E" << get(Edge_index_map,aProfile.v0_v1()) ); - if ( k0 && !internal::Do_skip_geom_test::value ) + if ( k0 ) { // // Use the current link to extract all local triangles incident to 'vx' in the collapsed mesh (which at this point doesn't exist yet) diff --git a/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Policies/Edge_collapse/Geometric_test_skipper.h b/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Policies/Edge_collapse/Geometric_test_skipper.h deleted file mode 100644 index acf7695d2d1..00000000000 --- a/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Policies/Edge_collapse/Geometric_test_skipper.h +++ /dev/null @@ -1,34 +0,0 @@ -// Copyright (c) 2013 GeometryFactory (France). All rights reserved. -// -// This file is part of CGAL (www.cgal.org). -// 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. -// -// 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) : Sebastien Loriot -// -#ifndef CGAL_SURFACE_MESH_SIMPLIFICATION_POLICIES_GEOMETRIC_TEST_SKIPPER_H -#define CGAL_SURFACE_MESH_SIMPLIFICATION_POLICIES_GEOMETRIC_TEST_SKIPPER_H 1 - -namespace CGAL { - -namespace Surface_mesh_simplification -{ - template - struct Geometric_test_skipper: public GetPlacement{ - struct Skip_geom_valid_test{}; - }; -} - -} - -#endif // CGAL_SURFACE_MESH_SIMPLIFICATION_POLICIES_GEOMETRIC_TEST_SKIPPER_H \ No newline at end of file