From ba88567710dae6a16fdcc0c3527ca442fdec0c94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= <mosra@centrum.cz>
Date: Sun, 11 Jan 2015 16:06:31 +0100
Subject: [PATCH] Remove redundant `inline` keyword.

---
 src/Magnum/Color.h                  |  4 ++--
 src/Magnum/Math/RectangularMatrix.h | 10 +++++-----
 src/Magnum/MeshTools/Interleave.h   |  2 +-
 src/Magnum/MultisampleTexture.h     |  4 ++--
 src/Magnum/Texture.h                |  6 +++---
 src/Magnum/TextureArray.h           |  4 ++--
 6 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/Magnum/Color.h b/src/Magnum/Color.h
index baeb4b3a5..bce8afa46 100644
--- a/src/Magnum/Color.h
+++ b/src/Magnum/Color.h
@@ -125,10 +125,10 @@ template<class T> inline typename BasicColor3<T>::HSV toHSV(typename std::enable
 }
 
 /* Value for full channel (1.0f for floats, 255 for unsigned byte) */
-template<class T> inline constexpr typename std::enable_if<std::is_floating_point<T>::value, T>::type fullChannel() {
+template<class T> constexpr typename std::enable_if<std::is_floating_point<T>::value, T>::type fullChannel() {
     return T(1);
 }
-template<class T> inline constexpr typename std::enable_if<std::is_integral<T>::value, T>::type fullChannel() {
+template<class T> constexpr typename std::enable_if<std::is_integral<T>::value, T>::type fullChannel() {
     return std::numeric_limits<T>::max();
 }
 
diff --git a/src/Magnum/Math/RectangularMatrix.h b/src/Magnum/Math/RectangularMatrix.h
index d1d4af656..87547b23a 100644
--- a/src/Magnum/Math/RectangularMatrix.h
+++ b/src/Magnum/Math/RectangularMatrix.h
@@ -583,15 +583,15 @@ extern template Corrade::Utility::Debug MAGNUM_EXPORT operator<<(Corrade::Utilit
 #endif
 
 namespace Implementation {
-    template<std::size_t rows, std::size_t i, class T, std::size_t ...sequence> inline constexpr Vector<rows, T> diagonalMatrixColumn2(Implementation::Sequence<sequence...>, const T& number) {
+    template<std::size_t rows, std::size_t i, class T, std::size_t ...sequence> constexpr Vector<rows, T> diagonalMatrixColumn2(Implementation::Sequence<sequence...>, const T& number) {
         return {(sequence == i ? number : T(0))...};
     }
-    template<std::size_t rows, std::size_t i, class T> inline constexpr Vector<rows, T> diagonalMatrixColumn(const T& number) {
+    template<std::size_t rows, std::size_t i, class T> constexpr Vector<rows, T> diagonalMatrixColumn(const T& number) {
         return diagonalMatrixColumn2<rows, i, T>(typename Implementation::GenerateSequence<rows>::Type(), number);
     }
 }
 
-template<std::size_t cols, std::size_t rows, class T> template<std::size_t ...sequence> inline constexpr RectangularMatrix<cols, rows, T>::RectangularMatrix(Implementation::Sequence<sequence...>, const Vector<DiagonalSize, T>& diagonal): _data{Implementation::diagonalMatrixColumn<rows, sequence>(sequence < DiagonalSize ? diagonal[sequence] : T{})...} {}
+template<std::size_t cols, std::size_t rows, class T> template<std::size_t ...sequence> constexpr RectangularMatrix<cols, rows, T>::RectangularMatrix(Implementation::Sequence<sequence...>, const Vector<DiagonalSize, T>& diagonal): _data{Implementation::diagonalMatrixColumn<rows, sequence>(sequence < DiagonalSize ? diagonal[sequence] : T{})...} {}
 
 template<std::size_t cols, std::size_t rows, class T> inline Vector<cols, T> RectangularMatrix<cols, rows, T>::row(std::size_t row) const {
     Vector<cols, T> out;
@@ -632,10 +632,10 @@ template<std::size_t cols, std::size_t rows, class T> inline RectangularMatrix<r
     return out;
 }
 
-template<std::size_t cols, std::size_t rows, class T> inline constexpr auto RectangularMatrix<cols, rows, T>::diagonal() const -> Vector<DiagonalSize, T> { return diagonalInternal(typename Implementation::GenerateSequence<DiagonalSize>::Type()); }
+template<std::size_t cols, std::size_t rows, class T> constexpr auto RectangularMatrix<cols, rows, T>::diagonal() const -> Vector<DiagonalSize, T> { return diagonalInternal(typename Implementation::GenerateSequence<DiagonalSize>::Type()); }
 
 #ifndef DOXYGEN_GENERATING_OUTPUT
-template<std::size_t cols, std::size_t rows, class T> template<std::size_t ...sequence> inline constexpr auto RectangularMatrix<cols, rows, T>::diagonalInternal(Implementation::Sequence<sequence...>) const -> Vector<DiagonalSize, T> {
+template<std::size_t cols, std::size_t rows, class T> template<std::size_t ...sequence> constexpr auto RectangularMatrix<cols, rows, T>::diagonalInternal(Implementation::Sequence<sequence...>) const -> Vector<DiagonalSize, T> {
     return {(*this)[sequence][sequence]...};
 }
 #endif
diff --git a/src/Magnum/MeshTools/Interleave.h b/src/Magnum/MeshTools/Interleave.h
index 6e1761cf3..e8b2a7af2 100644
--- a/src/Magnum/MeshTools/Interleave.h
+++ b/src/Magnum/MeshTools/Interleave.h
@@ -84,7 +84,7 @@ template<class T> typename std::enable_if<!std::is_convertible<T, std::size_t>::
 }
 
 /* Skip gap */
-inline constexpr std::size_t writeOneInterleaved(std::size_t, char*, std::size_t gap) { return gap; }
+constexpr std::size_t writeOneInterleaved(std::size_t, char*, std::size_t gap) { return gap; }
 
 /* Write interleaved data */
 inline void writeInterleaved(std::size_t, char*) {}
diff --git a/src/Magnum/MultisampleTexture.h b/src/Magnum/MultisampleTexture.h
index 734ab908c..7ad07eda7 100644
--- a/src/Magnum/MultisampleTexture.h
+++ b/src/Magnum/MultisampleTexture.h
@@ -40,9 +40,9 @@ namespace Magnum {
 
 namespace Implementation {
     template<UnsignedInt> constexpr GLenum multisampleTextureTarget();
-    template<> inline constexpr GLenum multisampleTextureTarget<2>() { return GL_TEXTURE_2D_MULTISAMPLE; }
+    template<> constexpr GLenum multisampleTextureTarget<2>() { return GL_TEXTURE_2D_MULTISAMPLE; }
     #ifndef MAGNUM_TARGET_GLES
-    template<> inline constexpr GLenum multisampleTextureTarget<3>() { return GL_TEXTURE_2D_MULTISAMPLE_ARRAY; }
+    template<> constexpr GLenum multisampleTextureTarget<3>() { return GL_TEXTURE_2D_MULTISAMPLE_ARRAY; }
     #endif
 
     template<UnsignedInt dimensions> VectorTypeFor<dimensions, Int> maxMultisampleTextureSize();
diff --git a/src/Magnum/Texture.h b/src/Magnum/Texture.h
index fbaa36cae..7869c0627 100644
--- a/src/Magnum/Texture.h
+++ b/src/Magnum/Texture.h
@@ -41,10 +41,10 @@ namespace Magnum {
 namespace Implementation {
     template<UnsignedInt> constexpr GLenum textureTarget();
     #ifndef MAGNUM_TARGET_GLES
-    template<> inline constexpr GLenum textureTarget<1>() { return GL_TEXTURE_1D; }
+    template<> constexpr GLenum textureTarget<1>() { return GL_TEXTURE_1D; }
     #endif
-    template<> inline constexpr GLenum textureTarget<2>() { return GL_TEXTURE_2D; }
-    template<> inline constexpr GLenum textureTarget<3>() {
+    template<> constexpr GLenum textureTarget<2>() { return GL_TEXTURE_2D; }
+    template<> constexpr GLenum textureTarget<3>() {
         #ifndef MAGNUM_TARGET_GLES2
         return GL_TEXTURE_3D;
         #else
diff --git a/src/Magnum/TextureArray.h b/src/Magnum/TextureArray.h
index 1b3ccdc2f..d173290f9 100644
--- a/src/Magnum/TextureArray.h
+++ b/src/Magnum/TextureArray.h
@@ -42,9 +42,9 @@ namespace Magnum {
 namespace Implementation {
     template<UnsignedInt> constexpr GLenum textureArrayTarget();
     #ifndef MAGNUM_TARGET_GLES
-    template<> inline constexpr GLenum textureArrayTarget<1>() { return GL_TEXTURE_1D_ARRAY; }
+    template<> constexpr GLenum textureArrayTarget<1>() { return GL_TEXTURE_1D_ARRAY; }
     #endif
-    template<> inline constexpr GLenum textureArrayTarget<2>() { return GL_TEXTURE_2D_ARRAY; }
+    template<> constexpr GLenum textureArrayTarget<2>() { return GL_TEXTURE_2D_ARRAY; }
 }
 
 /**