Browse Source

MeshTools: removed deprecated combineIndexedArrays() overload.

Use the general one instead.
pull/107/head
Vladimír Vondruš 11 years ago
parent
commit
e09c2f7a87
  1. 14
      src/Magnum/MeshTools/CombineIndexedArrays.h

14
src/Magnum/MeshTools/CombineIndexedArrays.h

@ -37,10 +37,6 @@
#include "Magnum/Types.h" #include "Magnum/Types.h"
#include "Magnum/MeshTools/visibility.h" #include "Magnum/MeshTools/visibility.h"
#ifdef MAGNUM_BUILD_DEPRECATED
#include <Corrade/Utility/Macros.h>
#endif
namespace Magnum { namespace MeshTools { namespace Magnum { namespace MeshTools {
namespace Implementation { namespace Implementation {
@ -193,16 +189,6 @@ template<class ...T> std::vector<UnsignedInt> combineIndexedArrays(const std::pa
return combinedIndices; return combinedIndices;
} }
#ifdef MAGNUM_BUILD_DEPRECATED
/**
* @copybrief combineIndexedArrays()
* @deprecated Use @ref combineIndexedArrays() "combineIndexedArrays(const std::pair<const std::vector<UnsignedInt>&, std::vector<T>&>&...)" instead.
*/
template<class ...T> inline CORRADE_DEPRECATED("use combineIndexedArrays(const std::pair<const std::vector<UnsignedInt>&, std::vector<T>&>&...) instead") std::vector<UnsignedInt> combineIndexedArrays(const std::tuple<const std::vector<UnsignedInt>&, std::vector<T>&>&... indexedArrays) {
return combineIndexedArrays(std::make_pair(std::cref(std::get<0>(indexedArrays)), std::ref(std::get<1>(indexedArrays)))...);
}
#endif
}} }}
#endif #endif

Loading…
Cancel
Save