Browse Source

Inlined inline functions.

pull/279/head
Vladimír Vondruš 14 years ago
parent
commit
624f4f8531
  1. 4
      src/BufferedImage.h
  2. 4
      src/Color.h
  3. 2
      src/ImageWrapper.h
  4. 2
      src/Math/Matrix.h
  5. 2
      src/Math/Matrix3.h
  6. 2
      src/Math/Matrix4.h
  7. 2
      src/Math/Point2D.h
  8. 2
      src/Math/Point3D.h
  9. 4
      src/Math/Vector.h
  10. 2
      src/Math/Vector2.h
  11. 2
      src/Math/Vector3.h
  12. 2
      src/Math/Vector4.h

4
src/BufferedImage.h

@ -47,7 +47,7 @@ template<size_t imageDimensions> class BufferedImage: public AbstractImage {
* Dimensions and buffer are empty, call setData() to fill the image
* with data.
*/
BufferedImage(Components components, ComponentType type): AbstractImage(components, type), _buffer(Buffer::Target::PixelPack) {}
inline BufferedImage(Components components, ComponentType type): AbstractImage(components, type), _buffer(Buffer::Target::PixelPack) {}
/** @brief %Image dimensions */
inline constexpr Math::Vector<Dimensions, GLsizei> dimensions() const { return _dimensions; }
@ -61,7 +61,7 @@ template<size_t imageDimensions> class BufferedImage: public AbstractImage {
*
* @see Buffer::bind(Target)
*/
void* data() {
inline void* data() {
_buffer.bind(Buffer::Target::PixelUnpack);
return nullptr;
}

4
src/Color.h

@ -406,12 +406,12 @@ template<class T> class Color4: public Math::Vector4<T> {
MAGNUM_VECTOR_SUBCLASS_OPERATOR_IMPLEMENTATION(Color4, 4)
/** @debugoperator{Magnum::Color3} */
template<class T> Corrade::Utility::Debug operator<<(Corrade::Utility::Debug debug, const Magnum::Color3<T>& value) {
template<class T> inline Corrade::Utility::Debug operator<<(Corrade::Utility::Debug debug, const Magnum::Color3<T>& value) {
return debug << static_cast<const Magnum::Math::Vector3<T>&>(value);
}
/** @debugoperator{Magnum::Color4} */
template<class T> Corrade::Utility::Debug operator<<(Corrade::Utility::Debug debug, const Magnum::Color4<T>& value) {
template<class T> inline Corrade::Utility::Debug operator<<(Corrade::Utility::Debug debug, const Magnum::Color4<T>& value) {
return debug << static_cast<const Magnum::Math::Vector4<T>&>(value);
}

2
src/ImageWrapper.h

@ -93,7 +93,7 @@ template<size_t imageDimensions> class ImageWrapper: public AbstractImage {
* passed in constructor. The data are not copied nor deleted on
* destruction.
*/
void setData(GLvoid* data) {
inline void setData(GLvoid* data) {
_data = reinterpret_cast<char*>(data);
}

2
src/Math/Matrix.h

@ -168,7 +168,7 @@ template<size_t size, class T, class U> inline typename std::enable_if<std::is_a
#endif
/** @debugoperator{Magnum::Math::Matrix} */
template<size_t size, class T> Corrade::Utility::Debug operator<<(Corrade::Utility::Debug debug, const Magnum::Math::Matrix<size, T>& value) {
template<size_t size, class T> inline Corrade::Utility::Debug operator<<(Corrade::Utility::Debug debug, const Magnum::Math::Matrix<size, T>& value) {
return debug << static_cast<const Magnum::Math::RectangularMatrix<size, size, T>&>(value);
}

2
src/Math/Matrix3.h

@ -149,7 +149,7 @@ template<class T> class Matrix3: public Matrix<3, T> {
};
/** @debugoperator{Magnum::Math::Matrix3} */
template<class T> Corrade::Utility::Debug operator<<(Corrade::Utility::Debug debug, const Magnum::Math::Matrix3<T>& value) {
template<class T> inline Corrade::Utility::Debug operator<<(Corrade::Utility::Debug debug, const Magnum::Math::Matrix3<T>& value) {
return debug << static_cast<const Magnum::Math::Matrix<3, T>&>(value);
}

2
src/Math/Matrix4.h

@ -249,7 +249,7 @@ template<class T> class Matrix4: public Matrix<4, T> {
};
/** @debugoperator{Magnum::Math::Matrix4} */
template<class T> Corrade::Utility::Debug operator<<(Corrade::Utility::Debug debug, const Magnum::Math::Matrix4<T>& value) {
template<class T> inline Corrade::Utility::Debug operator<<(Corrade::Utility::Debug debug, const Magnum::Math::Matrix4<T>& value) {
return debug << static_cast<const Magnum::Math::Matrix<4, T>&>(value);
}

2
src/Math/Point2D.h

@ -75,7 +75,7 @@ template<class T> class Point2D: public Vector3<T> {
MAGNUM_VECTOR_SUBCLASS_OPERATOR_IMPLEMENTATION(Point2D, 3)
/** @debugoperator{Magnum::Math::Point2D} */
template<class T> Corrade::Utility::Debug operator<<(Corrade::Utility::Debug debug, const Magnum::Math::Point2D<T>& value) {
template<class T> inline Corrade::Utility::Debug operator<<(Corrade::Utility::Debug debug, const Magnum::Math::Point2D<T>& value) {
return debug << static_cast<const Magnum::Math::Vector<3, T>&>(value);
}

2
src/Math/Point3D.h

@ -76,7 +76,7 @@ template<class T> class Point3D: public Vector4<T> {
MAGNUM_VECTOR_SUBCLASS_OPERATOR_IMPLEMENTATION(Point3D, 4)
/** @debugoperator{Magnum::Math::Point3D} */
template<class T> Corrade::Utility::Debug operator<<(Corrade::Utility::Debug debug, const Magnum::Math::Point3D<T>& value) {
template<class T> inline Corrade::Utility::Debug operator<<(Corrade::Utility::Debug debug, const Magnum::Math::Point3D<T>& value) {
return debug << static_cast<const Magnum::Math::Vector<4, T>&>(value);
}

4
src/Math/Vector.h

@ -106,7 +106,7 @@ template<size_t s, class T> class Vector: public RectangularMatrix<1, s, T> {
*
* @see operator*=(const Vector<size, T>&)
*/
Vector<size, T> operator*(const Vector<size, T>& other) const {
inline Vector<size, T> operator*(const Vector<size, T>& other) const {
return Vector<size, T>(*this)*=other;
}
@ -128,7 +128,7 @@ template<size_t s, class T> class Vector: public RectangularMatrix<1, s, T> {
*
* @see operator/=(const Vector<size, T>&)
*/
Vector<size, T> operator/(const Vector<size, T>& other) const {
inline Vector<size, T> operator/(const Vector<size, T>& other) const {
return Vector<size, T>(*this)/=other;
}

2
src/Math/Vector2.h

@ -95,7 +95,7 @@ template<class T> class Vector2: public Vector<2, T> {
MAGNUM_VECTOR_SUBCLASS_OPERATOR_IMPLEMENTATION(Vector2, 2)
/** @debugoperator{Magnum::Math::Vector2} */
template<class T> Corrade::Utility::Debug operator<<(Corrade::Utility::Debug debug, const Magnum::Math::Vector2<T>& value) {
template<class T> inline Corrade::Utility::Debug operator<<(Corrade::Utility::Debug debug, const Magnum::Math::Vector2<T>& value) {
return debug << static_cast<const Magnum::Math::Vector<2, T>&>(value);
}

2
src/Math/Vector3.h

@ -149,7 +149,7 @@ template<class T> class Vector3: public Vector<3, T> {
MAGNUM_VECTOR_SUBCLASS_OPERATOR_IMPLEMENTATION(Vector3, 3)
/** @debugoperator{Magnum::Math::Vector3} */
template<class T> Corrade::Utility::Debug operator<<(Corrade::Utility::Debug debug, const Magnum::Math::Vector3<T>& value) {
template<class T> inline Corrade::Utility::Debug operator<<(Corrade::Utility::Debug debug, const Magnum::Math::Vector3<T>& value) {
return debug << static_cast<const Magnum::Math::Vector<3, T>&>(value);
}

2
src/Math/Vector4.h

@ -92,7 +92,7 @@ template<class T> class Vector4: public Vector<4, T> {
MAGNUM_VECTOR_SUBCLASS_OPERATOR_IMPLEMENTATION(Vector4, 4)
/** @debugoperator{Magnum::Math::Vector4} */
template<class T> Corrade::Utility::Debug operator<<(Corrade::Utility::Debug debug, const Magnum::Math::Vector4<T>& value) {
template<class T> inline Corrade::Utility::Debug operator<<(Corrade::Utility::Debug debug, const Magnum::Math::Vector4<T>& value) {
return debug << static_cast<const Magnum::Math::Vector<4, T>&>(value);
}

Loading…
Cancel
Save