From da43af403ea972ca8f63c76483aea20a50da8793 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= <mosra@centrum.cz>
Date: Sat, 25 May 2019 00:59:12 +0200
Subject: [PATCH] Math: minor cleanup and code simplification.

---
 src/Magnum/Math/FunctionsBatch.h            |  6 +++---
 src/Magnum/Math/Test/FunctionsBatchTest.cpp | 18 +++++++++---------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/Magnum/Math/FunctionsBatch.h b/src/Magnum/Math/FunctionsBatch.h
index d094ce968..45baab2e6 100644
--- a/src/Magnum/Math/FunctionsBatch.h
+++ b/src/Magnum/Math/FunctionsBatch.h
@@ -60,7 +60,7 @@ template<class T> inline T min(Corrade::Containers::ArrayView<const T> range) {
 
 /** @overload */
 template<class T> inline T min(std::initializer_list<T> list) {
-    return min(Corrade::Containers::ArrayView<const T>{list.begin(), list.size()});
+    return min(Corrade::Containers::arrayView(list.begin(), list.size()));
 }
 
 /** @overload */
@@ -84,7 +84,7 @@ template<class T> inline T max(Corrade::Containers::ArrayView<const T> range) {
 
 /** @overload */
 template<class T> inline T max(std::initializer_list<T> list) {
-    return max(Corrade::Containers::ArrayView<const T>{list.begin(), list.size()});
+    return max(Corrade::Containers::arrayView(list.begin(), list.size()));
 }
 
 /** @overload */
@@ -123,7 +123,7 @@ template<class T> inline std::pair<T, T> minmax(Corrade::Containers::ArrayView<c
 
 /** @overload */
 template<class T> inline std::pair<T, T> minmax(std::initializer_list<T> list) {
-    return minmax(Corrade::Containers::ArrayView<const T>{list.begin(), list.size()});
+    return minmax(Corrade::Containers::arrayView(list.begin(), list.size()));
 }
 
 /** @overload */
diff --git a/src/Magnum/Math/Test/FunctionsBatchTest.cpp b/src/Magnum/Math/Test/FunctionsBatchTest.cpp
index 944c19509..c86946c40 100644
--- a/src/Magnum/Math/Test/FunctionsBatchTest.cpp
+++ b/src/Magnum/Math/Test/FunctionsBatchTest.cpp
@@ -33,9 +33,9 @@ namespace Magnum { namespace Math { namespace Test { namespace {
 struct FunctionsBatchTest: Corrade::TestSuite::Tester {
     explicit FunctionsBatchTest();
 
-    void minList();
-    void maxList();
-    void minmaxList();
+    void min();
+    void max();
+    void minmax();
 };
 
 using namespace Literals;
@@ -44,12 +44,12 @@ typedef Math::Vector2<Float> Vector2;
 typedef Math::Vector3<Int> Vector3i;
 
 FunctionsBatchTest::FunctionsBatchTest() {
-    addTests({&FunctionsBatchTest::minList,
-              &FunctionsBatchTest::maxList,
-              &FunctionsBatchTest::minmaxList});
+    addTests({&FunctionsBatchTest::min,
+              &FunctionsBatchTest::max,
+              &FunctionsBatchTest::minmax});
 }
 
-void FunctionsBatchTest::minList() {
+void FunctionsBatchTest::min() {
     CORRADE_COMPARE(Math::min({5, -2, 9}), -2);
     CORRADE_COMPARE(Math::min({Vector3i(5, -3, 2),
                                Vector3i(-2, 14, 7),
@@ -64,7 +64,7 @@ void FunctionsBatchTest::minList() {
     CORRADE_COMPARE(Math::min({5.0_degf, 2.0_degf, 9.0_degf}), 2.0_degf);
 }
 
-void FunctionsBatchTest::maxList() {
+void FunctionsBatchTest::max() {
     CORRADE_COMPARE(Math::max({5, -2, 9}), 9);
     CORRADE_COMPARE(Math::max({Vector3i(5, -3, 2),
                                Vector3i(-2, 14, 7),
@@ -79,7 +79,7 @@ void FunctionsBatchTest::maxList() {
     CORRADE_COMPARE(Math::max({5.0_degf, 2.0_degf, 9.0_degf}), 9.0_degf);
 }
 
-void FunctionsBatchTest::minmaxList() {
+void FunctionsBatchTest::minmax() {
     const auto expected = std::make_pair(-3.0f, 2.0f);
     CORRADE_COMPARE(Math::minmax({-1.0f, 2.0f, -3.0f}), expected);
     CORRADE_COMPARE(Math::minmax({-1.0f, -3.0f, 2.0f}), expected);