From 24b8ff086c3c9033c1f9097d9de24143785ccfa7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Fri, 25 Jan 2019 22:34:10 +0100 Subject: [PATCH] Removed std::optional backwards compatibility. This was a dirty mess. Good riddance. Also removing the include from the header now, as it has a forward declaration and thus is not needed. --- doc/changelog.dox | 4 + doc/generated/primitives.cpp | 1 + doc/generated/shaders.cpp | 1 + doc/snippets/MagnumTrade.cpp | 1 + doc/snippets/debugtools-compareimage.cpp | 1 + .../DebugTools/Test/CompareImageTest.cpp | 1 + .../TextureTools/distancefieldconverter.cpp | 1 + src/Magnum/Trade/AbstractImageConverter.cpp | 1 + src/Magnum/Trade/AbstractImageConverter.h | 5 - src/Magnum/Trade/AbstractImporter.cpp | 1 + src/Magnum/Trade/AbstractImporter.h | 5 - .../Trade/Test/AbstractImageConverterTest.cpp | 1 + .../Trade/Test/AbstractImporterTest.cpp | 1 + src/Magnum/Trade/imageconverter.cpp | 1 + src/MagnumExternal/CMakeLists.txt | 4 - src/MagnumExternal/Optional/CMakeLists.txt | 32 ----- src/MagnumExternal/Optional/OptionalWrapper.h | 68 ----------- .../Optional/Test/CMakeLists.txt | 47 -------- .../Optional/Test/StdOptionalTest.cpp | 111 ------------------ src/MagnumExternal/Optional/optional.hpp | 39 ------ .../AnyImageImporter/AnyImageImporter.cpp | 1 + .../Test/AnyImageImporterTest.cpp | 1 + .../AnySceneImporter/AnySceneImporter.cpp | 2 + .../Test/AnySceneImporterTest.cpp | 1 + src/MagnumPlugins/MagnumFont/MagnumFont.cpp | 1 + src/MagnumPlugins/ObjImporter/ObjImporter.cpp | 1 + .../ObjImporter/Test/ObjImporterTest.cpp | 1 + .../Test/TgaImageConverterTest.cpp | 1 + .../TgaImporter/Test/TgaImporterTest.cpp | 1 + src/MagnumPlugins/TgaImporter/TgaImporter.cpp | 3 +- 30 files changed, 27 insertions(+), 312 deletions(-) delete mode 100644 src/MagnumExternal/Optional/CMakeLists.txt delete mode 100644 src/MagnumExternal/Optional/OptionalWrapper.h delete mode 100644 src/MagnumExternal/Optional/Test/CMakeLists.txt delete mode 100644 src/MagnumExternal/Optional/Test/StdOptionalTest.cpp delete mode 100644 src/MagnumExternal/Optional/optional.hpp diff --git a/doc/changelog.dox b/doc/changelog.dox index cc717987f..852fed426 100644 --- a/doc/changelog.dox +++ b/doc/changelog.dox @@ -186,6 +186,10 @@ See also: @subsection changelog-latest-compatibility Potential compatibility breakages, removed APIs +- Removed deprecated implicit conversion @ref Corrade::Containers::Optional + to @cpp std::optional @ce, deprecated in January 2018. The class now + contains an *explicit* and opt-in STL compatibility, see its documentation + for more information. - Removed the `Magnum/Test/AbstractOpenGLTester.h` header that was deprecated in January 2017. Use @ref Magnum/GL/OpenGLTester.h and the @ref GL::OpenGLTester library instead. Note that the deprecated diff --git a/doc/generated/primitives.cpp b/doc/generated/primitives.cpp index 392358905..124525d1c 100644 --- a/doc/generated/primitives.cpp +++ b/doc/generated/primitives.cpp @@ -23,6 +23,7 @@ DEALINGS IN THE SOFTWARE. */ +#include #include #include diff --git a/doc/generated/shaders.cpp b/doc/generated/shaders.cpp index 2f1601208..f42763901 100644 --- a/doc/generated/shaders.cpp +++ b/doc/generated/shaders.cpp @@ -23,6 +23,7 @@ DEALINGS IN THE SOFTWARE. */ +#include #include #include diff --git a/doc/snippets/MagnumTrade.cpp b/doc/snippets/MagnumTrade.cpp index b3a638741..f4855c552 100644 --- a/doc/snippets/MagnumTrade.cpp +++ b/doc/snippets/MagnumTrade.cpp @@ -24,6 +24,7 @@ */ #include +#include #include #include "Magnum/PixelFormat.h" diff --git a/doc/snippets/debugtools-compareimage.cpp b/doc/snippets/debugtools-compareimage.cpp index d401acaa0..77a9b8065 100644 --- a/doc/snippets/debugtools-compareimage.cpp +++ b/doc/snippets/debugtools-compareimage.cpp @@ -23,6 +23,7 @@ DEALINGS IN THE SOFTWARE. */ +#include #include #include #include diff --git a/src/Magnum/DebugTools/Test/CompareImageTest.cpp b/src/Magnum/DebugTools/Test/CompareImageTest.cpp index c813e06a0..5a9e82307 100644 --- a/src/Magnum/DebugTools/Test/CompareImageTest.cpp +++ b/src/Magnum/DebugTools/Test/CompareImageTest.cpp @@ -25,6 +25,7 @@ #include #include +#include #include #include #include diff --git a/src/Magnum/TextureTools/distancefieldconverter.cpp b/src/Magnum/TextureTools/distancefieldconverter.cpp index af83511fc..3e790d08f 100644 --- a/src/Magnum/TextureTools/distancefieldconverter.cpp +++ b/src/Magnum/TextureTools/distancefieldconverter.cpp @@ -23,6 +23,7 @@ DEALINGS IN THE SOFTWARE. */ +#include #include #include #include diff --git a/src/Magnum/Trade/AbstractImageConverter.cpp b/src/Magnum/Trade/AbstractImageConverter.cpp index cfc12557b..a3dc6e241 100644 --- a/src/Magnum/Trade/AbstractImageConverter.cpp +++ b/src/Magnum/Trade/AbstractImageConverter.cpp @@ -27,6 +27,7 @@ #include #include +#include #include #include diff --git a/src/Magnum/Trade/AbstractImageConverter.h b/src/Magnum/Trade/AbstractImageConverter.h index d989f4ed5..8a185fa3d 100644 --- a/src/Magnum/Trade/AbstractImageConverter.h +++ b/src/Magnum/Trade/AbstractImageConverter.h @@ -29,17 +29,12 @@ * @brief Class @ref Magnum::Trade::AbstractImageConverter */ -#include #include #include "Magnum/Magnum.h" #include "Magnum/Trade/Trade.h" #include "Magnum/Trade/visibility.h" -#ifdef MAGNUM_BUILD_DEPRECATED -#include "MagnumExternal/Optional/OptionalWrapper.h" -#endif - namespace Magnum { namespace Trade { /** diff --git a/src/Magnum/Trade/AbstractImporter.cpp b/src/Magnum/Trade/AbstractImporter.cpp index 518f688b9..07d37252e 100644 --- a/src/Magnum/Trade/AbstractImporter.cpp +++ b/src/Magnum/Trade/AbstractImporter.cpp @@ -27,6 +27,7 @@ #include #include +#include #include #include #include diff --git a/src/Magnum/Trade/AbstractImporter.h b/src/Magnum/Trade/AbstractImporter.h index 9d8d769e7..a9c6cf4ab 100644 --- a/src/Magnum/Trade/AbstractImporter.h +++ b/src/Magnum/Trade/AbstractImporter.h @@ -31,17 +31,12 @@ #include #include -#include #include #include "Magnum/Magnum.h" #include "Magnum/Trade/Trade.h" #include "Magnum/Trade/visibility.h" -#ifdef MAGNUM_BUILD_DEPRECATED -#include "MagnumExternal/Optional/OptionalWrapper.h" -#endif - namespace Magnum { namespace Trade { /** diff --git a/src/Magnum/Trade/Test/AbstractImageConverterTest.cpp b/src/Magnum/Trade/Test/AbstractImageConverterTest.cpp index 57700df11..5a76dda9e 100644 --- a/src/Magnum/Trade/Test/AbstractImageConverterTest.cpp +++ b/src/Magnum/Trade/Test/AbstractImageConverterTest.cpp @@ -25,6 +25,7 @@ #include #include +#include #include #include #include diff --git a/src/Magnum/Trade/Test/AbstractImporterTest.cpp b/src/Magnum/Trade/Test/AbstractImporterTest.cpp index 2356a08fd..144d5d9dd 100644 --- a/src/Magnum/Trade/Test/AbstractImporterTest.cpp +++ b/src/Magnum/Trade/Test/AbstractImporterTest.cpp @@ -25,6 +25,7 @@ #include #include +#include #include #include diff --git a/src/Magnum/Trade/imageconverter.cpp b/src/Magnum/Trade/imageconverter.cpp index 1d6180a45..e06591715 100644 --- a/src/Magnum/Trade/imageconverter.cpp +++ b/src/Magnum/Trade/imageconverter.cpp @@ -23,6 +23,7 @@ DEALINGS IN THE SOFTWARE. */ +#include #include #include #include diff --git a/src/MagnumExternal/CMakeLists.txt b/src/MagnumExternal/CMakeLists.txt index 79c0e8ebd..983f7e9bd 100644 --- a/src/MagnumExternal/CMakeLists.txt +++ b/src/MagnumExternal/CMakeLists.txt @@ -32,7 +32,3 @@ endif() if(WITH_VK) add_subdirectory(Vulkan) endif() - -if(MAGNUM_BUILD_DEPRECATED) - add_subdirectory(Optional) -endif() diff --git a/src/MagnumExternal/Optional/CMakeLists.txt b/src/MagnumExternal/Optional/CMakeLists.txt deleted file mode 100644 index 36dd02939..000000000 --- a/src/MagnumExternal/Optional/CMakeLists.txt +++ /dev/null @@ -1,32 +0,0 @@ -# -# This file is part of Magnum. -# -# Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 -# Vladimír Vondruš -# -# Permission is hereby granted, free of charge, to any person obtaining a -# copy of this software and associated documentation files (the "Software"), -# to deal in the Software without restriction, including without limitation -# the rights to use, copy, modify, merge, publish, distribute, sublicense, -# and/or sell copies of the Software, and to permit persons to whom the -# Software is furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included -# in all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -# DEALINGS IN THE SOFTWARE. -# - -if(MAGNUM_BUILD_DEPRECATED) - install(FILES optional.hpp OptionalWrapper.h DESTINATION ${MAGNUM_EXTERNAL_INCLUDE_INSTALL_DIR}/Optional) -endif() - -if(BUILD_TESTS) - add_subdirectory(Test) -endif() diff --git a/src/MagnumExternal/Optional/OptionalWrapper.h b/src/MagnumExternal/Optional/OptionalWrapper.h deleted file mode 100644 index fa10fed74..000000000 --- a/src/MagnumExternal/Optional/OptionalWrapper.h +++ /dev/null @@ -1,68 +0,0 @@ -#ifndef MagnumExternal_Optional_OptionalWrapper_hpp -#define MagnumExternal_Optional_OptionalWrapper_hpp -/* - This file is part of Magnum. - - Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 - Vladimír Vondruš - - Permission is hereby granted, free of charge, to any person obtaining a - copy of this software and associated documentation files (the "Software"), - to deal in the Software without restriction, including without limitation - the rights to use, copy, modify, merge, publish, distribute, sublicense, - and/or sell copies of the Software, and to permit persons to whom the - Software is furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included - in all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - DEALINGS IN THE SOFTWARE. -*/ - -#if !defined(Corrade_Containers_Optional_h) || !defined(Corrade_Utility_Macros_h) || !defined(MAGNUM_BUILD_DEPRECATED) -#error This file is not meant to be used directly. -#endif - -/* Cover your eyes. This will hurt. And wash your hands after. */ -#ifdef MAGNUM_BUILD_DEPRECATED -#ifdef __has_include -#if __has_include() && CORRADE_CXX_STANDARD >= 201703L -#define _MAGNUM_HAS_STD_OPTIONAL -#include - -namespace Corrade { namespace Containers { namespace Implementation { - template struct OptionalConverter> { - CORRADE_DEPRECATED("use Corrade::Containers::Optional instead") static std::optional to(const Optional& other) { - if(other) return std::optional{*other}; - else return std::nullopt; - } - CORRADE_DEPRECATED("use Corrade::Containers::Optional instead") static std::optional to(Optional&& other) { - if(other) return std::optional{std::move(*other)}; - else return std::nullopt; - } - }; -}}} -#endif -#endif - -#ifdef _MAGNUM_HAS_STD_OPTIONAL -#else -namespace std { - template using optional CORRADE_DEPRECATED_ALIAS("use Corrade::Containers::Optional instead") = Corrade::Containers::Optional; - - constexpr CORRADE_DEPRECATED("use Corrade::Containers::NullOpt instead") Corrade::Containers::NullOptT nullopt{Corrade::Containers::NullOptT::Init{}}; - - template CORRADE_DEPRECATED("use Corrade::Containers::optional() instead") inline Corrade::Containers::Optional::type> make_optional(T&& value) { - return Corrade::Containers::Optional::type>{std::forward(value)}; - } -} -#endif -#endif - -#endif diff --git a/src/MagnumExternal/Optional/Test/CMakeLists.txt b/src/MagnumExternal/Optional/Test/CMakeLists.txt deleted file mode 100644 index a752d6149..000000000 --- a/src/MagnumExternal/Optional/Test/CMakeLists.txt +++ /dev/null @@ -1,47 +0,0 @@ -# -# This file is part of Magnum. -# -# Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 -# Vladimír Vondruš -# -# Permission is hereby granted, free of charge, to any person obtaining a -# copy of this software and associated documentation files (the "Software"), -# to deal in the Software without restriction, including without limitation -# the rights to use, copy, modify, merge, publish, distribute, sublicense, -# and/or sell copies of the Software, and to permit persons to whom the -# Software is furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included -# in all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -# DEALINGS IN THE SOFTWARE. -# - -corrade_add_test(StdOptionalTest StdOptionalTest.cpp) -target_include_directories(StdOptionalTest PRIVATE - ${PROJECT_SOURCE_DIR}/src - ${PROJECT_BINARY_DIR}/src) -set_target_properties(StdOptionalTest PROPERTIES FOLDER "MagnumExternal/Optional/Test") - -# Try using C++17 on newer compilers. Can't use VERSION_GREATER_EQUAL because -# older CMake doesn't support these. No idea how to detect libc++ presence on -# non-Apple platforms (or even version), so I'm giving up there, testing just -# elsewhere. -# -# Compiler versions where std::optional is supported: -# MSVC 2017 (trust me, I know) -# GCC libstdc++ 7.1 (see https://gcc.gnu.org/onlinedocs/libstdc++/manual/status.html#table.cxx17_status) -# libc++ 4.0 (see https://launchpad.net/ubuntu/+source/libc++) -# Apple Clang 9.0 correspons to LLVM 4.0 (see https://gist.github.com/yamaya/2924292#gistcomment-2289472) -if((CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS "7.1") OR - #(CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.0") OR - (CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang" AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS "9.0") OR - (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC" AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS "19.10")) - set_target_properties(StdOptionalTest PROPERTIES CORRADE_CXX_STANDARD 17) -endif() diff --git a/src/MagnumExternal/Optional/Test/StdOptionalTest.cpp b/src/MagnumExternal/Optional/Test/StdOptionalTest.cpp deleted file mode 100644 index cab64877f..000000000 --- a/src/MagnumExternal/Optional/Test/StdOptionalTest.cpp +++ /dev/null @@ -1,111 +0,0 @@ -/* - This file is part of Magnum. - - Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 - Vladimír Vondruš - - Permission is hereby granted, free of charge, to any person obtaining a - copy of this software and associated documentation files (the "Software"), - to deal in the Software without restriction, including without limitation - the rights to use, copy, modify, merge, publish, distribute, sublicense, - and/or sell copies of the Software, and to permit persons to whom the - Software is furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included - in all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - DEALINGS IN THE SOFTWARE. -*/ - -/* Needs to be here otherwise the deprecation warning inside OptionalConverter - is not ignored */ -#ifdef _MSC_VER -#pragma warning(push) -#pragma warning(disable: 4996) -#endif - -#include -#include -#include - -#include "Magnum/Magnum.h" -#include "MagnumExternal/Optional/OptionalWrapper.h" - -namespace Magnum { namespace Test { namespace { - -struct StdOptionalTest: TestSuite::Tester { - explicit StdOptionalTest(); - - void conversion(); -}; - -StdOptionalTest::StdOptionalTest() { - addTests({&StdOptionalTest::conversion}); -} - -#ifdef __GNUC__ -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" -#endif -void StdOptionalTest::conversion() { - Debug{} << "Using C++ version" << CORRADE_CXX_STANDARD; - #ifdef __has_include - Debug{} << "__has_include is supported"; - #if __has_include() - Debug{} << " header is present"; - #else - Debug{} << " header is not present"; - #endif - #if __has_include() - Debug{} << " header is present"; - #else - Debug{} << " header is not present"; - #endif - #else - Debug{} << "__has_include is not supported"; - #endif - #ifdef _MAGNUM_HAS_STD_OPTIONAL - Debug{} << "Using a conversion to std::optional, C++17 should be present"; - CORRADE_VERIFY(CORRADE_CXX_STANDARD >= 201703L); - #else - Debug{} << "Using a typedef to std::optional, C++17 should not be present"; - { - #ifdef CORRADE_TARGET_APPLE - CORRADE_EXPECT_FAIL_IF(CORRADE_CXX_STANDARD >= 201703L, - "Even Xcode 9.3 beta doesn't have the header, only , thus a typedef is used."); - #endif - CORRADE_VERIFY(CORRADE_CXX_STANDARD < 201703L); - } - #endif - - Containers::Optional a{5}; - Containers::Optional b; - - std::optional sa = a; - CORRADE_COMPARE(*sa, 5); - std::optional sb = b; - CORRADE_VERIFY(!sb); - std::optional empty = std::nullopt; - CORRADE_VERIFY(!empty); - - Containers::Optional> c{std::unique_ptr{new int{7}}}; - std::optional> sc = std::move(c); - CORRADE_COMPARE(**sc, 7); -} -#ifdef __GNUC__ -#pragma GCC diagnostic pop -#endif - -}}} - -CORRADE_TEST_MAIN(Magnum::Test::StdOptionalTest) - -#ifdef _MSC_VER -#pragma warning(pop) -#endif diff --git a/src/MagnumExternal/Optional/optional.hpp b/src/MagnumExternal/Optional/optional.hpp deleted file mode 100644 index 40f0b98aa..000000000 --- a/src/MagnumExternal/Optional/optional.hpp +++ /dev/null @@ -1,39 +0,0 @@ -#ifndef MagnumExternal_Optional_optional_hpp -#define MagnumExternal_Optional_optional_hpp -/* - This file is part of Magnum. - - Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 - Vladimír Vondruš - - Permission is hereby granted, free of charge, to any person obtaining a - copy of this software and associated documentation files (the "Software"), - to deal in the Software without restriction, including without limitation - the rights to use, copy, modify, merge, publish, distribute, sublicense, - and/or sell copies of the Software, and to permit persons to whom the - Software is furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included - in all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - DEALINGS IN THE SOFTWARE. -*/ - -#include -#include - -#include "Magnum/configure.h" - -/* This file is here only to preserve backwards compatibility. It issues a - deprecation warning and includes the Optional wrapper header which itself - doesn't issue a deprecation warning, as it is included from internal code. */ -CORRADE_DEPRECATED_FILE("use instead") -#include "OptionalWrapper.h" - -#endif diff --git a/src/MagnumPlugins/AnyImageImporter/AnyImageImporter.cpp b/src/MagnumPlugins/AnyImageImporter/AnyImageImporter.cpp index 3d1d4ac47..ffaaa6e25 100644 --- a/src/MagnumPlugins/AnyImageImporter/AnyImageImporter.cpp +++ b/src/MagnumPlugins/AnyImageImporter/AnyImageImporter.cpp @@ -25,6 +25,7 @@ #include "AnyImageImporter.h" +#include #include #include #include diff --git a/src/MagnumPlugins/AnyImageImporter/Test/AnyImageImporterTest.cpp b/src/MagnumPlugins/AnyImageImporter/Test/AnyImageImporterTest.cpp index 40e615c5b..0480ceb35 100644 --- a/src/MagnumPlugins/AnyImageImporter/Test/AnyImageImporterTest.cpp +++ b/src/MagnumPlugins/AnyImageImporter/Test/AnyImageImporterTest.cpp @@ -24,6 +24,7 @@ */ #include +#include #include #include #include diff --git a/src/MagnumPlugins/AnySceneImporter/AnySceneImporter.cpp b/src/MagnumPlugins/AnySceneImporter/AnySceneImporter.cpp index 861c0045b..ee65d2dcd 100644 --- a/src/MagnumPlugins/AnySceneImporter/AnySceneImporter.cpp +++ b/src/MagnumPlugins/AnySceneImporter/AnySceneImporter.cpp @@ -25,9 +25,11 @@ #include "AnySceneImporter.h" +#include #include #include #include + #include "Magnum/Trade/AbstractMaterialData.h" #include "Magnum/Trade/AnimationData.h" #include "Magnum/Trade/CameraData.h" diff --git a/src/MagnumPlugins/AnySceneImporter/Test/AnySceneImporterTest.cpp b/src/MagnumPlugins/AnySceneImporter/Test/AnySceneImporterTest.cpp index 05b8e2d4e..0f8bd5b14 100644 --- a/src/MagnumPlugins/AnySceneImporter/Test/AnySceneImporterTest.cpp +++ b/src/MagnumPlugins/AnySceneImporter/Test/AnySceneImporterTest.cpp @@ -24,6 +24,7 @@ */ #include +#include #include #include diff --git a/src/MagnumPlugins/MagnumFont/MagnumFont.cpp b/src/MagnumPlugins/MagnumFont/MagnumFont.cpp index 5f959110c..46288b5e6 100644 --- a/src/MagnumPlugins/MagnumFont/MagnumFont.cpp +++ b/src/MagnumPlugins/MagnumFont/MagnumFont.cpp @@ -27,6 +27,7 @@ #include #include +#include #include #include #include diff --git a/src/MagnumPlugins/ObjImporter/ObjImporter.cpp b/src/MagnumPlugins/ObjImporter/ObjImporter.cpp index 3ccbea8ae..750002412 100644 --- a/src/MagnumPlugins/ObjImporter/ObjImporter.cpp +++ b/src/MagnumPlugins/ObjImporter/ObjImporter.cpp @@ -30,6 +30,7 @@ #include #include #include +#include #include #include "Magnum/Mesh.h" diff --git a/src/MagnumPlugins/ObjImporter/Test/ObjImporterTest.cpp b/src/MagnumPlugins/ObjImporter/Test/ObjImporterTest.cpp index c3485bfb6..e54429c0c 100644 --- a/src/MagnumPlugins/ObjImporter/Test/ObjImporterTest.cpp +++ b/src/MagnumPlugins/ObjImporter/Test/ObjImporterTest.cpp @@ -24,6 +24,7 @@ */ #include +#include #include #include diff --git a/src/MagnumPlugins/TgaImageConverter/Test/TgaImageConverterTest.cpp b/src/MagnumPlugins/TgaImageConverter/Test/TgaImageConverterTest.cpp index ae72bc35a..511e73d84 100644 --- a/src/MagnumPlugins/TgaImageConverter/Test/TgaImageConverterTest.cpp +++ b/src/MagnumPlugins/TgaImageConverter/Test/TgaImageConverterTest.cpp @@ -26,6 +26,7 @@ #include #include #include +#include #include #include #include diff --git a/src/MagnumPlugins/TgaImporter/Test/TgaImporterTest.cpp b/src/MagnumPlugins/TgaImporter/Test/TgaImporterTest.cpp index 558ec32c6..cf37b9c18 100644 --- a/src/MagnumPlugins/TgaImporter/Test/TgaImporterTest.cpp +++ b/src/MagnumPlugins/TgaImporter/Test/TgaImporterTest.cpp @@ -25,6 +25,7 @@ #include #include +#include #include #include #include diff --git a/src/MagnumPlugins/TgaImporter/TgaImporter.cpp b/src/MagnumPlugins/TgaImporter/TgaImporter.cpp index 86abcd87a..e6c641258 100644 --- a/src/MagnumPlugins/TgaImporter/TgaImporter.cpp +++ b/src/MagnumPlugins/TgaImporter/TgaImporter.cpp @@ -28,8 +28,9 @@ #include #include #include -#include #include +#include +#include #include "Magnum/PixelFormat.h" #include "Magnum/Math/Swizzle.h"