Skip to content

Commit 3f46f47

Browse files
awulkiewtinko92
authored andcommitted
[setops] Rename single_tag_from_base_tag util and remove commented code.
1 parent e8d243b commit 3f46f47

File tree

4 files changed

+12
-13
lines changed

4 files changed

+12
-13
lines changed

include/boost/geometry/algorithms/detail/tupled_output.hpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -667,22 +667,22 @@ struct expect_output<Geometry1, Geometry2, TupledOut, Tag1, void, void>
667667

668668

669669
template <typename CastedTag>
670-
struct casted_tag_to_single_tag;
670+
struct single_tag_from_base_tag;
671671

672672
template <>
673-
struct casted_tag_to_single_tag<pointlike_tag>
673+
struct single_tag_from_base_tag<pointlike_tag>
674674
{
675675
typedef point_tag type;
676676
};
677677

678678
template <>
679-
struct casted_tag_to_single_tag<linear_tag>
679+
struct single_tag_from_base_tag<linear_tag>
680680
{
681681
typedef linestring_tag type;
682682
};
683683

684684
template <>
685-
struct casted_tag_to_single_tag<areal_tag>
685+
struct single_tag_from_base_tag<areal_tag>
686686
{
687687
typedef polygon_tag type;
688688
};

include/boost/geometry/algorithms/difference.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ template
7575
>
7676
struct call_intersection_insert_tupled_base
7777
{
78-
typedef typename geometry::detail::casted_tag_to_single_tag
78+
typedef typename geometry::detail::single_tag_from_base_tag
7979
<
8080
typename geometry::tag_cast
8181
<

include/boost/geometry/algorithms/sym_difference.hpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -397,14 +397,14 @@ struct sym_difference_insert
397397
: detail::expect_output
398398
<
399399
Geometry1, Geometry2, GeometryOut,
400-
typename detail::casted_tag_to_single_tag<TagIn1>::type,
401-
typename detail::casted_tag_to_single_tag<TagIn2>::type
400+
typename detail::single_tag_from_base_tag<TagIn1>::type,
401+
typename detail::single_tag_from_base_tag<TagIn2>::type
402402
>
403403
, detail::sym_difference::sym_difference_different_inputs_tupled_output
404404
<
405405
GeometryOut,
406-
typename detail::casted_tag_to_single_tag<TagIn1>::type,
407-
typename detail::casted_tag_to_single_tag<TagIn2>::type
406+
typename detail::single_tag_from_base_tag<TagIn1>::type,
407+
typename detail::single_tag_from_base_tag<TagIn2>::type
408408
>
409409
{};
410410

include/boost/geometry/algorithms/union.hpp

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ struct union_insert
161161
false
162162
>
163163
{
164-
typedef typename geometry::detail::casted_tag_to_single_tag
164+
typedef typename geometry::detail::single_tag_from_base_tag
165165
<
166166
CastedTagIn
167167
>::type single_tag;
@@ -278,7 +278,7 @@ struct union_insert
278278
false
279279
>
280280
{
281-
typedef typename geometry::detail::casted_tag_to_single_tag
281+
typedef typename geometry::detail::single_tag_from_base_tag
282282
<
283283
CastedTagIn1
284284
>::type single_tag1;
@@ -288,7 +288,7 @@ struct union_insert
288288
Geometry1, Geometry2, SingleTupledOut, single_tag1
289289
> expect_check1;
290290

291-
typedef typename geometry::detail::casted_tag_to_single_tag
291+
typedef typename geometry::detail::single_tag_from_base_tag
292292
<
293293
CastedTagIn2
294294
>::type single_tag2;
@@ -347,7 +347,6 @@ inline OutputIterator union_insert(Geometry1 const& geometry1,
347347
{
348348
concepts::check<Geometry1 const>();
349349
concepts::check<Geometry2 const>();
350-
//concepts::check<GeometryOut>();
351350
geometry::detail::output_geometry_concept_check<GeometryOut>::apply();
352351

353352
typename strategy::intersection::services::default_strategy

0 commit comments

Comments
 (0)