Skip to content

Commit

Permalink
UGH, but different
Browse files Browse the repository at this point in the history
  • Loading branch information
mosra committed Aug 11, 2020
1 parent df06e11 commit 18bb263
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/Magnum/Trade/AbstractImporter.h
Original file line number Diff line number Diff line change
Expand Up @@ -134,10 +134,10 @@ MAGNUM_TRADE_EXPORT Debug& operator<<(Debug& debug, ImporterFlags value);
#if defined(MAGNUM_BUILD_DEPRECATED) && !defined(DOXYGEN_GENERATING_OUTPUT)
/* Could be a concrete type as only MaterialData need this, but that would
mean I'd need to include it here */
template<class T> struct MAGNUM_TRADE_EXPORT OptionalButAlsoPointer: Containers::Optional<T> {
template<class T> struct OptionalButAlsoPointer: Containers::Optional<T> {
/*implicit*/ OptionalButAlsoPointer() = default;
/*implicit*/ OptionalButAlsoPointer(Containers::Optional<T>&& optional): Containers::Optional<T>{std::move(optional)} {}
CORRADE_DEPRECATED("use Containers::Optional instead of Containers::Pointer for a MaterialData") /*implicit*/ operator Containers::Pointer<Trade::MaterialData>() &&;
MAGNUM_TRADE_EXPORT CORRADE_DEPRECATED("use Containers::Optional instead of Containers::Pointer for a MaterialData") /*implicit*/ operator Containers::Pointer<Trade::MaterialData>() &&;
};
#endif

Expand Down

0 comments on commit 18bb263

Please sign in to comment.