Browse Source

Fix linkage conflict warning/error on MinGW and MSVC.

pull/107/head
Vladimír Vondruš 11 years ago
parent
commit
7a43d85d9f
  1. 3
      src/Magnum/MeshView.h
  2. 3
      src/Magnum/Shaders/Flat.h

3
src/Magnum/MeshView.h

@ -164,7 +164,8 @@ class MAGNUM_EXPORT MeshView {
* available there. * available there.
* @see @ref setCount() * @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 #ifdef MAGNUM_BUILD_DEPRECATED
/** /**

3
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. * multiplied with texture if @ref Flag::Textured is set.
* @see @ref setTexture() * @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 * @brief Set texture

Loading…
Cancel
Save