Revert "Revert "[WIP] Move to C++17 (#1602)": Multiple compilation an…

…d linkage errors on Linux"

This reverts commit 2cdf9f2.

CMakeLists.txt

@@ -46,7 +46,7 @@ if(COMMAND cmake_policy)
   cmake_policy(SET CMP0023 NEW)
 endif()
 
-set(CMAKE_CXX_STANDARD 14)
+set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 

src/badguy/mriceblock.cpp

@@ -182,7 +182,7 @@ MrIceBlock::collision_squished(GameObject& object)
           break;
         }
       }
-      BOOST_FALLTHROUGH;
+      [[fallthrough]];
 
     case ICESTATE_NORMAL:
       {

src/badguy/snail.cpp

@@ -175,7 +175,7 @@ Snail::collision_solid(const CollisionHit& hit)
           m_physic.set_velocity_x(-m_physic.get_velocity_x());
         }
       }
-      BOOST_FALLTHROUGH;
+      [[fallthrough]];
     case STATE_FLAT:
     case STATE_KICKED_DELAY:
       if (hit.top || hit.bottom) {
@@ -249,7 +249,7 @@ Snail::collision_squished(GameObject& object)
 
   switch (state) {
     case STATE_NORMAL:
-      BOOST_FALLTHROUGH;
+      [[fallthrough]];
     case STATE_KICKED:
       squishcount++;
       if (squishcount >= MAX_SNAIL_SQUISHES) {

src/control/controller.cpp

@@ -55,15 +55,15 @@ std::string Control_to_string(Control control)
   return g_control_names[static_cast<int>(control)];
 }
 
-boost::optional<Control> Control_from_string(const std::string& text)
+std::optional<Control> Control_from_string(const std::string& text)
 {
   for(int i = 0; g_control_names[i] != nullptr; ++i) {
     if (text == g_control_names[i]) {
       return static_cast<Control>(i);
     }
   }
 
-  return boost::none;
+  return std::nullopt;
 }
 
 Controller::Controller():

src/control/controller.hpp

@@ -18,7 +18,8 @@
 #define HEADER_SUPERTUX_CONTROL_CONTROLLER_HPP
 
 #include <iosfwd>
-#include <boost/optional.hpp>
+#include <string>
+#include <optional>
 
 enum class Control {
   LEFT = 0,
@@ -51,7 +52,7 @@ enum class Control {
 std::ostream& operator<<(std::ostream& os, Control control);
 
 std::string Control_to_string(Control control);
-boost::optional<Control> Control_from_string(const std::string& text);
+std::optional<Control> Control_from_string(const std::string& text);
 
 class Controller
 {

src/control/joystick_config.cpp

@@ -173,7 +173,7 @@ JoystickConfig::read(const ReaderMapping& joystick_mapping)
       std::string control_text;
       map.get("control", control_text);
 
-      const boost::optional<Control> maybe_control = Control_from_string(control_text);
+      const std::optional<Control> maybe_control = Control_from_string(control_text);
       if (!maybe_control)
       {
         log_info << "Invalid control '" << control_text << "' in buttonmap" << std::endl;

src/control/keyboard_config.cpp

@@ -16,7 +16,7 @@
 
 #include "control/keyboard_config.hpp"
 
-#include <boost/optional.hpp>
+#include <optional>
 
 #include "util/log.hpp"
 #include "util/reader_mapping.hpp"
@@ -123,7 +123,7 @@ KeyboardConfig::read(const ReaderMapping& keymap_mapping)
       control_text = control_text.substr(pos + 1);
     }
 
-    const boost::optional<Control> maybe_control = Control_from_string(control_text);
+    const std::optional<Control> maybe_control = Control_from_string(control_text);
     if (maybe_control) {
       if (m_configurable_controls.count(*maybe_control)) {
         bind_key(static_cast<SDL_Keycode>(key), player_id, *maybe_control);

src/control/keyboard_manager.cpp

@@ -170,7 +170,7 @@ KeyboardManager::process_menu_key_event(const SDL_KeyboardEvent& event)
     }
     m_parent->reset();
     MenuManager::instance().refresh();
-    m_wait_for_key = boost::none;
+    m_wait_for_key = std::nullopt;
     return;
   }
 

src/control/keyboard_manager.hpp

@@ -18,7 +18,7 @@
 #ifndef HEADER_SUPERTUX_CONTROL_KEYBOARD_MANAGER_HPP
 #define HEADER_SUPERTUX_CONTROL_KEYBOARD_MANAGER_HPP
 
-#include <boost/optional.hpp>
+#include <optional>
 
 #include "control/controller.hpp"
 #include "control/keyboard_config.hpp"
@@ -42,7 +42,7 @@ class KeyboardManager final
 private:
   InputManager* m_parent;
   KeyboardConfig& m_keyboard_config;
-  boost::optional<KeyboardConfig::PlayerControl> m_wait_for_key;
+  std::optional<KeyboardConfig::PlayerControl> m_wait_for_key;
   bool m_lock_text_input;
 
 private:

src/editor/editor.cpp

@@ -318,7 +318,7 @@ Editor::get_level_directory() const
 }
 
 void
-Editor::test_level(const boost::optional<std::pair<std::string, Vector>>& test_pos)
+Editor::test_level(const std::optional<std::pair<std::string, Vector>>& test_pos)
 {
   m_overlay_widget->reset_action_press();
 
@@ -691,7 +691,7 @@ Editor::event(const SDL_Event& ev)
 	if (ev.type == SDL_KEYDOWN &&
         ev.key.keysym.sym == SDLK_t &&
         ev.key.keysym.mod & KMOD_CTRL) {
-		test_level(boost::none);
+		test_level(std::nullopt);
 		}
 
 	if (ev.type == SDL_KEYDOWN &&

src/editor/editor.hpp

@@ -167,7 +167,7 @@ class Editor final : public Screen,
    *                    new filename.
    */
   void save_level(const std::string& filename = "", bool switch_file = false);
-  void test_level(const boost::optional<std::pair<std::string, Vector>>& test_pos);
+  void test_level(const std::optional<std::pair<std::string, Vector>>& test_pos);
   void update_keyboard(const Controller& controller);
 
 protected:
@@ -188,7 +188,7 @@ class Editor final : public Screen,
   bool m_save_request_switch;
   bool m_test_request;
   bool m_particle_editor_request;
-  boost::optional<std::pair<std::string, Vector>> m_test_pos;
+  std::optional<std::pair<std::string, Vector>> m_test_pos;
 
   std::unique_ptr<Savegame> m_savegame;
   std::string* m_particle_editor_filename;

src/editor/object_option.cpp

@@ -53,7 +53,7 @@ ObjectOption::~ObjectOption()
 }
 
 BoolObjectOption::BoolObjectOption(const std::string& text, bool* pointer, const std::string& key,
-                                   boost::optional<bool> default_value,
+                                   std::optional<bool> default_value,
                                    unsigned int flags) :
   ObjectOption(text, key, flags),
   m_pointer(pointer),
@@ -86,7 +86,7 @@ BoolObjectOption::to_string() const
 }
 
 IntObjectOption::IntObjectOption(const std::string& text, int* pointer, const std::string& key,
-                                 boost::optional<int> default_value,
+                                 std::optional<int> default_value,
                                  unsigned int flags) :
   ObjectOption(text, key, flags),
   m_pointer(pointer),
@@ -175,7 +175,7 @@ RectfObjectOption::add_to_menu(Menu& menu) const
 }
 
 FloatObjectOption::FloatObjectOption(const std::string& text, float* pointer, const std::string& key,
-                                     boost::optional<float> default_value,
+                                     std::optional<float> default_value,
                                      unsigned int flags) :
   ObjectOption(text, key, flags),
   m_pointer(pointer),
@@ -208,7 +208,7 @@ FloatObjectOption::add_to_menu(Menu& menu) const
 }
 
 StringObjectOption::StringObjectOption(const std::string& text, std::string* pointer, const std::string& key,
-                                       boost::optional<std::string> default_value,
+                                       std::optional<std::string> default_value,
                                        unsigned int flags) :
   ObjectOption(text, key, flags),
   m_pointer(pointer),
@@ -242,7 +242,7 @@ StringObjectOption::add_to_menu(Menu& menu) const
 
 StringSelectObjectOption::StringSelectObjectOption(const std::string& text, int* pointer,
                                                    const std::vector<std::string>& select,
-                                                   boost::optional<int> default_value,
+                                                   std::optional<int> default_value,
                                                    const std::string& key, unsigned int flags) :
   ObjectOption(text, key, flags),
   m_pointer(pointer),
@@ -287,7 +287,7 @@ StringSelectObjectOption::add_to_menu(Menu& menu) const
 EnumObjectOption::EnumObjectOption(const std::string& text, int* pointer,
                                    const std::vector<std::string>& labels,
                                    const std::vector<std::string>& symbols,
-                                   boost::optional<int> default_value,
+                                   std::optional<int> default_value,
                                    const std::string& key, unsigned int flags) :
   ObjectOption(text, key, flags),
   m_pointer(pointer),
@@ -366,7 +366,7 @@ ScriptObjectOption::add_to_menu(Menu& menu) const
 }
 
 FileObjectOption::FileObjectOption(const std::string& text, std::string* pointer,
-                                   boost::optional<std::string> default_value,
+                                   std::optional<std::string> default_value,
                                    const std::string& key,
                                    std::vector<std::string> filter,
                                    const std::string& basedir,
@@ -410,7 +410,7 @@ FileObjectOption::add_to_menu(Menu& menu) const
 }
 
 ColorObjectOption::ColorObjectOption(const std::string& text, Color* pointer, const std::string& key,
-                                     boost::optional<Color> default_value, bool use_alpha,
+                                     std::optional<Color> default_value, bool use_alpha,
                                      unsigned int flags) :
   ObjectOption(text, key, flags),
   m_pointer(pointer),

src/editor/object_option.hpp

@@ -17,7 +17,8 @@
 #ifndef HEADER_SUPERTUX_EDITOR_OBJECT_OPTION_HPP
 #define HEADER_SUPERTUX_EDITOR_OBJECT_OPTION_HPP
 
-#include <boost/optional.hpp>
+#include <optional>
+#include <functional>
 #include <string>
 #include <vector>
 
@@ -75,7 +76,7 @@ class BoolObjectOption : public ObjectOption
 {
 public:
   BoolObjectOption(const std::string& text, bool* pointer, const std::string& key,
-                   boost::optional<bool> default_value,
+                   std::optional<bool> default_value,
                    unsigned int flags);
 
   virtual void save(Writer& write) const override;
@@ -84,7 +85,7 @@ class BoolObjectOption : public ObjectOption
 
 private:
   bool* const m_pointer;
-  const boost::optional<bool> m_default_value;
+  const std::optional<bool> m_default_value;
 
 private:
   BoolObjectOption(const BoolObjectOption&) = delete;
@@ -95,7 +96,7 @@ class IntObjectOption : public ObjectOption
 {
 public:
   IntObjectOption(const std::string& text, int* pointer, const std::string& key,
-                  boost::optional<int> default_value,
+                  std::optional<int> default_value,
                   unsigned int flags);
 
   virtual void save(Writer& write) const override;
@@ -104,7 +105,7 @@ class IntObjectOption : public ObjectOption
 
 private:
   int* const m_pointer;
-  const boost::optional<int> m_default_value;
+  const std::optional<int> m_default_value;
 
 private:
   IntObjectOption(const IntObjectOption&) = delete;
@@ -150,7 +151,7 @@ class FloatObjectOption : public ObjectOption
 {
 public:
   FloatObjectOption(const std::string& text, float* pointer, const std::string& key,
-                    boost::optional<float> default_value,
+                    std::optional<float> default_value,
                     unsigned int flags);
 
   virtual void save(Writer& write) const override;
@@ -159,7 +160,7 @@ class FloatObjectOption : public ObjectOption
 
 private:
   float* const m_pointer;
-  const boost::optional<float> m_default_value;
+  const std::optional<float> m_default_value;
 
 private:
   FloatObjectOption(const FloatObjectOption&) = delete;
@@ -170,7 +171,7 @@ class StringObjectOption : public ObjectOption
 {
 public:
   StringObjectOption(const std::string& text, std::string* pointer, const std::string& key,
-                     boost::optional<std::string> default_value,
+                     std::optional<std::string> default_value,
                      unsigned int flags);
 
   virtual void save(Writer& write) const override;
@@ -179,7 +180,7 @@ class StringObjectOption : public ObjectOption
 
 private:
   std::string* const m_pointer;
-  boost::optional<std::string> m_default_value;
+  std::optional<std::string> m_default_value;
 
 private:
   StringObjectOption(const StringObjectOption&) = delete;
@@ -190,7 +191,7 @@ class StringSelectObjectOption : public ObjectOption
 {
 public:
   StringSelectObjectOption(const std::string& text, int* pointer, const std::vector<std::string>& select,
-                           boost::optional<int> default_value,
+                           std::optional<int> default_value,
                            const std::string& key, unsigned int flags);
 
   virtual void save(Writer& write) const override;
@@ -200,7 +201,7 @@ class StringSelectObjectOption : public ObjectOption
 private:
   int* const m_pointer;
   const std::vector<std::string> m_select;
-  const boost::optional<int> m_default_value;
+  const std::optional<int> m_default_value;
 
 private:
   StringSelectObjectOption(const StringSelectObjectOption&) = delete;
@@ -213,7 +214,7 @@ class EnumObjectOption : public ObjectOption
   EnumObjectOption(const std::string& text, int* pointer,
                    const std::vector<std::string>& labels,
                    const std::vector<std::string>& symbols,
-                   boost::optional<int> default_value,
+                   std::optional<int> default_value,
                    const std::string& key, unsigned int flags);
 
   virtual void save(Writer& write) const override;
@@ -224,7 +225,7 @@ class EnumObjectOption : public ObjectOption
   int* const m_pointer;
   const std::vector<std::string> m_labels;
   const std::vector<std::string> m_symbols;
-  const boost::optional<int> m_default_value;
+  const std::optional<int> m_default_value;
 
 private:
   EnumObjectOption(const EnumObjectOption&) = delete;
@@ -253,7 +254,7 @@ class FileObjectOption : public ObjectOption
 {
 public:
   FileObjectOption(const std::string& text, std::string* pointer,
-                   boost::optional<std::string> default_value,
+                   std::optional<std::string> default_value,
                    const std::string& key,
                    std::vector<std::string> filter,
                    const std::string& basedir,
@@ -266,7 +267,7 @@ class FileObjectOption : public ObjectOption
 
 private:
   std::string* const m_pointer;
-  boost::optional<std::string> m_default_value;
+  std::optional<std::string> m_default_value;
   const std::vector<std::string> m_filter;
   std::string m_basedir;
   bool m_path_relative_to_basedir;
@@ -280,7 +281,7 @@ class ColorObjectOption : public ObjectOption
 {
 public:
   ColorObjectOption(const std::string& text, Color* pointer, const std::string& key,
-                    boost::optional<Color> default_value, bool use_alpha,
+                    std::optional<Color> default_value, bool use_alpha,
                     unsigned int flags);
 
   virtual void save(Writer& write) const override;
@@ -289,7 +290,7 @@ class ColorObjectOption : public ObjectOption
 
 private:
   Color* const m_pointer;
-  const boost::optional<Color> m_default_value;
+  const std::optional<Color> m_default_value;
   bool m_use_alpha;
 
 private: