Skip to content

Commit ecf6557

Browse files
committed
Modernize code: no return of const values, pass by value and move
1 parent 1052280 commit ecf6557

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

src/osmtypes.hpp

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,13 @@ struct member
3838
osmid_t id;
3939
std::string role;
4040

41-
explicit operator osmium::builder::attr::member_type const() const
41+
explicit operator osmium::builder::attr::member_type() const
4242
{
4343
return osmium::builder::attr::member_type(type, id, role.c_str());
4444
}
4545

46-
member(osmium::item_type t, osmid_t i, std::string const &r)
47-
: type(t), id(i), role(r)
46+
member(osmium::item_type t, osmid_t i, std::string r)
47+
: type(t), id(i), role(std::move(r))
4848
{}
4949
};
5050

@@ -73,13 +73,14 @@ struct tag_t
7373
std::string key;
7474
std::string value;
7575

76-
operator std::pair<char const *, char const *> const() const noexcept
76+
operator std::pair<char const *, char const *>() const noexcept
7777
{
7878
return std::pair<char const *, char const *>(key.c_str(),
7979
value.c_str());
8080
}
8181

82-
tag_t(std::string const &k, std::string const &v) : key(k), value(v) {}
82+
tag_t(std::string k, std::string v) : key(std::move(k)), value(std::move(v))
83+
{}
8384
};
8485

8586
/**

0 commit comments

Comments
 (0)