From 8578c179e10007f6814f4a776d5ba89b5a9babeb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= <mosra@centrum.cz>
Date: Sun, 23 Apr 2023 21:34:50 +0200
Subject: [PATCH] SceneTools: don't bother saving compile times in a deprecated
 header.

Just extra cruft to maintain.
---
 .../SceneTools/FlattenMeshHierarchy.cpp       | 16 ----------
 src/Magnum/SceneTools/FlattenMeshHierarchy.h  | 32 +++----------------
 2 files changed, 5 insertions(+), 43 deletions(-)

diff --git a/src/Magnum/SceneTools/FlattenMeshHierarchy.cpp b/src/Magnum/SceneTools/FlattenMeshHierarchy.cpp
index 27df093f6..25526dcc6 100644
--- a/src/Magnum/SceneTools/FlattenMeshHierarchy.cpp
+++ b/src/Magnum/SceneTools/FlattenMeshHierarchy.cpp
@@ -97,32 +97,16 @@ Containers::Array<Containers::Triple<UnsignedInt, Int, Matrix3>> flattenMeshHier
     return flattenMeshHierarchyImplementation<2>(scene, globalTransformation);
 }
 
-Containers::Array<Containers::Triple<UnsignedInt, Int, Matrix3>> flattenMeshHierarchy2D(const Trade::SceneData& scene) {
-    return flattenMeshHierarchyImplementation<2>(scene, {});
-}
-
 void flattenMeshHierarchy2DInto(const Trade::SceneData& scene, const Containers::StridedArrayView1D<Matrix3>& transformations, const Matrix3& globalTransformation) {
     return flattenMeshHierarchyIntoImplementation<2>(scene, transformations, globalTransformation);
 }
 
-void flattenMeshHierarchy2DInto(const Trade::SceneData& scene, const Containers::StridedArrayView1D<Matrix3>& transformations) {
-    return flattenMeshHierarchyIntoImplementation<2>(scene, transformations, {});
-}
-
 Containers::Array<Containers::Triple<UnsignedInt, Int, Matrix4>> flattenMeshHierarchy3D(const Trade::SceneData& scene, const Matrix4& globalTransformation) {
     return flattenMeshHierarchyImplementation<3>(scene, globalTransformation);
 }
 
-Containers::Array<Containers::Triple<UnsignedInt, Int, Matrix4>> flattenMeshHierarchy3D(const Trade::SceneData& scene) {
-    return flattenMeshHierarchyImplementation<3>(scene, {});
-}
-
 void flattenMeshHierarchy3DInto(const Trade::SceneData& scene, const Containers::StridedArrayView1D<Matrix4>& transformations, const Matrix4& globalTransformation) {
     return flattenMeshHierarchyIntoImplementation<3>(scene, transformations, globalTransformation);
 }
 
-void flattenMeshHierarchy3DInto(const Trade::SceneData& scene, const Containers::StridedArrayView1D<Matrix4>& transformations) {
-    return flattenMeshHierarchyIntoImplementation<3>(scene, transformations, {});
-}
-
 }}
diff --git a/src/Magnum/SceneTools/FlattenMeshHierarchy.h b/src/Magnum/SceneTools/FlattenMeshHierarchy.h
index d1bfe490c..03c7e9e40 100644
--- a/src/Magnum/SceneTools/FlattenMeshHierarchy.h
+++ b/src/Magnum/SceneTools/FlattenMeshHierarchy.h
@@ -41,6 +41,8 @@
 #include <Corrade/Utility/Macros.h>
 
 #include "Magnum/Magnum.h"
+#include "Magnum/Math/Matrix3.h"
+#include "Magnum/Math/Matrix4.h"
 #include "Magnum/SceneTools/visibility.h"
 #include "Magnum/Trade/Trade.h"
 
