From 5c5ecb5ff8f9b99925e2f4deacf5f273b9854ede Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= <mosra@centrum.cz>
Date: Wed, 12 Dec 2018 01:00:18 +0100
Subject: [PATCH] Math: removed deprecated (and confusing) normalize() /
 denormalize().

Deprecated since dd2058cee3f114637ed3ee89fb683e2deda4d8db (December
2016), use more clearly named Math::pack() and unpack() instead.
---
 doc/changelog.dox           |  3 +++
 src/Magnum/Math/Functions.h |  7 -------
 src/Magnum/Math/Packing.h   | 18 ------------------
 3 files changed, 3 insertions(+), 25 deletions(-)

diff --git a/doc/changelog.dox b/doc/changelog.dox
index e07168335..f27ae8510 100644
--- a/doc/changelog.dox
+++ b/doc/changelog.dox
@@ -173,6 +173,9 @@ See also:
 -   Removed availability of @ref Math::Color3 and @ref Math::Color4 literals in
     the root namespace, deprecated since April 2016. Explicitly call
     @cpp using namespace Math::Literals; @ce instead.
+-   Removed @cpp Math::normalize() @ce and @cpp Math::denormalize() @ce
+    functions, deprecated since December 2016. Use @ref Math::pack() and
+    @ref Math::unpack() instead.
 
 @section changelog-2018-10 2018.10
 
diff --git a/src/Magnum/Math/Functions.h b/src/Magnum/Math/Functions.h
index 5a8e1ac49..da3ed7b97 100644
--- a/src/Magnum/Math/Functions.h
+++ b/src/Magnum/Math/Functions.h
@@ -712,11 +712,4 @@ template<std::size_t size, class T> inline Vector<size, T> fma(const Vector<size
 
 }}
 
-#ifdef MAGNUM_BUILD_DEPRECATED
-/* In order to make the deprecated normalize() / denormalize() functions
-   available in the original header. The Packing.h header depends on this file
-   so it needs to be included after it. */
-#include "Magnum/Math/Packing.h"
-#endif
-
 #endif
diff --git a/src/Magnum/Math/Packing.h b/src/Magnum/Math/Packing.h
index 7bb1f9811..27a9b660e 100644
--- a/src/Magnum/Math/Packing.h
+++ b/src/Magnum/Math/Packing.h
@@ -121,15 +121,6 @@ template<class FloatingPoint, UnsignedInt bits, std::size_t size, class Integral
 }
 #endif
 
-#ifdef MAGNUM_BUILD_DEPRECATED
-/** @brief @copybrief unpack()
- * @deprecated Use @ref unpack() instead.
- */
-template<class FloatingPoint, class Integral> CORRADE_DEPRECATED("use unpack() instead") inline FloatingPoint normalize(const Integral& value) {
-    return unpack<FloatingPoint, Integral>(value);
-}
-#endif
-
 /**
 @brief Pack floating-point value into an integer representation
 
@@ -189,15 +180,6 @@ template<class Integral, UnsignedInt bits, std::size_t size, class FloatingPoint
 }
 #endif
 
-#ifdef MAGNUM_BUILD_DEPRECATED
-/** @brief @copybrief pack()
- * @deprecated Use @ref pack() instead.
- */
-template<class Integral, class FloatingPoint> CORRADE_DEPRECATED("use pack() instead") inline Integral denormalize(const FloatingPoint& value) {
-    return pack<Integral, FloatingPoint>(value);
-}
-#endif
-
 /**
 @brief Pack 32-bit float value into 16-bit half-float representation