Skip to content

Commit fef8e5c

Browse files
authored
Merge pull request #2174 from joto/misc-cleanup
Various small cleanups
2 parents 348a23b + 1bcf138 commit fef8e5c

File tree

5 files changed

+6
-5
lines changed

5 files changed

+6
-5
lines changed

src/flex-table.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,8 @@ static void enable_check_trigger(pg_conn_t const &db_connection,
279279
checks);
280280
}
281281

282-
void table_connection_t::start(pg_conn_t const &db_connection, bool append)
282+
void table_connection_t::start(pg_conn_t const &db_connection,
283+
bool append) const
283284
{
284285
if (!append) {
285286
drop_table_if_exists(db_connection, table().schema(), table().name());

src/flex-table.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@ class table_connection_t
281281
{
282282
}
283283

284-
void start(pg_conn_t const &db_connection, bool append);
284+
void start(pg_conn_t const &db_connection, bool append) const;
285285

286286
void stop(pg_conn_t const &db_connection, bool updateable, bool append);
287287

src/geom-from-osm.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ void create_multilinestring(geometry_t *geom,
170170
// retroactively.
171171
if (multiline.num_geometries() == 1 && !force_multi) {
172172
// This has to be done in two steps, because the set<>()
173-
// destroys the content of mulitline.
173+
// destroys the content of multiline.
174174
auto p = std::move(multiline[0]);
175175
geom->set<linestring_t>() = std::move(p);
176176
}

tests/bdd/flex/bbox.feature

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ Feature: Test get_bbox() function
7575
"""
7676
w20 v1 dV Nn10,n11
7777
w21 v1 dV Nn11,n12
78-
r30 v1 dV Ttype=route,route=bus Mw20@@
78+
r30 v1 dV Ttype=route,route=bus Mw20@
7979
r31 v1 dV Ttype=route,route=bus Mw20@,w21@
8080
"""
8181
And the lua style

tests/test-pgsql.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ TEST_CASE("create table and insert something")
138138

139139
TEST_CASE("empty result object should return fatal status")
140140
{
141-
pg_result_t result;
141+
pg_result_t const result;
142142
REQUIRE(result.status() == PGRES_FATAL_ERROR);
143143
REQUIRE_FALSE(result);
144144
REQUIRE(result.num_fields() == 0);

0 commit comments

Comments
 (0)