From f1456ef650d688cc8a3a94bb1e9a2e6f53d2357b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= <mosra@centrum.cz>
Date: Sun, 29 Jun 2014 22:50:32 +0200
Subject: [PATCH] GCC 4.5 compatibility: avoid multiple definition linker
 errors.

---
 src/Magnum/Platform/AbstractXApplication.h             | 2 +-
 src/Magnum/Platform/GlutApplication.h                  | 2 +-
 src/Magnum/Platform/Implementation/EglContextHandler.h | 2 +-
 src/Magnum/Platform/Implementation/GlxContextHandler.h | 2 +-
 src/Magnum/Platform/Sdl2Application.h                  | 2 +-
 src/Magnum/SceneGraph/AbstractTransformation.h         | 2 +-
 src/Magnum/SceneGraph/AbstractTranslation.h            | 4 ++--
 src/Magnum/Shaders/AbstractVector.h                    | 4 ++--
 src/Magnum/Shapes/shapeImplementation.h                | 2 +-
 9 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/Magnum/Platform/AbstractXApplication.h b/src/Magnum/Platform/AbstractXApplication.h
index 49397ca48..6ba9ea40e 100644
--- a/src/Magnum/Platform/AbstractXApplication.h
+++ b/src/Magnum/Platform/AbstractXApplication.h
@@ -341,7 +341,7 @@ class AbstractXApplication::InputEvent {
 };
 
 #ifdef CORRADE_GCC45_COMPATIBILITY
-AbstractXApplication::InputEvent::~InputEvent() = default;
+inline AbstractXApplication::InputEvent::~InputEvent() = default;
 #endif
 
 CORRADE_ENUMSET_OPERATORS(AbstractXApplication::InputEvent::Modifiers)
diff --git a/src/Magnum/Platform/GlutApplication.h b/src/Magnum/Platform/GlutApplication.h
index ae48b9655..2bf623392 100644
--- a/src/Magnum/Platform/GlutApplication.h
+++ b/src/Magnum/Platform/GlutApplication.h
@@ -435,7 +435,7 @@ class GlutApplication::InputEvent {
 };
 
 #ifdef CORRADE_GCC45_COMPATIBILITY
-GlutApplication::InputEvent::~InputEvent() = default;
+inline GlutApplication::InputEvent::~InputEvent() = default;
 #endif
 
 /**
diff --git a/src/Magnum/Platform/Implementation/EglContextHandler.h b/src/Magnum/Platform/Implementation/EglContextHandler.h
index 91751b637..8c9b7a551 100644
--- a/src/Magnum/Platform/Implementation/EglContextHandler.h
+++ b/src/Magnum/Platform/Implementation/EglContextHandler.h
@@ -79,7 +79,7 @@ class EglContextHandler: public AbstractContextHandler<AbstractXApplication::Con
 };
 
 /* GCC 4.5 can't have this defaulted in class body */
-EglContextHandler::EglContextHandler() = default;
+inline EglContextHandler::EglContextHandler() = default;
 
 }}}
 
diff --git a/src/Magnum/Platform/Implementation/GlxContextHandler.h b/src/Magnum/Platform/Implementation/GlxContextHandler.h
index 88606f3a8..7c3805ae1 100644
--- a/src/Magnum/Platform/Implementation/GlxContextHandler.h
+++ b/src/Magnum/Platform/Implementation/GlxContextHandler.h
@@ -70,7 +70,7 @@ class GlxContextHandler: public AbstractContextHandler<AbstractXApplication::Con
 };
 
 /* GCC 4.5 can't have this defaulted in class body */
-GlxContextHandler::GlxContextHandler() = default;
+inline GlxContextHandler::GlxContextHandler() = default;
 
 }}}
 
diff --git a/src/Magnum/Platform/Sdl2Application.h b/src/Magnum/Platform/Sdl2Application.h
index f3a07fcd4..8bf643a83 100644
--- a/src/Magnum/Platform/Sdl2Application.h
+++ b/src/Magnum/Platform/Sdl2Application.h
@@ -699,7 +699,7 @@ class Sdl2Application::InputEvent {
 };
 
 #ifdef CORRADE_GCC45_COMPATIBILITY
