Skip to content

Commit

Permalink
chore: replace typename tag / cs_tag with tag_t / cs_tag_t
Browse files Browse the repository at this point in the history
  • Loading branch information
barendgehrels committed Oct 31, 2024
1 parent 08a71cf commit a64f545
Show file tree
Hide file tree
Showing 250 changed files with 589 additions and 594 deletions.
4 changes: 2 additions & 2 deletions include/boost/geometry/algorithms/azimuth.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ namespace dispatch
template
<
typename Geometry1, typename Geometry2,
typename Tag1 = typename tag<Geometry1>::type,
typename Tag2 = typename tag<Geometry2>::type
typename Tag1 = tag_t<Geometry1>,
typename Tag2 = tag_t<Geometry2>
>
struct azimuth : not_implemented<Tag1, Tag2>
{};
Expand Down
8 changes: 4 additions & 4 deletions include/boost/geometry/algorithms/crosses.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ template
<
typename Geometry1,
typename Geometry2,
typename Tag1 = typename tag<Geometry1>::type,
typename Tag2 = typename tag<Geometry2>::type
typename Tag1 = tag_t<Geometry1>,
typename Tag2 = tag_t<Geometry2>
>
struct crosses
: detail::relate::relate_impl
Expand Down Expand Up @@ -215,8 +215,8 @@ namespace resolve_dynamic
template
<
typename Geometry1, typename Geometry2,
typename Tag1 = typename geometry::tag<Geometry1>::type,
typename Tag2 = typename geometry::tag<Geometry2>::type
typename Tag1 = geometry::tag_t<Geometry1>,
typename Tag2 = geometry::tag_t<Geometry2>
>
struct crosses
{
Expand Down
6 changes: 3 additions & 3 deletions include/boost/geometry/algorithms/densify.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -170,8 +170,8 @@ template
<
typename Geometry,
typename GeometryOut,
typename Tag1 = typename tag<Geometry>::type,
typename Tag2 = typename tag<GeometryOut>::type
typename Tag1 = tag_t<Geometry>,
typename Tag2 = tag_t<GeometryOut>
>
struct densify
: not_implemented<Tag1, Tag2>
Expand Down Expand Up @@ -360,7 +360,7 @@ struct densify<default_strategy, false>

namespace resolve_dynamic {

template <typename Geometry, typename Tag = typename tag<Geometry>::type>
template <typename Geometry, typename Tag = tag_t<Geometry>>
struct densify
{
template <typename Distance, typename Strategy>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -873,10 +873,7 @@ struct buffer_inserter<multi_tag, Multi, PolygonOutput>
PolygonOutput,
dispatch::buffer_inserter
<
typename single_tag_of
<
typename tag<Multi>::type
>::type,
typename single_tag_of<tag_t<Multi>>::type,
typename boost::range_value<Multi const>::type,
typename geometry::ring_type<PolygonOutput>::type
>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -447,7 +447,7 @@ struct buffered_piece_collection
// Check if turns are inside pieces
turn_in_piece_visitor
<
typename geometry::cs_tag<point_type>::type,
geometry::cs_tag_t<point_type>,
turn_vector_type, piece_vector_type, DistanceStrategy, Strategy
> visitor(m_turns, m_pieces, m_distance_strategy, m_strategy);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ namespace traits
template <typename Ring>
struct tag<geometry::detail::buffer::buffered_ring<Ring> >
{
typedef ring_tag type;
using type = ring_tag;
};


Expand Down Expand Up @@ -177,7 +177,7 @@ struct point_order<detail::buffer::buffered_ring_collection_tag,
template <>
struct single_tag_of<detail::buffer::buffered_ring_collection_tag>
{
typedef ring_tag type;
using type = ring_tag;
};


Expand Down
12 changes: 6 additions & 6 deletions include/boost/geometry/algorithms/detail/buffer/interface.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ template
<
typename Input,
typename Output,
typename TagIn = typename tag<Input>::type,
typename TagOut = typename tag<Output>::type
typename TagIn = tag_t<Input>,
typename TagOut = tag_t<Output>
>
struct buffer_dc : not_implemented<TagIn, TagOut>
{};
Expand All @@ -48,8 +48,8 @@ template
<
typename Input,
typename Output,
typename TagIn = typename tag<Input>::type,
typename TagOut = typename tag<Output>::type
typename TagIn = tag_t<Input>,
typename TagOut = tag_t<Output>
>
struct buffer_all : not_implemented<TagIn, TagOut>
{};
Expand All @@ -64,7 +64,7 @@ namespace resolve_dynamic
template
<
typename Input,
typename TagIn = typename geometry::tag<Input>::type
typename TagIn = geometry::tag_t<Input>
>
struct buffer_dc
{
Expand Down Expand Up @@ -101,7 +101,7 @@ struct buffer_dc<Input, dynamic_geometry_tag>
template
<
typename Input,
typename TagIn = typename geometry::tag<Input>::type
typename TagIn = geometry::tag_t<Input>
>
struct buffer_all
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -345,10 +345,10 @@ inline geometry::order_selector calculate_point_order(Ring const& ring, Strategy
template <typename Ring>
inline geometry::order_selector calculate_point_order(Ring const& ring)
{
typedef typename strategy::point_order::services::default_strategy
using strategy_type = typename strategy::point_order::services::default_strategy
<
typename geometry::cs_tag<Ring>::type
>::type strategy_type;
geometry::cs_tag_t<Ring>
>::type;

concepts::check<Ring const>();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ template
typename MultiGeometry,
bool CheckCoveredBy = std::is_same
<
typename tag<MultiGeometry>::type, multi_polygon_tag
tag_t<MultiGeometry>, multi_polygon_tag
>::value
>
class point_to_multigeometry
Expand Down Expand Up @@ -429,7 +429,7 @@ struct closest_points
> : closest_points
<
Point, Linear,
point_tag, typename tag<Linear>::type, false
point_tag, tag_t<Linear>, false
>
{};

Expand All @@ -441,7 +441,7 @@ struct closest_points
> : closest_points
<
Point, Areal,
point_tag, typename tag<Areal>::type, false
point_tag, tag_t<Areal>, false
>
{};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -124,8 +124,8 @@ namespace resolve_dynamic
template
<
typename Geometry1, typename Geometry2,
typename Tag1 = typename geometry::tag<Geometry1>::type,
typename Tag2 = typename geometry::tag<Geometry2>::type
typename Tag1 = geometry::tag_t<Geometry1>,
typename Tag2 = geometry::tag_t<Geometry2>
>
struct comparable_distance
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ struct input_geometry_collection_proxy

// TODO: Or just implement point_type<> for GeometryCollection
// and enforce the same point_type used in the whole sequence in check().
template <typename Geometry, typename Tag = typename tag<Geometry>::type>
template <typename Geometry, typename Tag = tag_t<Geometry>>
struct default_strategy
{
using type = typename strategies::convex_hull::services::default_strategy
Expand Down Expand Up @@ -201,7 +201,7 @@ namespace dispatch
template
<
typename Geometry,
typename Tag = typename tag<Geometry>::type
typename Tag = tag_t<Geometry>
>
struct convex_hull
{
Expand Down Expand Up @@ -304,7 +304,7 @@ struct convex_hull<GeometryCollection, geometry_collection_tag>
};


template <typename OutputGeometry, typename Tag = typename tag<OutputGeometry>::type>
template <typename OutputGeometry, typename Tag = tag_t<OutputGeometry>>
struct convex_hull_out
{
BOOST_GEOMETRY_STATIC_ASSERT_FALSE("This OutputGeometry is not supported.", OutputGeometry, Tag);
Expand Down Expand Up @@ -531,7 +531,7 @@ struct convex_hull<default_strategy>

namespace resolve_dynamic {

template <typename Geometry, typename Tag = typename tag<Geometry>::type>
template <typename Geometry, typename Tag = tag_t<Geometry>>
struct convex_hull
{
template <typename OutputGeometry, typename Strategy>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ template
<
typename Geometry1,
typename Geometry2,
typename Tag1 = typename tag<Geometry1>::type,
typename Tag2 = typename tag<Geometry2>::type
typename Tag1 = tag_t<Geometry1>,
typename Tag2 = tag_t<Geometry2>
>
struct covered_by
: not_implemented<Tag1, Tag2>
Expand Down Expand Up @@ -122,8 +122,8 @@ namespace resolve_dynamic {
template
<
typename Geometry1, typename Geometry2,
typename Tag1 = typename geometry::tag<Geometry1>::type,
typename Tag2 = typename geometry::tag<Geometry2>::type
typename Tag1 = geometry::tag_t<Geometry1>,
typename Tag2 = geometry::tag_t<Geometry2>
>
struct covered_by
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ struct direction_code_impl<spherical_tag>
<
std::is_same
<
typename geometry::cs_tag<PointSegmentA>::type,
geometry::cs_tag_t<PointSegmentA>,
spherical_polar_tag
>::value,
spherical_polar_tag,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ template
<
typename Segment,
typename Areal,
typename Tag = typename tag<Areal>::type
typename Tag = tag_t<Areal>
>
struct disjoint_segment_areal
: not_implemented<Segment, Areal>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -111,8 +111,8 @@ struct disjoint_linear
disjoint_interrupt_policy interrupt_policy;
dispatch::get_turns
<
typename geometry::tag<Geometry1>::type,
typename geometry::tag<Geometry2>::type,
geometry::tag_t<Geometry1>,
geometry::tag_t<Geometry2>,
Geometry1,
Geometry2,
overlay::do_reverse<geometry::point_order<Geometry1>::value>::value, // should be false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ namespace detail { namespace disjoint
template
<
typename SegmentOrBox,
typename Tag = typename tag<SegmentOrBox>::type
typename Tag = tag_t<SegmentOrBox>
>
struct disjoint_point_segment_or_box
: not_implemented<Tag>
Expand Down Expand Up @@ -135,7 +135,7 @@ template
<
typename Linear,
typename SegmentOrBox,
typename Tag = typename tag<Linear>::type
typename Tag = tag_t<Linear>
>
struct disjoint_linear_segment_or_box
: not_implemented<Linear, SegmentOrBox>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -461,7 +461,7 @@ class multi_point_multi_geometry
};


template <typename MultiPoint, typename Areal, typename Tag = typename tag<Areal>::type>
template <typename MultiPoint, typename Areal, typename Tag = tag_t<Areal>>
struct multipoint_areal
: multi_point_single_geometry<MultiPoint, Areal>
{};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ namespace detail { namespace distance
template
<
typename SegmentOrBox,
typename Tag = typename tag<SegmentOrBox>::type
typename Tag = tag_t<SegmentOrBox>
>
struct segment_or_box_point_range_closure
: not_implemented<SegmentOrBox>
Expand All @@ -76,7 +76,7 @@ template
typename Geometry,
typename SegmentOrBox,
typename Strategies,
typename Tag = typename tag<Geometry>::type
typename Tag = tag_t<Geometry>
>
class geometry_to_segment_or_box
{
Expand All @@ -97,7 +97,7 @@ class geometry_to_segment_or_box
template
<
typename SegOrBox,
typename SegOrBoxTag = typename tag<SegOrBox>::type
typename SegOrBoxTag = tag_t<SegOrBox>
>
struct assign_new_min_iterator
: not_implemented<SegOrBox>
Expand Down Expand Up @@ -128,7 +128,7 @@ class geometry_to_segment_or_box
<
typename SegOrBox,
typename PointRange,
typename SegOrBoxTag = typename tag<SegOrBox>::type
typename SegOrBoxTag = tag_t<SegOrBox>
>
struct assign_segment_or_box_points
{};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -187,8 +187,8 @@ namespace resolve_dynamic
template
<
typename Geometry1, typename Geometry2,
typename Tag1 = typename geometry::tag<Geometry1>::type,
typename Tag2 = typename geometry::tag<Geometry2>::type
typename Tag1 = geometry::tag_t<Geometry1>,
typename Tag2 = geometry::tag_t<Geometry2>
>
struct distance
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ namespace detail { namespace distance


// class to choose between point_iterator and segment_iterator
template <typename Geometry, typename Tag = typename tag<Geometry>::type>
template <typename Geometry, typename Tag = tag_t<Geometry>>
struct iterator_selector
{
typedef geometry::segment_iterator<Geometry> iterator_type;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -315,10 +315,7 @@ template
typename Point,
typename MultiGeometry,
typename Strategies,
bool CheckCoveredBy = std::is_same
<
typename tag<MultiGeometry>::type, multi_polygon_tag
>::value
bool CheckCoveredBy = std::is_same<tag_t<MultiGeometry>, multi_polygon_tag>::value
>
class point_to_multigeometry
{
Expand Down Expand Up @@ -509,7 +506,7 @@ struct distance
> : distance
<
Point, Linear, Strategy,
point_tag, typename tag<Linear>::type,
point_tag, tag_t<Linear>,
strategy_tag_distance_point_segment, false
>
{};
Expand All @@ -523,7 +520,7 @@ struct distance
> : distance
<
Point, Areal, Strategy,
point_tag, typename tag<Areal>::type,
point_tag, tag_t<Areal>,
strategy_tag_distance_point_segment, false
>
{};
Expand Down
Loading

0 comments on commit a64f545

Please sign in to comment.