From 2713d0f725006e68e648be2cf5560bf7a364afb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sun, 2 Feb 2014 10:14:59 +0100 Subject: [PATCH] Doc++ --- src/Magnum/Audio/Source.h | 8 ++++---- src/Magnum/MeshTools/CombineIndexedArrays.h | 2 +- src/Magnum/MeshTools/RemoveDuplicates.h | 4 ++++ 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/Magnum/Audio/Source.h b/src/Magnum/Audio/Source.h index 33fe1d3e7..e80a63bb8 100644 --- a/src/Magnum/Audio/Source.h +++ b/src/Magnum/Audio/Source.h @@ -389,7 +389,7 @@ class MAGNUM_AUDIO_EXPORT Source { #ifdef MAGNUM_BUILD_DEPRECATED /** * @copybrief play(const std::vector>&) - * @deprecated Use @ref Magnum::Audio::Source::play(const std::>&) "play(const std::vector>&)" instead. + * @deprecated Use @ref Magnum::Audio::Source::play(const std::vector>&) "play(const std::vector>&)" instead. */ static CORRADE_DEPRECATED("use play(const std::vector>&) instead") void play(const std::vector& sources); #endif @@ -410,7 +410,7 @@ class MAGNUM_AUDIO_EXPORT Source { #ifdef MAGNUM_BUILD_DEPRECATED /** * @copybrief pause(const std::vector>&) - * @deprecated Use @ref Magnum::Audio::Source::pause(const std::>&) "pause(const std::vector>&)" instead. + * @deprecated Use @ref Magnum::Audio::Source::pause(const std::vector>&) "pause(const std::vector>&)" instead. */ static CORRADE_DEPRECATED("use pause(const std::vector>&) instead") void pause(const std::vector& sources); #endif @@ -431,7 +431,7 @@ class MAGNUM_AUDIO_EXPORT Source { #ifdef MAGNUM_BUILD_DEPRECATED /** * @copybrief stop(const std::vector>&) - * @deprecated Use @ref Magnum::Audio::Source::stop(const std::>&) "stop(const std::vector>&)" instead. + * @deprecated Use @ref Magnum::Audio::Source::stop(const std::vector>&) "stop(const std::vector>&)" instead. */ static CORRADE_DEPRECATED("use stop(const std::vector>&) instead") void stop(const std::vector& sources); #endif @@ -458,7 +458,7 @@ class MAGNUM_AUDIO_EXPORT Source { /** * @copybrief rewind(const std::vector>&) - * @deprecated Use @ref Magnum::Audio::Source::rewind(const std::>&) "rewind(const std::vector>&)" instead. + * @deprecated Use @ref Magnum::Audio::Source::rewind(const std::vector>&) "rewind(const std::vector>&)" instead. */ static CORRADE_DEPRECATED("use rewind(const std::vector>&) instead") void rewind(const std::vector& sources); #endif diff --git a/src/Magnum/MeshTools/CombineIndexedArrays.h b/src/Magnum/MeshTools/CombineIndexedArrays.h index 8c5ae946f..c52b72199 100644 --- a/src/Magnum/MeshTools/CombineIndexedArrays.h +++ b/src/Magnum/MeshTools/CombineIndexedArrays.h @@ -77,7 +77,7 @@ which can be then indexed with the combined index array: Again, first triangle in the mesh will have positions `a c f` and normals `B D E`. -This function calls @ref combineIndexArrays(std::vector&, UnsignedInt) +This function calls @ref combineIndexArrays(const std::vector&, UnsignedInt) internally. See also @ref combineIndexedArrays() which does the vertex data reordering automatically. */ diff --git a/src/Magnum/MeshTools/RemoveDuplicates.h b/src/Magnum/MeshTools/RemoveDuplicates.h index b2c58a807..6b5b40715 100644 --- a/src/Magnum/MeshTools/RemoveDuplicates.h +++ b/src/Magnum/MeshTools/RemoveDuplicates.h @@ -168,6 +168,10 @@ template std::vector removeDuplicates(std::vector&, typename Vector::Type) +@deprecated Use @ref Magnum::MeshTools::removeDuplicates(std::vector&, typename Vector::Type) "removeDuplicates(std::vector&, typename Vector::Type)" instead. +*/ template void removeDuplicates(std::vector& indices, std::vector& data, typename Vector::Type epsilon = Math::TypeTraits::epsilon()) { std::vector uniqueIndices; std::tie(uniqueIndices, data) = removeDuplicates(data);