diff --git a/src/Magnum/CMakeLists.txt b/src/Magnum/CMakeLists.txt index 304705c65..43be45b68 100644 --- a/src/Magnum/CMakeLists.txt +++ b/src/Magnum/CMakeLists.txt @@ -131,8 +131,7 @@ set(Magnum_HEADERS if(BUILD_DEPRECATED) set(Magnum_HEADERS ${Magnum_HEADERS} DebugMarker.h - ImageFormat.h - Swizzle.h) + ImageFormat.h) endif() # Desktop-only headers and libraries diff --git a/src/Magnum/Swizzle.h b/src/Magnum/Swizzle.h deleted file mode 100644 index 74ba3ab3a..000000000 --- a/src/Magnum/Swizzle.h +++ /dev/null @@ -1,56 +0,0 @@ -#ifndef Magnum_Swizzle_h -#define Magnum_Swizzle_h -/* - This file is part of Magnum. - - Copyright © 2010, 2011, 2012, 2013, 2014 - 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. -*/ - -#ifdef MAGNUM_BUILD_DEPRECATED -/** @file - * @brief Function @ref Magnum::swizzle() - * @deprecated Use @ref Math/Swizzle.h instead. - */ -#endif - -#include "Magnum/Math/Swizzle.h" -#include "Magnum/Color.h" - -#ifdef MAGNUM_BUILD_DEPRECATED -namespace Magnum { - -/** -@copybrief Math::swizzle() -@deprecated Use @ref Magnum::Math::swizzle() "Math::swizzle()" instead. -*/ -#ifdef DOXYGEN_GENERATING_OUTPUT -template constexpr CORRADE_DEPRECATED("use Math::swizzle() instead") typename Math::Implementation::TypeForSize::Type swizzle(const T& vector); -#else -using Math::swizzle; -#endif - -} -#else -#error this header is available only on deprecated build -#endif - -#endif