Browse Source

GCC 4.5 compatibility: avoid multiple definition linker errors.

Vladimír Vondruš 12 years ago
parent
commit
f1456ef650
  1. 2
      src/Magnum/Platform/AbstractXApplication.h
  2. 2
      src/Magnum/Platform/GlutApplication.h
  3. 2
      src/Magnum/Platform/Implementation/EglContextHandler.h
  4. 2
      src/Magnum/Platform/Implementation/GlxContextHandler.h
  5. 2
      src/Magnum/Platform/Sdl2Application.h
  6. 2
      src/Magnum/SceneGraph/AbstractTransformation.h
  7. 4
      src/Magnum/SceneGraph/AbstractTranslation.h
  8. 4
      src/Magnum/Shaders/AbstractVector.h
  9. 2
      src/Magnum/Shapes/shapeImplementation.h

2
src/Magnum/Platform/AbstractXApplication.h

@ -341,7 +341,7 @@ class AbstractXApplication::InputEvent {
}; };
#ifdef CORRADE_GCC45_COMPATIBILITY #ifdef CORRADE_GCC45_COMPATIBILITY
AbstractXApplication::InputEvent::~InputEvent() = default; inline AbstractXApplication::InputEvent::~InputEvent() = default;
#endif #endif
CORRADE_ENUMSET_OPERATORS(AbstractXApplication::InputEvent::Modifiers) CORRADE_ENUMSET_OPERATORS(AbstractXApplication::InputEvent::Modifiers)

2
src/Magnum/Platform/GlutApplication.h

@ -435,7 +435,7 @@ class GlutApplication::InputEvent {
}; };
#ifdef CORRADE_GCC45_COMPATIBILITY #ifdef CORRADE_GCC45_COMPATIBILITY
GlutApplication::InputEvent::~InputEvent() = default; inline GlutApplication::InputEvent::~InputEvent() = default;
#endif #endif
/** /**

2
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 */ /* GCC 4.5 can't have this defaulted in class body */
EglContextHandler::EglContextHandler() = default; inline EglContextHandler::EglContextHandler() = default;
}}} }}}

2
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 */ /* GCC 4.5 can't have this defaulted in class body */
GlxContextHandler::GlxContextHandler() = default; inline GlxContextHandler::GlxContextHandler() = default;
}}} }}}

2
src/Magnum/Platform/Sdl2Application.h

@ -699,7 +699,7 @@ class Sdl2Application::InputEvent {
}; };
#ifdef CORRADE_GCC45_COMPATIBILITY #ifdef CORRADE_GCC45_COMPATIBILITY
Sdl2Application::InputEvent::~InputEvent() = default; inline Sdl2Application::InputEvent::~InputEvent() = default;
#endif #endif
/** /**

2
src/Magnum/SceneGraph/AbstractTransformation.h

@ -85,7 +85,7 @@ template<UnsignedInt dimensions, class T> class AbstractTransformation {
virtual void doResetTransformation() = 0; 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 @brief Transformation type

4
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; 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 #ifndef CORRADE_GCC46_COMPATIBILITY
/** /**

4
src/Magnum/Shaders/AbstractVector.h

@ -78,8 +78,8 @@ typedef AbstractVector<2> AbstractVector2D;
typedef AbstractVector<3> AbstractVector3D; typedef AbstractVector<3> AbstractVector3D;
/* GCC 4.5 doesn't like it defaulted in class body */ /* GCC 4.5 doesn't like it defaulted in class body */
template<UnsignedInt dimensions> AbstractVector<dimensions>::AbstractVector() = default; template<UnsignedInt dimensions> inline AbstractVector<dimensions>::AbstractVector() = default;
template<UnsignedInt dimensions> AbstractVector<dimensions>::~AbstractVector() = default; template<UnsignedInt dimensions> inline AbstractVector<dimensions>::~AbstractVector() = default;
}} }}

2
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;
}}} }}}

Loading…
Cancel
Save