Skip to content

Commit 8407a62

Browse files
jotojoto
committed
Use make_unique
1 parent 113b5b2 commit 8407a62

File tree

4 files changed

+18
-18
lines changed

4 files changed

+18
-18
lines changed

‎include/osmium/area/problem_reporter_ogr.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ namespace osmium {
8989
}
9090

9191
void write_line(const char* problem_type, osmium::object_id_type id1, osmium::object_id_type id2, osmium::Location loc1, osmium::Location loc2) {
92-
auto ogr_linestring = std::unique_ptr<OGRLineString>{new OGRLineString{}};
92+
auto ogr_linestring = std::make_unique<OGRLineString>();
9393
ogr_linestring->addPoint(loc1.lon(), loc1.lat());
9494
ogr_linestring->addPoint(loc2.lon(), loc2.lat());
9595

‎include/osmium/geom/ogr.hpp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -83,13 +83,13 @@ namespace osmium {
8383
/* Point */
8484

8585
static point_type make_point(const osmium::geom::Coordinates& xy) {
86-
return point_type{new OGRPoint{xy.x, xy.y}};
86+
return std::make_unique<OGRPoint>(xy.x, xy.y);
8787
}
8888

8989
/* LineString */
9090

9191
void linestring_start() {
92-
m_linestring.reset(new OGRLineString{});
92+
m_linestring = std::make_unique<OGRLineString>();
9393
}
9494

9595
void linestring_add_location(const osmium::geom::Coordinates& xy) {
@@ -105,7 +105,7 @@ namespace osmium {
105105
/* Polygon */
106106

107107
void polygon_start() {
108-
m_ring.reset(new OGRLinearRing{});
108+
m_ring = std::make_unique<OGRLinearRing>();
109109
}
110110

111111
void polygon_add_location(const osmium::geom::Coordinates& xy) {
@@ -114,19 +114,19 @@ namespace osmium {
114114
}
115115

116116
polygon_type polygon_finish(size_t /* num_points */) {
117-
auto polygon = std::unique_ptr<OGRPolygon>{new OGRPolygon{}};
117+
auto polygon = std::make_unique<OGRPolygon>();
118118
polygon->addRingDirectly(m_ring.release());
119119
return polygon;
120120
}
121121

122122
/* MultiPolygon */
123123

124124
void multipolygon_start() {
125-
m_multipolygon.reset(new OGRMultiPolygon{});
125+
m_multipolygon = std::make_unique<OGRMultiPolygon>();
126126
}
127127

128128
void multipolygon_polygon_start() {
129-
m_polygon.reset(new OGRPolygon{});
129+
m_polygon = std::make_unique<OGRPolygon>();
130130
}
131131

132132
void multipolygon_polygon_finish() {
@@ -136,7 +136,7 @@ namespace osmium {
136136
}
137137

138138
void multipolygon_outer_ring_start() {
139-
m_ring.reset(new OGRLinearRing{});
139+
m_ring = std::make_unique<OGRLinearRing>();
140140
}
141141

142142
void multipolygon_outer_ring_finish() {
@@ -146,7 +146,7 @@ namespace osmium {
146146
}
147147

148148
void multipolygon_inner_ring_start() {
149-
m_ring.reset(new OGRLinearRing{});
149+
m_ring = std::make_unique<OGRLinearRing>();
150150
}
151151

152152
void multipolygon_inner_ring_finish() {

‎include/osmium/io/detail/pbf_output_format.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@ namespace osmium {
312312

313313
void add_dense_node(const osmium::Node& node) {
314314
if (!m_dense_nodes) {
315-
m_dense_nodes.reset(new DenseNodes{&m_stringtable, &m_options});
315+
m_dense_nodes = std::make_unique<DenseNodes>(&m_stringtable, &m_options);
316316
}
317317
m_dense_nodes->add_node(node);
318318
++m_count;

‎include/osmium/io/detail/xml_input_format.hpp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,7 @@ namespace osmium {
338338
});
339339

340340
if (!m_tl_builder) {
341-
m_tl_builder.reset(new osmium::builder::TagListBuilder{builder});
341+
m_tl_builder = std::make_unique<osmium::builder::TagListBuilder>(builder);
342342
}
343343
m_tl_builder->add_tag(k, v);
344344
}
@@ -391,7 +391,7 @@ namespace osmium {
391391
mark_header_as_done();
392392
if (read_types() & osmium::osm_entity_bits::node) {
393393
maybe_new_buffer(osmium::item_type::node);
394-
m_node_builder.reset(new osmium::builder::NodeBuilder{buffer()});
394+
m_node_builder = std::make_unique<osmium::builder::NodeBuilder>(buffer());
395395
m_node_builder->set_user(init_object(m_node_builder->object(), attrs));
396396
}
397397
return;
@@ -402,7 +402,7 @@ namespace osmium {
402402
mark_header_as_done();
403403
if (read_types() & osmium::osm_entity_bits::way) {
404404
maybe_new_buffer(osmium::item_type::way);
405-
m_way_builder.reset(new osmium::builder::WayBuilder{buffer()});
405+
m_way_builder = std::make_unique<osmium::builder::WayBuilder>(buffer());
406406
m_way_builder->set_user(init_object(m_way_builder->object(), attrs));
407407
}
408408
return;
@@ -413,7 +413,7 @@ namespace osmium {
413413
mark_header_as_done();
414414
if (read_types() & osmium::osm_entity_bits::relation) {
415415
maybe_new_buffer(osmium::item_type::relation);
416-
m_relation_builder.reset(new osmium::builder::RelationBuilder{buffer()});
416+
m_relation_builder = std::make_unique<osmium::builder::RelationBuilder>(buffer());
417417
m_relation_builder->set_user(init_object(m_relation_builder->object(), attrs));
418418
}
419419
return;
@@ -428,7 +428,7 @@ namespace osmium {
428428
mark_header_as_done();
429429
if (read_types() & osmium::osm_entity_bits::changeset) {
430430
maybe_new_buffer(osmium::item_type::changeset);
431-
m_changeset_builder.reset(new osmium::builder::ChangesetBuilder{buffer()});
431+
m_changeset_builder = std::make_unique<osmium::builder::ChangesetBuilder>(buffer());
432432
init_changeset(*m_changeset_builder, attrs);
433433
}
434434
} else if (!std::strcmp(element, "create")) {
@@ -508,7 +508,7 @@ namespace osmium {
508508
m_tl_builder.reset();
509509

510510
if (!m_wnl_builder) {
511-
m_wnl_builder.reset(new osmium::builder::WayNodeListBuilder{*m_way_builder});
511+
m_wnl_builder = std::make_unique<osmium::builder::WayNodeListBuilder>(*m_way_builder);
512512
}
513513

514514
NodeRef nr;
@@ -542,7 +542,7 @@ namespace osmium {
542542
m_tl_builder.reset();
543543

544544
if (!m_rml_builder) {
545-
m_rml_builder.reset(new osmium::builder::RelationMemberListBuilder{*m_relation_builder});
545+
m_rml_builder = std::make_unique<osmium::builder::RelationMemberListBuilder>(*m_relation_builder);
546546
}
547547

548548
item_type type = item_type::undefined;
@@ -591,7 +591,7 @@ namespace osmium {
591591
if (read_types() & osmium::osm_entity_bits::changeset) {
592592
m_tl_builder.reset();
593593
if (!m_changeset_discussion_builder) {
594-
m_changeset_discussion_builder.reset(new osmium::builder::ChangesetDiscussionBuilder{*m_changeset_builder});
594+
m_changeset_discussion_builder = std::make_unique<osmium::builder::ChangesetDiscussionBuilder>(*m_changeset_builder);
595595
}
596596
}
597597
} else if (!std::strcmp(element, "tag")) {

0 commit comments

Comments
 (0)