Minor c++20 changes

Author: mmd-osm

src/backend/apidb/quad_tile.cpp

@@ -33,7 +33,7 @@ std::vector<tile_id_t> tiles_for_area(double minlat, double minlon, double maxla
     }
   }
 
-  std::sort(tiles.begin(), tiles.end());
+  std::ranges::sort(tiles);
   tiles.erase(std::unique(tiles.begin(), tiles.end()), tiles.end());
 
   return tiles;

src/backend/apidb/readonly_pgsql_selection.cpp

@@ -874,7 +874,7 @@ void readonly_pgsql_selection::fetch_changesets(const std::set< osm_changeset_id
 
   // check if changeset is already contained in map
   for (auto id: all_ids) {
-    if (cc.find(id) == cc.end()) {
+    if (!cc.contains(id)) {
       ids.insert(id);
     }
   }
@@ -893,7 +893,7 @@ void readonly_pgsql_selection::fetch_changesets(const std::set< osm_changeset_id
     auto cs = r[0].as<int64_t>();
 
     // Multiple results for one changeset?
-    if (cc.find(cs) != cc.end()) {
+    if (cc.contains(cs)) {
       logger::message(
           fmt::format("ERROR: Request for user data associated with changeset {:d} failed: returned multiple rows.", cs));
       throw http::server_error(
@@ -918,7 +918,7 @@ void readonly_pgsql_selection::fetch_changesets(const std::set< osm_changeset_id
 
   // Missing changeset in query result?
   for (const auto & id : ids) {
-    if (cc.find(id) == cc.end()) {
+    if (!cc.contains(id)) {
       logger::message(
           fmt::format("ERROR: Request for user data associated with changeset {:d} failed: returned 0 rows.", id));
       throw http::server_error(

src/backend/apidb/transaction_manager.cpp

@@ -53,7 +53,7 @@ Transaction_Manager::Transaction_Manager(Transaction_Owner_Base &to) :
 
 void Transaction_Manager::prepare(const std::string &name,
                                   const std::string &definition) {
-  if (m_prep_stmt.find(name) == m_prep_stmt.end())
+  if (!m_prep_stmt.contains(name))
   {
     m_txn.conn().prepare(name, definition);
     m_prep_stmt.insert(name);

src/bbox.cpp

@@ -15,12 +15,7 @@
 bbox::bbox(double minlat_, double minlon_, double maxlat_, double maxlon_)
     : minlat(minlat_), minlon(minlon_), maxlat(maxlat_), maxlon(maxlon_) {}
 
-bool bbox::operator==(const bbox &other) const {
-  return ((minlat == other.minlat) &&
-          (minlon == other.minlon) &&
-          (maxlat == other.maxlat) &&
-          (maxlon == other.maxlon));
-}
+bool bbox::operator==(const bbox &other) const = default;
 
 bool bbox::parse(const std::string &s) {
   if (s.empty()) {

src/main.cpp

@@ -160,7 +160,7 @@ void get_options(int argc, char **argv, po::variables_map &options) {
     [&desc](const std::string &name) {
           std::string option;
           // convert an environment variable name to an option name
-          if (name.substr(0, 7) == "CGIMAP_") {
+          if (name.starts_with("CGIMAP_")) {
             std::transform(name.begin() + 7, name.end(),
                            std::back_inserter(option),
                            [](unsigned char c) {

src/oauth2.cpp

@@ -8,6 +8,7 @@
  */
 
 #include "cgimap/oauth2.hpp"
+#include <ranges>
 #include <sys/types.h>
 
 #if HAVE_CRYPTOPP
@@ -52,7 +53,7 @@ namespace oauth2 {
   }
 
   [[nodiscard]] bool has_forbidden_char(std::string_view str) {
-    return !std::all_of(str.begin(), str.end(), is_valid_bearer_token_char);
+    return !std::ranges::all_of(str, is_valid_bearer_token_char);
   }
 
   [[nodiscard]] std::optional<osm_user_id_t> validate_bearer_token(const request &req, data_selection& selection, bool& allow_api_write)
@@ -64,7 +65,7 @@ namespace oauth2 {
     const auto auth_header = std::string(auth_hdr);
 
     // Auth header starts with Bearer?
-    if (auth_header.rfind("Bearer ", 0) == std::string::npos)
+    if (!auth_header.starts_with("Bearer "))
       return std::nullopt;
 
     const auto bearer_token = auth_header.substr(7);