Used default initialization instead of nullopt for default function p…

…arameters
wesnoth · Jan 13, 2021 · a224b46 · a224b46
1 parent cc7204f
commit a224b46
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src/game_config_manager.hpp b/src/game_config_manager.hpp
@@ -62,7 +62,7 @@ class game_config_manager
 	void load_game_config(bool reload_everything);
 
 	void load_game_config_with_loadscreen(FORCE_RELOAD_CONFIG force_reload,
-		game_classification const* classification = nullptr, utils::optional<std::set<std::string>> active_addons = utils::nullopt);
+		game_classification const* classification = nullptr, utils::optional<std::set<std::string>> active_addons = {});
 
 	// load_game_config() helper functions.
 	void load_addons_cfg();

diff --git a/src/generators/cave_map_generator.hpp b/src/generators/cave_map_generator.hpp
@@ -31,13 +31,13 @@ class cave_map_generator : public map_generator
 
 	std::string config_name() const;
 
-	std::string create_map(utils::optional<uint32_t> randomseed = utils::nullopt);
-	config create_scenario(utils::optional<uint32_t> randomseed = utils::nullopt);
+	std::string create_map(utils::optional<uint32_t> randomseed = {});
+	config create_scenario(utils::optional<uint32_t> randomseed = {});
 
 private:
 	struct cave_map_generator_job
 	{
-		cave_map_generator_job(const cave_map_generator& params, utils::optional<uint32_t> randomseed = utils::nullopt);
+		cave_map_generator_job(const cave_map_generator& params, utils::optional<uint32_t> randomseed = {});
 
 		struct chamber {
 			chamber()

diff --git a/src/generators/map_generator.hpp b/src/generators/map_generator.hpp
@@ -63,7 +63,7 @@ class map_generator
 	 * Creates a new map and returns it.
 	 * args may contain arguments to the map generator.
 	 */
-	virtual std::string create_map(utils::optional<uint32_t> randomseed = utils::nullopt) = 0;
+	virtual std::string create_map(utils::optional<uint32_t> randomseed = {}) = 0;
 
-	virtual config create_scenario(utils::optional<uint32_t> randomseed = utils::nullopt);
+	virtual config create_scenario(utils::optional<uint32_t> randomseed = {});
 };