From e09c2f7a87679ad4e8756eb3010cbd21df421c85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Mon, 25 May 2015 23:37:57 +0200 Subject: [PATCH] MeshTools: removed deprecated combineIndexedArrays() overload. Use the general one instead. --- src/Magnum/MeshTools/CombineIndexedArrays.h | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/src/Magnum/MeshTools/CombineIndexedArrays.h b/src/Magnum/MeshTools/CombineIndexedArrays.h index 558b19cdc..9c3e92346 100644 --- a/src/Magnum/MeshTools/CombineIndexedArrays.h +++ b/src/Magnum/MeshTools/CombineIndexedArrays.h @@ -37,10 +37,6 @@ #include "Magnum/Types.h" #include "Magnum/MeshTools/visibility.h" -#ifdef MAGNUM_BUILD_DEPRECATED -#include -#endif - namespace Magnum { namespace MeshTools { namespace Implementation { @@ -193,16 +189,6 @@ template std::vector combineIndexedArrays(const std::pa return combinedIndices; } -#ifdef MAGNUM_BUILD_DEPRECATED -/** - * @copybrief combineIndexedArrays() - * @deprecated Use @ref combineIndexedArrays() "combineIndexedArrays(const std::pair&, std::vector&>&...)" instead. - */ -template inline CORRADE_DEPRECATED("use combineIndexedArrays(const std::pair&, std::vector&>&...) instead") std::vector combineIndexedArrays(const std::tuple&, std::vector&>&... indexedArrays) { - return combineIndexedArrays(std::make_pair(std::cref(std::get<0>(indexedArrays)), std::ref(std::get<1>(indexedArrays)))...); -} -#endif - }} #endif