Fix build error on older compilers

#1046

Author: teusbenschop

changes/change.cpp

@@ -122,19 +122,12 @@ std::string changes_change (Webserver_Request& webserver_request)
 
 
   // Get notes for the passage.
-  Database_Notes::selector selector {
+  Database_Notes::Selector selector {
     .bibles = bibles,
-    .book = passage.m_book, \
+    .book = passage.m_book,
     .chapter = passage.m_chapter,
     .verse = filter::strings::convert_to_int (passage.m_verse),
-    .passage_selector = Database_Notes::passage_selector::current_verse,
-    .edit_selector = Database_Notes::edit_selector::at_any_time,
-    .non_edit_selector = Database_Notes::non_edit_selector::any_time,
-    .status_selectors = {},
-    .assignment_selector = "",
-    .subscription_selector = 0,
-    .severity_selector = Database_Notes::severity_selector::any,
-    .search_text = "",
+    .passage_selector = Database_Notes::PassageSelector::current_verse,
   };
   std::vector<int> notes = database_notes.select_notes(selector);
 

database/notes.cpp

@@ -596,7 +596,7 @@ int Database_Notes::store_new_note (const std::string& bible, int book, int chap
 }
 
 
-std::vector<int> Database_Notes::select_notes(const selector& selector)
+std::vector<int> Database_Notes::select_notes(const Selector& selector)
 {
   const std::string& username = m_webserver_request.session_logic ()->get_username ();
   std::vector <int> identifiers;
@@ -611,50 +611,50 @@ std::vector<int> Database_Notes::select_notes(const selector& selector)
   // Consider passage selector.
   std::string passage;
   switch (selector.passage_selector) {
-    case passage_selector::current_verse:
+    case PassageSelector::current_verse:
       // Select notes that refer to the current verse.
       // It means that the book, the chapter, and the verse, should match.
       passage = encode_passage (selector.book, selector.chapter, selector.verse);
       query.append (" AND passage LIKE '%" + passage + "%' ");
       break;
-    case passage_selector::current_chapter:
+    case PassageSelector::current_chapter:
       // Select notes that refer to the current chapter.
       // It means that the book and the chapter should match.
       passage = encode_passage (selector.book, selector.chapter, -1);
       query.append (" AND passage LIKE '%" + passage + "%' ");
       break;
-    case passage_selector::current_book:
+    case PassageSelector::current_book:
       // Select notes that refer to the current book.
       // It means that the book should match.
       passage = encode_passage (selector.book, -1, -1);
       query.append (" AND passage LIKE '%" + passage + "%' ");
       break;
-    case passage_selector::any_passage:
+    case PassageSelector::any_passage:
     default:
       // Select notes that refer to any passage: No constraint to apply here.
       break;
   }
   // Consider edit selector.
   int time { 0 };
   switch (selector.edit_selector) {
-    case edit_selector::at_any_time:
+    case EditSelector::at_any_time:
     default:
       // Select notes that have been edited at any time. Apply no constraint.
       time = 0;
       break;
-    case edit_selector::during_last_30_days:
+    case EditSelector::during_last_30_days:
       // Select notes that have been edited during the last 30 days.
       time = filter::date::seconds_since_epoch () - 30 * 24 * 3600;
       break;
-    case edit_selector::during_last_7_days:
+    case EditSelector::during_last_7_days:
       // Select notes that have been edited during the last 7 days.
       time = filter::date::seconds_since_epoch () - 7 * 24 * 3600;
       break;
-    case edit_selector::since_yesterday:
+    case EditSelector::since_yesterday:
       // Select notes that have been edited since yesterday.
       time = filter::date::seconds_since_epoch () - 1 * 24 * 3600 - filter::date::numerical_hour (filter::date::seconds_since_epoch ()) * 3600;
       break;
-    case edit_selector::today:
+    case EditSelector::today:
       // Select notes that have been edited today.
       time = filter::date::seconds_since_epoch () - filter::date::numerical_hour (filter::date::seconds_since_epoch ()) * 3600;
       break;
@@ -667,28 +667,28 @@ std::vector<int> Database_Notes::select_notes(const selector& selector)
   // Consider non-edit selector.
   int nonedit { 0 };
   switch (selector.non_edit_selector) {
-    case Database_Notes::non_edit_selector::any_time:
+    case Database_Notes::NonEditSelector::any_time:
     default:
       // Select notes that have not been edited at any time. Apply no constraint.
       nonedit = 0;
       break;
-    case Database_Notes::non_edit_selector::a_day:
+    case Database_Notes::NonEditSelector::a_day:
       // Select notes that have not been edited for a day.
       nonedit = filter::date::seconds_since_epoch () - 1 * 24 * 3600;
       break;
-    case Database_Notes::non_edit_selector::two_days:
+    case Database_Notes::NonEditSelector::two_days:
       // Select notes that have not been edited for two days.
       nonedit = filter::date::seconds_since_epoch () - 2 * 24 * 3600;
       break;
-    case Database_Notes::non_edit_selector::a_week:
+    case Database_Notes::NonEditSelector::a_week:
       // Select notes that have not been edited for a week.
       nonedit = filter::date::seconds_since_epoch () - 7 * 24 * 3600;
       break;
-    case Database_Notes::non_edit_selector::a_month:
+    case Database_Notes::NonEditSelector::a_month:
       // Select notes that have not been edited for a month.
       nonedit = filter::date::seconds_since_epoch () - 30 * 24 * 3600;
       break;
-    case Database_Notes::non_edit_selector::a_year:
+    case Database_Notes::NonEditSelector::a_year:
       // Select notes that have not been edited for a year.
       nonedit = filter::date::seconds_since_epoch () - 365 * 24 * 3600;
       break;
@@ -740,7 +740,7 @@ std::vector<int> Database_Notes::select_notes(const selector& selector)
     query.append (" %' ");
   }
   // Consider the note severity.
-  if (selector.severity_selector != Database_Notes::severity_selector::any) {
+  if (selector.severity_selector != Database_Notes::SeveritySelector::any) {
     query.append (" AND severity = ");
     query.append (std::to_string (static_cast<int>(selector.severity_selector)));
     query.append (" ");

database/notes.h

@@ -70,28 +70,28 @@ class Database_Notes
   int get_new_unique_identifier ();
 
 public:
-  enum class passage_selector : uint8_t {
+  enum class PassageSelector : uint8_t {
     current_verse = 0,
     current_chapter = 1,
     current_book = 2,
     any_passage = 3
   };
-  enum class edit_selector : uint8_t {
+  enum class EditSelector : uint8_t {
     at_any_time = 0,
     during_last_30_days = 1,
     during_last_7_days = 2,
     since_yesterday = 3,
     today = 4,
   };
-  enum class non_edit_selector : uint8_t {
+  enum class NonEditSelector : uint8_t {
     any_time = 0,
     a_day = 1,
     two_days = 2,
     a_week = 3,
     a_month = 4,
     a_year = 5,
   };
-  enum class severity_selector : int8_t {
+  enum class SeveritySelector : int8_t {
     any = -1,
     wish = 0,
     minor = 1,
@@ -100,7 +100,7 @@ class Database_Notes
     major = 4,
     critical = 5,
   };
-  struct selector {
+  struct Selector {
     // Container of Bible names that is going to be searched.
     // Can contains all Bibles the user has read access to.
     // Or can contain one Bible to be searched.
@@ -111,26 +111,26 @@ class Database_Notes
     int book{};
     int chapter{};
     int verse{};
-    passage_selector passage_selector{passage_selector::any_passage};
+    PassageSelector passage_selector{PassageSelector::any_passage};
     // Optionally constrains selection based on modification time.
     // By default there's no constraint on modification time.
-    edit_selector edit_selector{edit_selector::at_any_time};
-    non_edit_selector non_edit_selector{non_edit_selector::any_time};
+    EditSelector edit_selector{EditSelector::at_any_time};
+    NonEditSelector non_edit_selector{NonEditSelector::any_time};
     // Optionally constrains selection based on list of note statuses.
     std::vector<std::string> status_selectors;
     // Optionally constrains the selection based on a note being assigned to somebody.
     std::string assignment_selector{};
     // Optionally limits the selection based on a note's subscription.
     bool subscription_selector{false};
     // Optionally limits the selection, based on a note's severity.
-    severity_selector severity_selector{severity_selector::any};
+    SeveritySelector severity_selector{SeveritySelector::any};
     // Optionally limits the selection to notes that contains certain text.
     // If the "search_text" is empty, it is not considered.
     std::string search_text{};
     // If given, it indicates the starting limit for the selection.
     std::optional<int> limit{};
   };
-  std::vector<int> select_notes (const selector& selector);
+  std::vector<int> select_notes (const Selector& selector);
 private:
   std::string notes_select_identifier ();
   std::string notes_optional_fulltext_search_relevance_statement (std::string search);

notes/bulk.cpp

@@ -74,13 +74,13 @@ std::string notes_bulk (Webserver_Request& webserver_request)
   int book = Ipc_Focus::getBook (webserver_request);
   int chapter = Ipc_Focus::getChapter (webserver_request);
   int verse = Ipc_Focus::getVerse (webserver_request);
-  Database_Notes::passage_selector passage_selector = static_cast<Database_Notes::passage_selector>(webserver_request.database_config_user()->get_consultation_notes_passage_selector());
+  Database_Notes::PassageSelector passage_selector = static_cast<Database_Notes::PassageSelector>(webserver_request.database_config_user()->get_consultation_notes_passage_selector());
   int edit_selector = webserver_request.database_config_user()->get_consultation_notes_edit_selector();
-  auto non_edit_selector = static_cast<Database_Notes::non_edit_selector>(webserver_request.database_config_user()->get_consultation_notes_non_edit_selector());
+  auto non_edit_selector = static_cast<Database_Notes::NonEditSelector>(webserver_request.database_config_user()->get_consultation_notes_non_edit_selector());
   const std::vector<std::string> status_selectors = webserver_request.database_config_user()->get_consultation_notes_status_selectors();
   std::string assignment_selector = webserver_request.database_config_user()->get_consultation_notes_assignment_selector();
   bool subscription_selector = webserver_request.database_config_user()->get_consultation_notes_subscription_selector();
-  auto severity_selector = static_cast<Database_Notes::severity_selector>(webserver_request.database_config_user()->get_consultation_notes_severity_selector());
+  auto severity_selector = static_cast<Database_Notes::SeveritySelector>(webserver_request.database_config_user()->get_consultation_notes_severity_selector());
   const int text_selector = webserver_request.database_config_user()->get_consultation_notes_text_selector();
   const std::string search_text = text_selector ? webserver_request.database_config_user()->get_consultation_notes_search_text() : "";
 
@@ -111,13 +111,13 @@ std::string notes_bulk (Webserver_Request& webserver_request)
   // This is done to remember them as long as this page is active.
   // Thus erroneous bulk operations on notes can be rectified somewhat easier.
   if (!subscribe && !unsubscribe && !assign && !unassign && !status && !severity && !bible && !erase) {
-    Database_Notes::selector selector {
+    Database_Notes::Selector selector {
       .bibles = bibles,
       .book = book,
       .chapter = chapter,
       .verse = verse,
       .passage_selector = passage_selector,
-      .edit_selector = static_cast<Database_Notes::edit_selector>(edit_selector),
+      .edit_selector = static_cast<Database_Notes::EditSelector>(edit_selector),
       .non_edit_selector = non_edit_selector,
       .status_selectors = status_selectors,
       .assignment_selector = assignment_selector,

notes/notes.cpp

@@ -56,13 +56,13 @@ std::string notes_notes (Webserver_Request& webserver_request)
   int verse = Ipc_Focus::getVerse (webserver_request);
 
 
-  Database_Notes::passage_selector passage_selector = static_cast<Database_Notes::passage_selector>(webserver_request.database_config_user()->get_consultation_notes_passage_selector());
+  Database_Notes::PassageSelector passage_selector = static_cast<Database_Notes::PassageSelector>(webserver_request.database_config_user()->get_consultation_notes_passage_selector());
   int edit_selector = webserver_request.database_config_user()->get_consultation_notes_edit_selector();
-  auto non_edit_selector = static_cast<Database_Notes::non_edit_selector>(webserver_request.database_config_user()->get_consultation_notes_non_edit_selector());
+  auto non_edit_selector = static_cast<Database_Notes::NonEditSelector>(webserver_request.database_config_user()->get_consultation_notes_non_edit_selector());
   const std::vector<std::string> status_selectors = webserver_request.database_config_user()->get_consultation_notes_status_selectors();
   std::string assignment_selector = webserver_request.database_config_user()->get_consultation_notes_assignment_selector();
   bool subscription_selector = webserver_request.database_config_user()->get_consultation_notes_subscription_selector();
-  auto severity_selector = static_cast<Database_Notes::severity_selector>(webserver_request.database_config_user()->get_consultation_notes_severity_selector());
+  auto severity_selector = static_cast<Database_Notes::SeveritySelector>(webserver_request.database_config_user()->get_consultation_notes_severity_selector());
   const int text_selector = webserver_request.database_config_user()->get_consultation_notes_text_selector();
   const std::string search_text = text_selector ? webserver_request.database_config_user()->get_consultation_notes_search_text() : "";
   int passage_inclusion_selector = webserver_request.database_config_user()->get_consultation_notes_passage_inclusion_selector();
@@ -81,13 +81,13 @@ std::string notes_notes (Webserver_Request& webserver_request)
   if (webserver_request.session_logic ()->get_level () == roles::admin) bibles.clear ();
 
 
-  Database_Notes::selector selector {
+  Database_Notes::Selector selector {
     .bibles = bibles,
     .book = book,
     .chapter = chapter,
     .verse = verse,
     .passage_selector = passage_selector,
-    .edit_selector = static_cast<Database_Notes::edit_selector>(edit_selector),
+    .edit_selector = static_cast<Database_Notes::EditSelector>(edit_selector),
     .non_edit_selector = non_edit_selector,
     .status_selectors = status_selectors,
     .assignment_selector = assignment_selector,

notes/select.cpp

@@ -333,14 +333,14 @@ std::string notes_select (Webserver_Request& webserver_request)
   }
 
 
-  const Database_Notes::passage_selector passage_selector = static_cast<Database_Notes::passage_selector>(webserver_request.database_config_user()->get_consultation_notes_passage_selector());
+  const Database_Notes::PassageSelector passage_selector = static_cast<Database_Notes::PassageSelector>(webserver_request.database_config_user()->get_consultation_notes_passage_selector());
   const int edit_selector = webserver_request.database_config_user()->get_consultation_notes_edit_selector();
-  const auto non_edit_selector = static_cast<Database_Notes::non_edit_selector>(webserver_request.database_config_user()->get_consultation_notes_non_edit_selector());
+  const auto non_edit_selector = static_cast<Database_Notes::NonEditSelector>(webserver_request.database_config_user()->get_consultation_notes_non_edit_selector());
   const std::vector<std::string> status_selectors = webserver_request.database_config_user()->get_consultation_notes_status_selectors();
   const std::string bible_selector = webserver_request.database_config_user()->get_consultation_notes_bible_selector();
   const std::string assignment_selector = webserver_request.database_config_user()->get_consultation_notes_assignment_selector();
   const bool subscription_selector = webserver_request.database_config_user()->get_consultation_notes_subscription_selector();
-  const auto severity_selector = static_cast<Database_Notes::severity_selector>(webserver_request.database_config_user()->get_consultation_notes_severity_selector());
+  const auto severity_selector = static_cast<Database_Notes::SeveritySelector>(webserver_request.database_config_user()->get_consultation_notes_severity_selector());
 
   const int text_selector = webserver_request.database_config_user()->get_consultation_notes_text_selector();
   const std::string search_text = text_selector ? webserver_request.database_config_user()->get_consultation_notes_search_text() : "";
@@ -362,13 +362,13 @@ std::string notes_select (Webserver_Request& webserver_request)
   const int book = Ipc_Focus::getBook (webserver_request);
   const int chapter = Ipc_Focus::getChapter (webserver_request);
   const int verse = Ipc_Focus::getVerse (webserver_request);
-  Database_Notes::selector selector {
+  Database_Notes::Selector selector {
     .bibles = bibles,
     .book = book,
     .chapter = chapter,
     .verse = verse,
     .passage_selector = passage_selector,
-    .edit_selector = static_cast<Database_Notes::edit_selector>(edit_selector),
+    .edit_selector = static_cast<Database_Notes::EditSelector>(edit_selector),
     .non_edit_selector = non_edit_selector,
     .status_selectors = status_selectors,
     .assignment_selector = assignment_selector,

public/notes.cpp

@@ -51,19 +51,11 @@ std::string public_notes (Webserver_Request& webserver_request)
   const int chapter = filter::strings::convert_to_int (webserver_request.query ["chapter"]);
 
 
-  Database_Notes::selector selector {
+  Database_Notes::Selector selector {
     .bibles = {bible},
     .book = book,
     .chapter = chapter,
-    .verse = 0,
-    .passage_selector = Database_Notes::passage_selector::current_chapter,
-    .edit_selector = Database_Notes::edit_selector::at_any_time,
-    .non_edit_selector = Database_Notes::non_edit_selector::any_time,
-    .status_selectors = {},
-    .assignment_selector = "",
-    .subscription_selector = false,
-    .severity_selector = Database_Notes::severity_selector::any,
-    .search_text = "",
+    .passage_selector = Database_Notes::PassageSelector::current_chapter,
   };
   const std::vector<int> identifiers = database_notes.select_notes(selector);