-Sdl2Application::InputEvent::~InputEvent() = default;
+inline Sdl2Application::InputEvent::~InputEvent() = default;
 #endif
 
 /**
diff --git a/src/Magnum/SceneGraph/AbstractTransformation.h b/src/Magnum/SceneGraph/AbstractTransformation.h
index 94abe4780..5ee23a9f7 100644
--- a/src/Magnum/SceneGraph/AbstractTransformation.h
+++ b/src/Magnum/SceneGraph/AbstractTransformation.h
@@ -85,7 +85,7 @@ template<UnsignedInt dimensions, class T> class AbstractTransformation {
         virtual void doResetTransformation() = 0;
 };
 
-template<UnsignedInt dimensions, class T> AbstractTransformation<dimensions, T>::~AbstractTransformation() = default;
+template<UnsignedInt dimensions, class T> inline AbstractTransformation<dimensions, T>::~AbstractTransformation() = default;
 
 /**
 @brief Transformation type
diff --git a/src/Magnum/SceneGraph/AbstractTranslation.h b/src/Magnum/SceneGraph/AbstractTranslation.h
index 293891501..8b327c918 100644
--- a/src/Magnum/SceneGraph/AbstractTranslation.h
+++ b/src/Magnum/SceneGraph/AbstractTranslation.h
@@ -82,9 +82,9 @@ class AbstractTranslation: public AbstractTransformation<dimensions, T> {
         virtual void doTranslate(const typename DimensionTraits<dimensions, TranslationType>::VectorType& vector, TransformationType type) = 0;
 };
 
-template<UnsignedInt dimensions, class T, class TranslationType> AbstractTranslation<dimensions, T, TranslationType>::AbstractTranslation() = default;
+template<UnsignedInt dimensions, class T, class TranslationType> inline AbstractTranslation<dimensions, T, TranslationType>::AbstractTranslation() = default;
 
-template<UnsignedInt dimensions, class T, class TranslationType> AbstractTranslation<dimensions, T, TranslationType>::~AbstractTranslation() = default;
+template<UnsignedInt dimensions, class T, class TranslationType> inline AbstractTranslation<dimensions, T, TranslationType>::~AbstractTranslation() = default;
 
 #ifndef CORRADE_GCC46_COMPATIBILITY
 /**
diff --git a/src/Magnum/Shaders/AbstractVector.h b/src/Magnum/Shaders/AbstractVector.h
index 1625e59d0..ec184d87b 100644
--- a/src/Magnum/Shaders/AbstractVector.h
+++ b/src/Magnum/Shaders/AbstractVector.h
@@ -78,8 +78,8 @@ typedef AbstractVector<2> AbstractVector2D;
 typedef AbstractVector<3> AbstractVector3D;
 
 /* GCC 4.5 doesn't like it defaulted in class body */
-template<UnsignedInt dimensions> AbstractVector<dimensions>::AbstractVector() = default;
-template<UnsignedInt dimensions> AbstractVector<dimensions>::~AbstractVector() = default;
+template<UnsignedInt dimensions> inline AbstractVector<dimensions>::AbstractVector() = default;
+template<UnsignedInt dimensions> inline AbstractVector<dimensions>::~AbstractVector() = default;
 
 }}
 
diff --git a/src/Magnum/Shapes/shapeImplementation.h b/src/Magnum/Shapes/shapeImplementation.h
index 62ca7bb8c..cbaf316d8 100644
--- a/src/Magnum/Shapes/shapeImplementation.h
+++ b/src/Magnum/Shapes/shapeImplementation.h
@@ -183,7 +183,7 @@ template<class T> struct Shape: AbstractShape<T::Dimensions> {
     }
 };
 
-template<class T> Shape<T>::Shape() = default;
+template<class T> inline Shape<T>::Shape() = default;
 
 }}}