Merge pull request #2350 from joto/constness

Various cleanups around "const"

Author: lonvia

src/db-copy.cpp

@@ -31,7 +31,7 @@ void db_deleter_by_id_t::delete_rows(std::string const &table,
     fmt::format_to(std::back_inserter(sql),
                    FMT_STRING("DELETE FROM {} WHERE {} IN ("), table, column);
 
-    for (auto id : m_deletables) {
+    for (auto const id : m_deletables) {
         format_to(std::back_inserter(sql), FMT_STRING("{},"), id);
     }
     sql[sql.size() - 1] = ')';

src/expire-tiles.cpp

@@ -270,7 +270,7 @@ quadkey_list_t expire_tiles::get_tiles()
 {
     quadkey_list_t tiles;
     tiles.reserve(m_dirty_tiles.size());
-    tiles.assign(m_dirty_tiles.begin(), m_dirty_tiles.end());
+    tiles.assign(m_dirty_tiles.cbegin(), m_dirty_tiles.cend());
     std::sort(tiles.begin(), tiles.end());
     m_dirty_tiles.clear();
     return tiles;
@@ -288,8 +288,8 @@ void expire_tiles::merge_and_destroy(expire_tiles *other)
         using std::swap;
         swap(m_dirty_tiles, other->m_dirty_tiles);
     } else {
-        m_dirty_tiles.insert(other->m_dirty_tiles.begin(),
-                             other->m_dirty_tiles.end());
+        m_dirty_tiles.insert(other->m_dirty_tiles.cbegin(),
+                             other->m_dirty_tiles.cend());
         other->m_dirty_tiles.clear();
     }
 }

src/gen/osm2pgsql-gen.cpp

@@ -76,7 +76,7 @@
 
 namespace {
 
-constexpr std::size_t const MAX_FORCE_SINGLE_THREAD = 4;
+constexpr std::size_t MAX_FORCE_SINGLE_THREAD = 4;
 
 struct tile_extent
 {

src/gen/tracer.hpp

@@ -39,7 +39,7 @@ class tracer_t
     std::size_t num_points() const noexcept { return m_num_points; }
 
 private:
-    static constexpr auto const BITS_PER_WORD = sizeof(potrace_word) * 8;
+    static constexpr std::size_t BITS_PER_WORD = sizeof(potrace_word) * 8;
 
     geom::point_t make_point(potrace_dpoint_t const &p) const noexcept;
 

src/geom-area-assembler.cpp

@@ -13,7 +13,7 @@
 
 namespace geom {
 
-const osmium::area::AssemblerConfig area_config;
+osmium::area::AssemblerConfig const area_config;
 
 area_assembler_t::area_assembler_t(osmium::memory::Buffer *buffer)
 : osmium::area::detail::BasicAssembler(area_config), m_buffer(buffer)
@@ -36,7 +36,7 @@ bool area_assembler_t::make_area()
     return true;
 }
 
-bool area_assembler_t::operator()(const osmium::Way &way)
+bool area_assembler_t::operator()(osmium::Way const &way)
 {
     segment_list().extract_segments_from_way(nullptr, stats().duplicate_nodes,
                                              way);
@@ -46,10 +46,10 @@ bool area_assembler_t::operator()(const osmium::Way &way)
 // Currently the relation is not needed for assembling the area, because
 // the roles on the members are ignored. In the future we might want to use
 // the roles, so we leave the function signature as it is.
-bool area_assembler_t::operator()(const osmium::Relation & /*relation*/,
-                                  const osmium::memory::Buffer &ways_buffer)
+bool area_assembler_t::operator()(osmium::Relation const & /*relation*/,
+                                  osmium::memory::Buffer const &ways_buffer)
 {
-    for (const auto &way : ways_buffer.select<osmium::Way>()) {
+    for (auto const &way : ways_buffer.select<osmium::Way>()) {
         segment_list().extract_segments_from_way(nullptr,
                                                  stats().duplicate_nodes, way);
     }

src/geom-area-assembler.hpp

@@ -35,7 +35,7 @@ class area_assembler_t : public osmium::area::detail::BasicAssembler
      * @returns false if there was some kind of error building the
      *          area, true otherwise.
      */
-    bool operator()(const osmium::Way &way);
+    bool operator()(osmium::Way const &way);
 
     /**
      * Assemble an area from the given relation and its member ways
@@ -44,8 +44,8 @@ class area_assembler_t : public osmium::area::detail::BasicAssembler
      * @returns false if there was some kind of error building the
      *          area, true otherwise.
      */
-    bool operator()(const osmium::Relation &relation,
-                    const osmium::memory::Buffer &ways_buffer);
+    bool operator()(osmium::Relation const &relation,
+                    osmium::memory::Buffer const &ways_buffer);
 
     /**
      * Access the area that was built last.

src/geom-from-osm.cpp

@@ -110,7 +110,7 @@ void create_polygon(geometry_t *geom, osmium::Way const &way,
     }
 
     auto const &area = assembler.get_area();
-    auto const &ring = *area.begin<osmium::OuterRing>();
+    auto const &ring = *area.cbegin<osmium::OuterRing>();
 
     fill_point_list(&polygon.outer(), ring);
 }
@@ -169,7 +169,7 @@ void create_multilinestring(geometry_t *geom,
     auto ways = buffer.select<osmium::Way>();
     if (ways.size() == 1 && !force_multi) {
         auto &line = geom->set<linestring_t>();
-        auto const &way = *ways.begin();
+        auto const &way = *ways.cbegin();
         if (!fill_point_list(&line, way.nodes())) {
             geom->reset();
         }
@@ -228,7 +228,7 @@ void create_multipolygon(geometry_t *geom, osmium::Relation const &relation,
         }
     } else {
         auto &polygon = geom->set<polygon_t>();
-        fill_polygon(&polygon, area, *area.outer_rings().begin());
+        fill_polygon(&polygon, area, *area.outer_rings().cbegin());
     }
 }
 

src/geom-functions.cpp

@@ -258,8 +258,8 @@ class without_first
 
     point_list_t::const_iterator begin()
     {
-        assert(m_list->begin() != m_list->end());
-        return std::next(m_list->begin());
+        assert(m_list->cbegin() != m_list->cend());
+        return std::next(m_list->cbegin());
     }
 
     point_list_t::const_iterator end() { return m_list->end(); }
@@ -607,7 +607,7 @@ void line_merge(geometry_t *output, geometry_t const &input)
     std::vector<endpoint_t> endpoints;
 
     // ...and a list of connections.
-    constexpr auto const NOCONN = std::numeric_limits<std::size_t>::max();
+    constexpr std::size_t NOCONN = std::numeric_limits<std::size_t>::max();
 
     struct connection_t
     {

src/geom-pole-of-inaccessibility.cpp

@@ -118,7 +118,7 @@ auto point_to_polygon_distance(point_t point, polygon_t const &polygon,
 
 struct Cell
 {
-    static constexpr double const SQRT2 = 1.4142135623730951;
+    static constexpr double SQRT2 = 1.4142135623730951;
 
     Cell(point_t c, double h, polygon_t const &polygon, double stretch)
     : center(c), half_size(h),
@@ -147,7 +147,7 @@ Cell make_centroid_cell(polygon_t const &polygon, double stretch)
 
 } // anonymous namespace
 
-point_t pole_of_inaccessibility(const polygon_t &polygon, double precision,
+point_t pole_of_inaccessibility(polygon_t const &polygon, double precision,
                                 double stretch)
 {
     assert(stretch > 0);
@@ -225,8 +225,8 @@ point_t pole_of_inaccessibility(const polygon_t &polygon, double precision,
         auto const h = cell.half_size / 2.0;
         auto const center = cell.center;
 
-        for (auto dy : {-h, h}) {
-            for (auto dx : {-h, h}) {
+        for (auto const dy : {-h, h}) {
+            for (auto const dx : {-h, h}) {
                 Cell const c{point_t{center.x() + dx, center.y() + dy}, h,
                              polygon, stretch};
                 if (c.max > best_cell.dist) {

src/geom-pole-of-inaccessibility.hpp

@@ -28,7 +28,7 @@ namespace geom {
  *
  * \pre \code stretch > 0 \endcode
  */
-point_t pole_of_inaccessibility(const polygon_t &polygon, double precision,
+point_t pole_of_inaccessibility(polygon_t const &polygon, double precision,
                                 double stretch = 1.0);
 
 void pole_of_inaccessibility(geometry_t *output, geometry_t const &input,