Browse Source

GCC 4.5 compatibility: can't default protected member in class body.

Vladimír Vondruš 13 years ago
parent
commit
6459c9c8c0
  1. 4
      src/SceneGraph/AbstractTransformation.h
  2. 3
      src/SceneGraph/AbstractTranslationRotation2D.h
  3. 3
      src/SceneGraph/AbstractTranslationRotation3D.h
  4. 3
      src/SceneGraph/AbstractTranslationRotationScaling2D.h
  5. 3
      src/SceneGraph/AbstractTranslationRotationScaling3D.h

4
src/SceneGraph/AbstractTransformation.h

@ -143,7 +143,7 @@ template<UnsignedInt dimensions, class T> class MAGNUM_SCENEGRAPH_EXPORT Abstrac
}
protected:
~AbstractBasicTransformation() = default;
~AbstractBasicTransformation();
#ifdef DOXYGEN_GENERATING_OUTPUT
protected:
@ -154,6 +154,8 @@ template<UnsignedInt dimensions, class T> class MAGNUM_SCENEGRAPH_EXPORT Abstrac
virtual void doResetTransformation() = 0;
};
template<UnsignedInt dimensions, class T> AbstractBasicTransformation<dimensions, T>::~AbstractBasicTransformation() = default;
/** @brief Transformation type */
enum class TransformationType: UnsignedByte {
/** Global transformation, applied after all other transformations. */

3
src/SceneGraph/AbstractTranslationRotation2D.h

@ -74,7 +74,7 @@ template<class T> class AbstractBasicTranslationRotation2D: public AbstractBasic
#endif
protected:
~AbstractBasicTranslationRotation2D() = default;
~AbstractBasicTranslationRotation2D();
#ifdef DOXYGEN_GENERATING_OUTPUT
protected:
@ -89,6 +89,7 @@ template<class T> class AbstractBasicTranslationRotation2D: public AbstractBasic
};
template<class T> inline AbstractBasicTranslationRotation2D<T>::AbstractBasicTranslationRotation2D() = default;
template<class T> inline AbstractBasicTranslationRotation2D<T>::~AbstractBasicTranslationRotation2D() = default;
/**
@brief Base transformation for two-dimensional float scenes supporting translation and rotation

3
src/SceneGraph/AbstractTranslationRotation3D.h

@ -121,7 +121,7 @@ template<class T> class AbstractBasicTranslationRotation3D: public AbstractBasic
#endif
protected:
~AbstractBasicTranslationRotation3D() = default;
~AbstractBasicTranslationRotation3D();
#ifdef DOXYGEN_GENERATING_OUTPUT
protected:
@ -163,6 +163,7 @@ template<class T> class AbstractBasicTranslationRotation3D: public AbstractBasic
};
template<class T> inline AbstractBasicTranslationRotation3D<T>::AbstractBasicTranslationRotation3D() = default;
template<class T> inline AbstractBasicTranslationRotation3D<T>::~AbstractBasicTranslationRotation3D() = default;
/**
@brief Base transformation for three-dimensional float scenes supporting translation and rotation

3
src/SceneGraph/AbstractTranslationRotationScaling2D.h

@ -71,7 +71,7 @@ template<class T> class AbstractBasicTranslationRotationScaling2D: public Abstra
#endif
protected:
~AbstractBasicTranslationRotationScaling2D() = default;
~AbstractBasicTranslationRotationScaling2D();
#ifdef DOXYGEN_GENERATING_OUTPUT
protected:
@ -83,6 +83,7 @@ template<class T> class AbstractBasicTranslationRotationScaling2D: public Abstra
};
template<class T> inline AbstractBasicTranslationRotationScaling2D<T>::AbstractBasicTranslationRotationScaling2D() = default;
template<class T> inline AbstractBasicTranslationRotationScaling2D<T>::~AbstractBasicTranslationRotationScaling2D() = default;
/**
@brief Base transformation for two-dimensional float scenes supporting translation, rotation and scaling

3
src/SceneGraph/AbstractTranslationRotationScaling3D.h

@ -83,7 +83,7 @@ template<class T> class AbstractBasicTranslationRotationScaling3D: public Abstra
#endif
protected:
~AbstractBasicTranslationRotationScaling3D() = default;
~AbstractBasicTranslationRotationScaling3D();
#ifdef DOXYGEN_GENERATING_OUTPUT
protected:
@ -95,6 +95,7 @@ template<class T> class AbstractBasicTranslationRotationScaling3D: public Abstra
};
template<class T> inline AbstractBasicTranslationRotationScaling3D<T>::AbstractBasicTranslationRotationScaling3D() = default;
template<class T> inline AbstractBasicTranslationRotationScaling3D<T>::~AbstractBasicTranslationRotationScaling3D() = default;
/**
@brief Base transformation for three-dimensional float scenes supporting translation, rotation and scaling

Loading…
Cancel
Save