From a4351336d2c2dfc5582ebbb320aa73ff50ea615c Mon Sep 17 00:00:00 2001 From: Andreas Fabri Date: Fri, 28 Aug 2015 15:09:37 +0200 Subject: [PATCH] integrate Laurent's comments --- .../include/CGAL/arrange_offset_polygons_2.h | 6 +++--- .../include/CGAL/create_offset_polygons_2.h | 13 ------------- ...eate_offset_polygons_from_polygon_with_holes_2.h | 2 +- 3 files changed, 4 insertions(+), 17 deletions(-) diff --git a/Straight_skeleton_2/include/CGAL/arrange_offset_polygons_2.h b/Straight_skeleton_2/include/CGAL/arrange_offset_polygons_2.h index 328dbea5ce2..bc69c2b2ad8 100644 --- a/Straight_skeleton_2/include/CGAL/arrange_offset_polygons_2.h +++ b/Straight_skeleton_2/include/CGAL/arrange_offset_polygons_2.h @@ -98,10 +98,10 @@ void arrange_offset_polygons_2 ( InputPolygonPtrIterator aBegin } } - template - std::vector< boost::shared_ptr< Polygon_with_holes_2 > > +template +std::vector< boost::shared_ptr< Polygon_with_holes_2 > > inline - arrange_offset_polygons_2 ( std::vector< boost::shared_ptr< Polygon_2 > > const& aPolygons ) +arrange_offset_polygons_2 ( std::vector< boost::shared_ptr< Polygon_2 > > const& aPolygons ) { std::vector< boost::shared_ptr< Polygon_with_holes_2 > > rResult ; diff --git a/Straight_skeleton_2/include/CGAL/create_offset_polygons_2.h b/Straight_skeleton_2/include/CGAL/create_offset_polygons_2.h index 74653708a63..e86767c77f6 100644 --- a/Straight_skeleton_2/include/CGAL/create_offset_polygons_2.h +++ b/Straight_skeleton_2/include/CGAL/create_offset_polygons_2.h @@ -200,20 +200,7 @@ create_offset_polygons_2 ( FT const& aOffset, Skeleton const& aSs, K const& k ) return create_offset_polygons_2(aOffset, aSs, k ) ; } -#if 0 // this is NOT documented -#if !defined(_MSC_VER) || ( _MSC_VER >= 1500 ) -template -std::vector< boost::shared_ptr< Polygon_2< typename Skeleton::Traits::Kernel > > > -inline -create_offset_polygons_2 ( FT const& aOffset, Skeleton const& aSs ) -{ - typedef typename Skeleton::Traits::Kernel K ; - - return create_offset_polygons_2(aOffset, aSs, K() ) ; -} -#endif -#endif template std::vector< boost::shared_ptr > diff --git a/Straight_skeleton_2/include/CGAL/create_offset_polygons_from_polygon_with_holes_2.h b/Straight_skeleton_2/include/CGAL/create_offset_polygons_from_polygon_with_holes_2.h index 3f72ef3f195..b9b9d1e0926 100644 --- a/Straight_skeleton_2/include/CGAL/create_offset_polygons_from_polygon_with_holes_2.h +++ b/Straight_skeleton_2/include/CGAL/create_offset_polygons_from_polygon_with_holes_2.h @@ -54,7 +54,7 @@ template std::vector< boost::shared_ptr< Polygon_with_holes_2 > > inline create_exterior_skeleton_and_offset_polygons_with_holes_2 ( FT const& aOffset - , Polygon_2 const& aPoly + , Polygon_2 const& aPoly , bool aDontReverseOrientation = false ) {