constexpr const is redundant

Author: joto

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-functions.cpp

@@ -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),

src/geom.hpp

@@ -200,7 +200,7 @@ class multigeometry_t
     using iterator = typename std::vector<GEOM>::iterator;
     using value_type = GEOM;
 
-    static constexpr bool const FOR_POINT = std::is_same_v<GEOM, point_t>;
+    static constexpr bool FOR_POINT = std::is_same_v<GEOM, point_t>;
 
     [[nodiscard]] std::size_t num_geometries() const noexcept
     {

src/hex.cpp

@@ -38,7 +38,7 @@ std::string encode_hex(std::string const &in)
 
 namespace {
 
-constexpr std::array<char, 256> const HEX_TABLE = {
+constexpr std::array<char, 256> HEX_TABLE = {
     0, 0, 0, 0,   0, 0, 0, 0,   0, 0, 0, 0,   0, 0, 0, 0,
     0, 0, 0, 0,   0, 0, 0, 0,   0, 0, 0, 0,   0, 0, 0, 0,
     0, 0, 0, 0,   0, 0, 0, 0,   0, 0, 0, 0,   0, 0, 0, 0,

src/node-locations.cpp

@@ -83,7 +83,7 @@ osmium::Location node_locations_t::get(osmid_t id) const
 
 void node_locations_t::log_stats()
 {
-    constexpr auto const MBYTE = 1024 * 1024;
+    constexpr auto MBYTE = 1024 * 1024;
     log_debug("Node locations cache:");
     log_debug("  num locations stored: {}", m_count);
     log_debug("  bytes overall: {}MB", used_memory() / MBYTE);

src/node-locations.hpp

@@ -85,7 +85,7 @@ class node_locations_t
      * The block size used for internal blocks. The larger the block size
      * the less memory is consumed but the more expensive the access is.
      */
-    static constexpr const std::size_t BLOCK_SIZE = 32;
+    static constexpr std::size_t BLOCK_SIZE = 32;
 
     bool first_entry_in_block() const noexcept
     {

src/ordered-index.hpp

@@ -185,7 +185,7 @@ class ordered_index_t
 
     std::pair<osmid_t, std::size_t> get_internal(osmid_t id) const noexcept;
 
-    static constexpr std::size_t const MAX_BLOCK_SIZE = 16UL * 1024UL * 1024UL;
+    static constexpr std::size_t MAX_BLOCK_SIZE = 16UL * 1024UL * 1024UL;
 
     std::vector<range_entry> m_ranges;
     std::size_t m_block_size;

src/output-flex.cpp

@@ -133,7 +133,7 @@ void push_osm_object_to_lua_stack(lua_State *lua_state,
      * timestamp, changeset, uid, user). For ways there are 2 more (is_closed,
      * nodes), for relations 1 more (members).
      */
-    constexpr int const MAX_TABLE_SIZE = 10;
+    constexpr int MAX_TABLE_SIZE = 10;
 
     lua_createtable(lua_state, 0, MAX_TABLE_SIZE);
 
@@ -243,7 +243,7 @@ typename CONTAINER::value_type &get_from_idx_param(lua_State *lua_state,
 
 std::size_t get_nodes(middle_query_t const &middle, osmium::Way *way)
 {
-    constexpr std::size_t const MAX_MISSING_NODES = 100;
+    constexpr std::size_t MAX_MISSING_NODES = 100;
     static std::size_t count_missing_nodes = 0;
 
     auto const count = middle.nodes_get_list(&way->nodes());