From 7a43d85d9f5c68bc4f25c7b36437e9e08f26136e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= <mosra@centrum.cz>
Date: Wed, 29 Apr 2015 20:26:42 +0200
Subject: [PATCH] Fix linkage conflict warning/error on MinGW and MSVC.

---
 src/Magnum/MeshView.h     | 3 ++-
 src/Magnum/Shaders/Flat.h | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/Magnum/MeshView.h b/src/Magnum/MeshView.h
index 45b8631e6..dbe57a574 100644
--- a/src/Magnum/MeshView.h
+++ b/src/Magnum/MeshView.h
@@ -164,7 +164,8 @@ class MAGNUM_EXPORT MeshView {
          * available there.
          * @see @ref setCount()
          */
-        MeshView& setIndexRange(Int first, UnsignedInt start, UnsignedInt end);
+        /* MinGW/MSVC needs inline also here to avoid linkage conflicts */
+        inline MeshView& setIndexRange(Int first, UnsignedInt start, UnsignedInt end);
 
         #ifdef MAGNUM_BUILD_DEPRECATED
         /**
diff --git a/src/Magnum/Shaders/Flat.h b/src/Magnum/Shaders/Flat.h
index 3be81b3eb..7173794bc 100644
--- a/src/Magnum/Shaders/Flat.h
+++ b/src/Magnum/Shaders/Flat.h
@@ -200,7 +200,8 @@ template<UnsignedInt dimensions> class MAGNUM_SHADERS_EXPORT Flat: public Abstra
          * multiplied with texture if @ref Flag::Textured is set.
          * @see @ref setTexture()
          */
-        Flat<dimensions>& setColor(const Color4& color);
+        /* MSVC needs inline also here to avoid linkage conflicts */
+        inline Flat<dimensions>& setColor(const Color4& color);
 
         /**
          * @brief Set texture