Remove utils/stdcompat/optional.hpp

3 years ago · 14540164a7
39 changed files with 42 additions and 46 deletions
--- a/Source/DiabloUI/diabloui.h
+++ b/Source/DiabloUI/diabloui.h
@ -1,10 +1,11 @@
 #pragma once

-#include <SDL.h>
 #include <array>
 #include <cstddef>
 #include <cstdint>
+#include <optional>

+#include <SDL.h>
 #include <function_ref.hpp>

 #include "DiabloUI/ui_item.h"
@ -12,7 +13,6 @@
 #include "engine/load_pcx.hpp" // IWYU pragma: export
 #include "player.h"
 #include "utils/display.h"
-#include "utils/stdcompat/optional.hpp"

 namespace devilution {

--- a/Source/DiabloUI/settingsmenu.cpp
+++ b/Source/DiabloUI/settingsmenu.cpp
@ -1,6 +1,7 @@
 #include "selstart.h"

 #include <cstdint>
+#include <optional>

 #include <function_ref.hpp>

@ -14,7 +15,6 @@
 #include "hwcursor.hpp"
 #include "options.h"
 #include "utils/language.h"
-#include "utils/stdcompat/optional.hpp"
 #include "utils/utf8.hpp"

 namespace devilution {
--- a/Source/DiabloUI/title.cpp
+++ b/Source/DiabloUI/title.cpp
@ -1,3 +1,5 @@
+#include <optional>
+
 #include "DiabloUI/diabloui.h"
 #include "control.h"
 #include "controls/input.h"
@ -8,7 +10,6 @@
 #include "utils/algorithm/container.hpp"
 #include "utils/language.h"
 #include "utils/sdl_geometry.h"
-#include "utils/stdcompat/optional.hpp"

 namespace devilution {
 namespace {
--- a/Source/control.cpp
+++ b/Source/control.cpp
@ -9,6 +9,7 @@
 #include <array>
 #include <cstddef>
 #include <cstdint>
+#include <optional>
 #include <string>

 #include <fmt/format.h>
@ -50,7 +51,6 @@
 #include "utils/log.hpp"
 #include "utils/parse_int.hpp"
 #include "utils/sdl_geometry.h"
-#include "utils/stdcompat/optional.hpp"
 #include "utils/str_case.hpp"
 #include "utils/str_cat.hpp"
 #include "utils/string_or_view.hpp"
--- a/Source/control.h
+++ b/Source/control.h
@ -7,6 +7,7 @@

 #include <cstddef>
 #include <cstdint>
+#include <optional>

 #include <SDL.h>

@ -23,7 +24,6 @@
 #include "spelldat.h"
 #include "spells.h"
 #include "utils/attributes.h"
-#include "utils/stdcompat/optional.hpp"
 #include "utils/stdcompat/string_view.hpp"
 #include "utils/string_or_view.hpp"
 #include "utils/ui_fwd.h"
--- a/Source/controls/touch/renderers.h
+++ b/Source/controls/touch/renderers.h
@ -1,6 +1,7 @@
 #pragma once

 #include <cstdint>
+#include <optional>

 #include <SDL.h>

@ -9,7 +10,6 @@
 #include "engine/surface.hpp"
 #include "utils/png.h"
 #include "utils/sdl_ptrs.h"
-#include "utils/stdcompat/optional.hpp"

 namespace devilution {

--- a/Source/cursor.h
+++ b/Source/cursor.h
@ -6,12 +6,12 @@
 #pragma once

 #include <cstdint>
+#include <optional>
 #include <utility>

 #include "engine.h"
 #include "engine/clx_sprite.hpp"
 #include "utils/attributes.h"
-#include "utils/stdcompat/optional.hpp"

 namespace devilution {

--- a/Source/doom.cpp
+++ b/Source/doom.cpp
@ -5,12 +5,13 @@
 */
 #include "doom.h"

+#include <optional>
+
 #include "control.h"
 #include "engine.h"
 #include "engine/clx_sprite.hpp"
 #include "engine/load_cel.hpp"
 #include "engine/render/clx_render.hpp"
-#include "utils/stdcompat/optional.hpp"

 namespace devilution {
 namespace {
--- a/Source/dvlnet/cdwrap.h
+++ b/Source/dvlnet/cdwrap.h
@ -4,12 +4,12 @@
 #include <exception>
 #include <map>
 #include <memory>
+#include <optional>
 #include <string>
 #include <vector>

 #include "dvlnet/abstract_net.h"
 #include "storm/storm_net.hpp"
-#include "utils/stdcompat/optional.hpp"

 namespace devilution {
 namespace net {
--- a/Source/engine/load_pcx.hpp
+++ b/Source/engine/load_pcx.hpp
@ -1,11 +1,11 @@
 #pragma once

 #include <cstdint>
+#include <optional>

 #include <SDL.h>

 #include "engine/clx_sprite.hpp"
-#include "utils/stdcompat/optional.hpp"

 #ifdef UNPACKED_MPQS
 #define DEVILUTIONX_PCX_EXT ".clx"
--- a/Source/engine/path.h
+++ b/Source/engine/path.h
@ -7,13 +7,13 @@

 #include <cstdint>
 #include <limits>
+#include <optional>

 #include <SDL.h>
 #include <function_ref.hpp>

 #include "engine/direction.hpp"
 #include "engine/point.hpp"
-#include "utils/stdcompat/optional.hpp"

 namespace devilution {

--- a/Source/engine/render/text_render.cpp
+++ b/Source/engine/render/text_render.cpp
@ -8,6 +8,7 @@
 #include <array>
 #include <cstddef>
 #include <cstdint>
+#include <optional>
 #include <unordered_map>
 #include <utility>

@ -27,7 +28,6 @@
 #include "utils/display.h"
 #include "utils/language.h"
 #include "utils/sdl_compat.h"
-#include "utils/stdcompat/optional.hpp"
 #include "utils/utf8.hpp"

 namespace devilution {
--- a/Source/engine/render/text_render.hpp
+++ b/Source/engine/render/text_render.hpp
@ -6,6 +6,7 @@
 #pragma once

 #include <cstdint>
+#include <optional>
 #include <string>
 #include <utility>
 #include <vector>
@ -16,7 +17,6 @@
 #include "engine.h"
 #include "engine/clx_sprite.hpp"
 #include "engine/rectangle.hpp"
-#include "utils/stdcompat/optional.hpp"
 #include "utils/stdcompat/string_view.hpp"

 namespace devilution {
--- a/Source/engine/sound.cpp
+++ b/Source/engine/sound.cpp
@ -9,6 +9,7 @@
 #include <list>
 #include <memory>
 #include <mutex>
+#include <optional>

 #include <SDL.h>

@ -19,7 +20,6 @@
 #include "utils/math.h"
 #include "utils/sdl_mutex.h"
 #include "utils/stdcompat/algorithm.hpp"
-#include "utils/stdcompat/optional.hpp"
 #include "utils/stdcompat/shared_ptr_array.hpp"
 #include "utils/str_cat.hpp"
 #include "utils/stubs.h"
--- a/Source/engine/trn.hpp
+++ b/Source/engine/trn.hpp
@ -6,9 +6,9 @@
 #pragma once

 #include <cstdint>
+#include <optional>

 #include "player.h"
-#include "utils/stdcompat/optional.hpp"

 namespace devilution {

--- a/Source/gmenu.cpp
+++ b/Source/gmenu.cpp
@ -6,6 +6,7 @@
 #include "gmenu.h"

 #include <cstdint>
+#include <optional>

 #include "DiabloUI/ui_flags.hpp"
 #include "control.h"
@ -20,7 +21,6 @@
 #include "stores.h"
 #include "utils/language.h"
 #include "utils/stdcompat/algorithm.hpp"
-#include "utils/stdcompat/optional.hpp"
 #include "utils/ui_fwd.h"

 namespace devilution {
--- a/Source/init.h
+++ b/Source/init.h
@ -5,8 +5,9 @@
 */
 #pragma once

+#include <optional>
+
 #include "utils/attributes.h"
-#include "utils/stdcompat/optional.hpp"

 #ifdef UNPACKED_MPQS
 #include <string>
--- a/Source/interfac.cpp
+++ b/Source/interfac.cpp
@ -5,6 +5,7 @@
 */

 #include <cstdint>
+#include <optional>

 #include <SDL.h>

@ -25,7 +26,6 @@
 #include "pfile.h"
 #include "plrmsg.h"
 #include "utils/sdl_geometry.h"
-#include "utils/stdcompat/optional.hpp"

 namespace devilution {

--- a/Source/inv.cpp
+++ b/Source/inv.cpp
@ -6,6 +6,7 @@
 #include <algorithm>
 #include <cmath>
 #include <cstdint>
+#include <optional>
 #include <utility>

 #include <fmt/format.h>
@ -32,7 +33,6 @@
 #include "utils/format_int.hpp"
 #include "utils/language.h"
 #include "utils/sdl_geometry.h"
-#include "utils/stdcompat/optional.hpp"
 #include "utils/str_cat.hpp"
 #include "utils/utf8.hpp"

--- a/Source/items.h
+++ b/Source/items.h
@ -6,6 +6,7 @@
 #pragma once

 #include <cstdint>
+#include <optional>

 #include "DiabloUI/ui_flags.hpp"
 #include "engine.h"
@ -13,7 +14,6 @@
 #include "engine/point.hpp"
 #include "itemdat.h"
 #include "monster.h"
-#include "utils/stdcompat/optional.hpp"
 #include "utils/string_or_view.hpp"

 namespace devilution {
--- a/Source/levels/drlg_l2.cpp
+++ b/Source/levels/drlg_l2.cpp
@ -8,6 +8,7 @@
 #include <cmath>
 #include <cstdint>
 #include <list>
+#include <optional>

 #include "diablo.h"
 #include "engine/load_file.hpp"
@ -18,7 +19,6 @@
 #include "player.h"
 #include "quests.h"
 #include "utils/stdcompat/algorithm.hpp"
-#include "utils/stdcompat/optional.hpp"

 namespace devilution {

--- a/Source/levels/gendung.h
+++ b/Source/levels/gendung.h
@ -7,6 +7,7 @@

 #include <cstdint>
 #include <memory>
+#include <optional>

 #include "engine.h"
 #include "engine/clx_sprite.hpp"
@ -17,7 +18,6 @@
 #include "utils/attributes.h"
 #include "utils/bitset2d.hpp"
 #include "utils/enum_traits.h"
-#include "utils/stdcompat/optional.hpp"

 namespace devilution {

--- a/Source/lighting.h
+++ b/Source/lighting.h
@ -7,6 +7,7 @@

 #include <array>
 #include <cstdint>
+#include <optional>
 #include <vector>

 #include <function_ref.hpp>
@ -16,7 +17,6 @@
 #include "engine/point.hpp"
 #include "utils/attributes.h"
 #include "utils/stdcompat/invoke_result_t.hpp"
-#include "utils/stdcompat/optional.hpp"

 namespace devilution {

--- a/Source/minitext.cpp
+++ b/Source/minitext.cpp
@ -4,6 +4,7 @@
 * Implementation of scrolling dialog text.
 */
 #include <cstdint>
+#include <optional>
 #include <string>
 #include <vector>

@ -18,7 +19,6 @@
 #include "playerdat.hpp"
 #include "textdat.h"
 #include "utils/language.h"
-#include "utils/stdcompat/optional.hpp"
 #include "utils/stdcompat/string_view.hpp"

 namespace devilution {
--- a/Source/missiles.h
+++ b/Source/missiles.h
@ -7,6 +7,7 @@

 #include <cstdint>
 #include <list>
+#include <optional>

 #include "engine.h"
 #include "engine/point.hpp"
@ -14,7 +15,6 @@
 #include "monster.h"
 #include "player.h"
 #include "spelldat.h"
-#include "utils/stdcompat/optional.hpp"

 namespace devilution {

--- a/Source/mpq/mpq_reader.cpp
+++ b/Source/mpq/mpq_reader.cpp
@ -1,11 +1,10 @@
 #include "mpq/mpq_reader.hpp"

 #include <cstdint>
+#include <optional>

 #include <libmpq/mpq.h>

-#include "utils/stdcompat/optional.hpp"
-
 namespace devilution {

 std::optional<MpqArchive> MpqArchive::Open(const char *path, int32_t &error)
--- a/Source/mpq/mpq_reader.hpp
+++ b/Source/mpq/mpq_reader.hpp
@ -4,11 +4,10 @@
 #include <cstddef>
 #include <cstdint>
 #include <memory>
+#include <optional>
 #include <string>
 #include <vector>

-#include "utils/stdcompat/optional.hpp"
-
 // Forward-declare so that we can avoid exposing libmpq.
 struct mpq_archive;
 using mpq_archive_s = struct mpq_archive;
--- a/Source/options.h
+++ b/Source/options.h
@ -4,6 +4,7 @@
 #include <cstddef>
 #include <cstdint>
 #include <forward_list>
+#include <optional>
 #include <unordered_map>

 #include <SDL_version.h>
@ -14,7 +15,6 @@
 #include "engine/sound_defs.hpp"
 #include "pack.h"
 #include "utils/enum_traits.h"
-#include "utils/stdcompat/optional.hpp"
 #include "utils/stdcompat/string_view.hpp"

 namespace devilution {
--- a/Source/panels/mainpanel.cpp
+++ b/Source/panels/mainpanel.cpp
@ -1,6 +1,7 @@
 #include "panels/mainpanel.hpp"

 #include <cstdint>
+#include <optional>

 #include "control.h"
 #include "engine/clx_sprite.hpp"
@ -11,7 +12,6 @@
 #include "utils/language.h"
 #include "utils/sdl_compat.h"
 #include "utils/sdl_geometry.h"
-#include "utils/stdcompat/optional.hpp"
 #include "utils/surface_to_clx.hpp"

 namespace devilution {
--- a/Source/panels/spell_book.cpp
+++ b/Source/panels/spell_book.cpp
@ -1,6 +1,7 @@
 #include "panels/spell_book.hpp"

 #include <cstdint>
+#include <optional>

 #include <fmt/format.h>

@ -19,7 +20,6 @@
 #include "player.h"
 #include "spelldat.h"
 #include "utils/language.h"
-#include "utils/stdcompat/optional.hpp"

 namespace devilution {

--- a/Source/panels/spell_icons.cpp
+++ b/Source/panels/spell_icons.cpp
@ -1,6 +1,7 @@
 #include "panels/spell_icons.hpp"

 #include <cstdint>
+#include <optional>

 #include "engine.h"
 #include "engine/load_cel.hpp"
@ -8,7 +9,6 @@
 #include "engine/palette.h"
 #include "engine/render/clx_render.hpp"
 #include "init.h"
-#include "utils/stdcompat/optional.hpp"

 namespace devilution {

--- a/Source/stores.h
+++ b/Source/stores.h
@ -6,13 +6,13 @@
 #pragma once

 #include <cstdint>
+#include <optional>

 #include "DiabloUI/ui_flags.hpp"
 #include "control.h"
 #include "engine.h"
 #include "engine/clx_sprite.hpp"
 #include "utils/attributes.h"
-#include "utils/stdcompat/optional.hpp"

 namespace devilution {

--- a/Source/storm/storm_svid.cpp
+++ b/Source/storm/storm_svid.cpp
@ -3,6 +3,7 @@
 #include <cstddef>
 #include <cstdint>
 #include <cstring>
+#include <optional>

 #include <SmackerDecoder.h>

@ -19,7 +20,6 @@
 #include "utils/log.hpp"
 #include "utils/sdl_compat.h"
 #include "utils/sdl_wrap.h"
-#include "utils/stdcompat/optional.hpp"

 namespace devilution {
 namespace {
--- a/Source/utils/intrusive_optional.hpp
+++ b/Source/utils/intrusive_optional.hpp
@ -1,10 +1,10 @@
 #pragma once

+#include <optional>
 #include <type_traits>
 #include <utility>

 #include "appfat.h"
-#include "utils/stdcompat/optional.hpp"

 /// An optional that uses a field of the stored class and some value to store nullopt.
 #define DEFINE_INTRUSIVE_OPTIONAL_IMPL(OPTIONAL_CLASS, VALUE_CLASS, FIELD, NULL_VALUE, CONSTEXPR) \
--- a/Source/utils/logged_fstream.hpp
+++ b/Source/utils/logged_fstream.hpp
@ -3,12 +3,11 @@
 #include <cerrno>
 #include <cstdio>
 #include <cstring>
+#include <optional>
 #include <string>

 #include "utils/file_util.h"
 #include "utils/log.hpp"
-#include "utils/stdcompat/optional.hpp"
-
 namespace devilution {

 // A wrapper around `FILE *` that logs errors.
--- a/Source/utils/paths.h
+++ b/Source/utils/paths.h
@ -1,9 +1,8 @@
 #pragma once

+#include <optional>
 #include <string>

-#include "utils/stdcompat/optional.hpp"
-
 namespace devilution {

 namespace paths {
--- a/Source/utils/pcx_to_clx.hpp
+++ b/Source/utils/pcx_to_clx.hpp
@ -1,10 +1,10 @@
 #pragma once

 #include <cstdint>
+#include <optional>

 #include "engine/assets.hpp"
 #include "engine/clx_sprite.hpp"
-#include "utils/stdcompat/optional.hpp"

 namespace devilution {

--- a/Source/utils/stdcompat/optional.hpp
+++ b/Source/utils/stdcompat/optional.hpp
@ -1,3 +0,0 @@
-#pragma once
-
-#include <optional> // IWYU pragma: export
--- a/Source/utils/surface_to_clx.hpp
+++ b/Source/utils/surface_to_clx.hpp
@ -1,10 +1,10 @@
 #pragma once

 #include <cstdint>
+#include <optional>

 #include "engine/clx_sprite.hpp"
 #include "engine/surface.hpp"
-#include "utils/stdcompat/optional.hpp"

 namespace devilution {