From ce075752e935c79b7b5a61c14ae66533e884351d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= <mosra@centrum.cz>
Date: Sat, 9 Jan 2016 14:18:56 +0100
Subject: [PATCH] MeshTools: removed unneeded enable_if.

---
 src/Magnum/MeshTools/Interleave.h | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/Magnum/MeshTools/Interleave.h b/src/Magnum/MeshTools/Interleave.h
index ff03bb6d2..825dfc436 100644
--- a/src/Magnum/MeshTools/Interleave.h
+++ b/src/Magnum/MeshTools/Interleave.h
@@ -133,11 +133,8 @@ would be 21 bytes, causing possible performance loss.
     will be `std::vector` or `std::array`.
 
 @see @ref interleaveInto()
-@todo remove `std::enable_if` when deprecated overloads are removed
 */
-/* enable_if to avoid clash with overloaded function below */
-template<class T, class ...U> typename std::enable_if<!std::is_same<T, Mesh>::value, Containers::Array<char>>::type
-    interleave(const T& first, const U&... next)
+template<class T, class ...U> Containers::Array<char> interleave(const T& first, const U&... next)
 {
     /* Compute buffer size and stride */
     const std::size_t attributeCount = Implementation::AttributeCount{}(first, next...);