From d00e7c0a046c536a3bad8f78465afc467da8eecc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Tue, 9 Jan 2018 11:26:02 +0100 Subject: [PATCH] Provide backwards-compatibility alias for std::make_optional(). Marked as deprecated, of course. --- src/MagnumExternal/Optional/OptionalWrapper.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/MagnumExternal/Optional/OptionalWrapper.h b/src/MagnumExternal/Optional/OptionalWrapper.h index 39c5751fe..29969cb84 100644 --- a/src/MagnumExternal/Optional/OptionalWrapper.h +++ b/src/MagnumExternal/Optional/OptionalWrapper.h @@ -57,6 +57,10 @@ 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