diff options
Diffstat (limited to 'boost/geometry/strategies/concepts/area_concept.hpp')
-rw-r--r-- | boost/geometry/strategies/concepts/area_concept.hpp | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/boost/geometry/strategies/concepts/area_concept.hpp b/boost/geometry/strategies/concepts/area_concept.hpp index 4eec6d1fc3..66982e3f27 100644 --- a/boost/geometry/strategies/concepts/area_concept.hpp +++ b/boost/geometry/strategies/concepts/area_concept.hpp @@ -3,6 +3,7 @@ // Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands. // Copyright (c) 2008-2012 Bruno Lalande, Paris, France. // Copyright (c) 2009-2012 Mateusz Loskot, London, UK. +// Copyright (c) 2017 Adam Wulkiewicz, Lodz, Poland. // Parts of Boost.Geometry are redesigned from Geodan's Geographic Library // (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands. @@ -26,19 +27,16 @@ namespace boost { namespace geometry { namespace concepts \brief Checks strategy for area \ingroup area */ -template <typename Strategy> +template <typename Geometry, typename Strategy> class AreaStrategy { #ifndef DOXYGEN_NO_CONCEPT_MEMBERS - // 1) must define state_type, - typedef typename Strategy::state_type state_type; + // 1) must define state template, + typedef typename Strategy::template state<Geometry> state_type; - // 2) must define return_type, - typedef typename Strategy::return_type return_type; - - // 3) must define point_type, of polygon (segments) - typedef typename Strategy::segment_point_type spoint_type; + // 2) must define result_type template, + typedef typename Strategy::template result_type<Geometry>::type return_type; struct check_methods { @@ -47,11 +45,11 @@ class AreaStrategy Strategy const* str = 0; state_type *st = 0; - // 4) must implement a method apply with the following signature - spoint_type const* sp = 0; + // 3) must implement a method apply with the following signature + typename geometry::point_type<Geometry>::type const* sp = 0; str->apply(*sp, *sp, *st); - // 5) must implement a static method result with the following signature + // 4) must implement a static method result with the following signature return_type r = str->result(*st); boost::ignore_unused_variable_warning(r); |