Skip to content

Commit 7766666

Browse files
committed
Use data() instead of taking the address of the 0-th element
1 parent 469c79e commit 7766666

3 files changed

Lines changed: 5 additions & 5 deletions

File tree

src/output-flex.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ static void push_osm_object_to_lua_stack(lua_State *lua_state,
217217
lua_createtable(lua_state, 0, 3);
218218
std::array<char, 2> tmp{"x"};
219219
tmp[0] = osmium::item_type_to_char(member.type());
220-
luaX_add_table_str(lua_state, "type", &tmp[0]);
220+
luaX_add_table_str(lua_state, "type", tmp.data());
221221
luaX_add_table_int(lua_state, "ref", member.ref());
222222
luaX_add_table_str(lua_state, "role", member.role());
223223
});

src/wkb.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -428,7 +428,7 @@ class ewkb_parser_t
428428
check_bytes(sizeof(double) * 2);
429429

430430
std::array<double, 2> data{};
431-
std::memcpy(&data[0], m_it, sizeof(double) * 2);
431+
std::memcpy(data.data(), m_it, sizeof(double) * 2);
432432
m_it += sizeof(double) * 2;
433433

434434
point->set_x(data[0]);

tests/test-options-parse.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,21 +21,21 @@ static void bad_opt(std::vector<char const *> opts, char const *msg)
2121
{
2222
opts.insert(opts.begin(), "osm2pgsql");
2323
opts.push_back(TEST_PBF);
24-
REQUIRE_THROWS_WITH(options_t((int)opts.size(), (char **)&opts[0]),
24+
REQUIRE_THROWS_WITH(options_t((int)opts.size(), (char **)opts.data()),
2525
Catch::Matchers::Contains(msg));
2626
}
2727

2828
static options_t opt(std::vector<char const *> opts)
2929
{
3030
opts.insert(opts.begin(), "osm2pgsql");
3131
opts.push_back(TEST_PBF);
32-
return options_t((int)opts.size(), (char **)&opts[0]);
32+
return options_t((int)opts.size(), (char **)opts.data());
3333
}
3434

3535
TEST_CASE("Insufficient arguments", "[NoDB]")
3636
{
3737
std::vector<char const *> opts = {"osm2pgsql", "-a", "-c", "--slim"};
38-
REQUIRE_THROWS_WITH(options_t((int)opts.size(), (char **)&opts[0]),
38+
REQUIRE_THROWS_WITH(options_t((int)opts.size(), (char **)opts.data()),
3939
Catch::Matchers::Contains("Missing input"));
4040
}
4141

0 commit comments

Comments
 (0)