@@ -57,13 +59,7 @@ namespace Magnum { namespace SceneTools {
     with @ref Trade::SceneField::Mesh together with
     @ref Trade::SceneData::meshesMaterialsAsArray() instead.
 */
-#ifdef DOXYGEN_GENERATING_OUTPUT
-MAGNUM_SCENETOOLS_EXPORT Containers::Array<Containers::Triple<UnsignedInt, Int, Matrix3>> flattenMeshHierarchy2D(const Trade::SceneData& scene, const Matrix3& globalTransformation = {});
-#else
-/* To avoid including Matrix3 */
-CORRADE_DEPRECATED("use flattenTransformationHierarchy2D() instead") MAGNUM_SCENETOOLS_EXPORT Containers::Array<Containers::Triple<UnsignedInt, Int, Matrix3>> flattenMeshHierarchy2D(const Trade::SceneData& scene, const Matrix3& globalTransformation);
-CORRADE_DEPRECATED("use flattenTransformationHierarchy2D() instead") MAGNUM_SCENETOOLS_EXPORT Containers::Array<Containers::Triple<UnsignedInt, Int, Matrix3>> flattenMeshHierarchy2D(const Trade::SceneData& scene);
-#endif
+CORRADE_DEPRECATED("use flattenTransformationHierarchy2D() instead") MAGNUM_SCENETOOLS_EXPORT Containers::Array<Containers::Triple<UnsignedInt, Int, Matrix3>> flattenMeshHierarchy2D(const Trade::SceneData& scene, const Matrix3& globalTransformation = {});
 
 /**
 @brief Flatten a 2D mesh hierarchy into an existing array
@@ -74,13 +70,7 @@ CORRADE_DEPRECATED("use flattenTransformationHierarchy2D() instead") MAGNUM_SCEN
 @m_deprecated_since_latest Use @ref flattenTransformationHierarchy2DInto(const Trade::SceneData&, Trade::SceneField, const Containers::StridedArrayView1D<Matrix3>&, const Matrix3&)
     with @ref Trade::SceneField::Mesh instead.
 */
-#ifdef DOXYGEN_GENERATING_OUTPUT
-MAGNUM_SCENETOOLS_EXPORT void flattenMeshHierarchy2DInto(const Trade::SceneData& scene, const Containers::StridedArrayView1D<Matrix3>& transformations, const Matrix3& globalTransformation = {});
-#else
-/* To avoid including Matrix3 */
-CORRADE_DEPRECATED("use flattenTransformationHierarchy2DInto() instead") MAGNUM_SCENETOOLS_EXPORT void flattenMeshHierarchy2DInto(const Trade::SceneData& scene, const Containers::StridedArrayView1D<Matrix3>& transformations, const Matrix3& globalTransformation);
-CORRADE_DEPRECATED("use flattenTransformationHierarchy2DInto() instead") MAGNUM_SCENETOOLS_EXPORT void flattenMeshHierarchy2DInto(const Trade::SceneData& scene, const Containers::StridedArrayView1D<Matrix3>& transformations);
-#endif
+CORRADE_DEPRECATED("use flattenTransformationHierarchy2DInto() instead") MAGNUM_SCENETOOLS_EXPORT void flattenMeshHierarchy2DInto(const Trade::SceneData& scene, const Containers::StridedArrayView1D<Matrix3>& transformations, const Matrix3& globalTransformation = {});
 
 /**
 @brief Flatten a 3D mesh hierarchy
@@ -89,13 +79,7 @@ CORRADE_DEPRECATED("use flattenTransformationHierarchy2DInto() instead") MAGNUM_
     with @ref Trade::SceneField::Mesh together with
     @ref Trade::SceneData::meshesMaterialsAsArray() instead.
 */
-#ifdef DOXYGEN_GENERATING_OUTPUT
-MAGNUM_SCENETOOLS_EXPORT Containers::Array<Containers::Triple<UnsignedInt, Int, Matrix4>> flattenMeshHierarchy3D(const Trade::SceneData& scene, const Matrix4& globalTransformation = {});
-#else
-/* To avoid including Matrix4 */
-CORRADE_DEPRECATED("use flattenTransformationHierarchy3D() instead") MAGNUM_SCENETOOLS_EXPORT Containers::Array<Containers::Triple<UnsignedInt, Int, Matrix4>> flattenMeshHierarchy3D(const Trade::SceneData& scene, const Matrix4& globalTransformation);
-CORRADE_DEPRECATED("use flattenTransformationHierarchy3D() instead") MAGNUM_SCENETOOLS_EXPORT Containers::Array<Containers::Triple<UnsignedInt, Int, Matrix4>> flattenMeshHierarchy3D(const Trade::SceneData& scene);
-#endif
+CORRADE_DEPRECATED("use flattenTransformationHierarchy3D() instead") MAGNUM_SCENETOOLS_EXPORT Containers::Array<Containers::Triple<UnsignedInt, Int, Matrix4>> flattenMeshHierarchy3D(const Trade::SceneData& scene, const Matrix4& globalTransformation = {});
 
 /**
 @brief Flatten a 3D mesh hierarchy into an existing array
@@ -106,13 +90,7 @@ CORRADE_DEPRECATED("use flattenTransformationHierarchy3D() instead") MAGNUM_SCEN
 @m_deprecated_since_latest Use @ref flattenTransformationHierarchy3DInto(const Trade::SceneData&, Trade::SceneField, const Containers::StridedArrayView1D<Matrix4>&, const Matrix4&)
     with @ref Trade::SceneField::Mesh instead.
 */
-#ifdef DOXYGEN_GENERATING_OUTPUT
 CORRADE_DEPRECATED("use flattenTransformationHierarchy3DInto() instead") MAGNUM_SCENETOOLS_EXPORT void flattenMeshHierarchy3DInto(const Trade::SceneData& scene, const Containers::StridedArrayView1D<Matrix4>& transformations, const Matrix4& globalTransformation = {});
-#else
-/* To avoid including Matrix3 */
-CORRADE_DEPRECATED("use flattenTransformationHierarchy3DInto() instead") MAGNUM_SCENETOOLS_EXPORT void flattenMeshHierarchy3DInto(const Trade::SceneData& scene, const Containers::StridedArrayView1D<Matrix4>& transformations, const Matrix4& globalTransformation);
-CORRADE_DEPRECATED("use flattenTransformationHierarchy3DInto() instead") MAGNUM_SCENETOOLS_EXPORT void flattenMeshHierarchy3DInto(const Trade::SceneData& scene, const Containers::StridedArrayView1D<Matrix4>& transformations);
-#endif
 
 }}
 #else