Browse Source

Math: the world is not just about OpenGL.

pull/190/head
Vladimír Vondruš 10 years ago
parent
commit
32f357752f
  1. 3
      src/Magnum/Math/Bezier.h
  2. 1
      src/Magnum/Math/Range.h
  3. 3
      src/Magnum/Math/RectangularMatrix.h
  4. 4
      src/Magnum/Math/Vector.h

3
src/Magnum/Math/Bezier.h

@ -250,7 +250,7 @@ template<UnsignedInt order, UnsignedInt dimensions, class T> Corrade::Utility::D
return debug << ")";
}
/* Explicit instantiation for types used in OpenGL */
/* Explicit instantiation for commonly used types */
#ifndef DOXYGEN_GENERATING_OUTPUT
extern template MAGNUM_EXPORT Corrade::Utility::Debug& operator<<(Corrade::Utility::Debug&, const Bezier<2, 2, Float>&);
extern template MAGNUM_EXPORT Corrade::Utility::Debug& operator<<(Corrade::Utility::Debug&, const Bezier<2, 3, Float>&);
@ -305,6 +305,7 @@ template<Magnum::UnsignedInt order, Magnum::UnsignedInt dimensions, class T> str
}
};
/* Explicit instantiation for commonly used types */
#if !defined(DOXYGEN_GENERATING_OUTPUT) && !defined(__MINGW32__)
extern template struct MAGNUM_EXPORT ConfigurationValue<Magnum::Math::Bezier<2, 2, Magnum::Float>>;
extern template struct MAGNUM_EXPORT ConfigurationValue<Magnum::Math::Bezier<2, 3, Magnum::Float>>;

1
src/Magnum/Math/Range.h

@ -594,6 +594,7 @@ template<class T> struct ConfigurationValue<Magnum::Math::Range2D<T>>: public Co
/** @configurationvalue{Magnum::Math::Range3D} */
template<class T> struct ConfigurationValue<Magnum::Math::Range3D<T>>: public ConfigurationValue<Magnum::Math::Range<3, T>> {};
/* Explicit instantiation for commonly used types */
#if !defined(DOXYGEN_GENERATING_OUTPUT) && !defined(__MINGW32__)
extern template struct MAGNUM_EXPORT ConfigurationValue<Magnum::Math::Range<2, Magnum::Float>>;
extern template struct MAGNUM_EXPORT ConfigurationValue<Magnum::Math::Range<2, Magnum::Int>>;

3
src/Magnum/Math/RectangularMatrix.h

@ -556,8 +556,8 @@ template<std::size_t cols, std::size_t rows, class T> Corrade::Utility::Debug& o
return debug << Corrade::Utility::Debug::nospace << ")";
}
/* Explicit instantiation for commonly used types */
#ifndef DOXYGEN_GENERATING_OUTPUT
/* Explicit instantiation for types used in OpenGL */
/* Square matrices */
extern template MAGNUM_EXPORT Corrade::Utility::Debug& operator<<(Corrade::Utility::Debug&, const RectangularMatrix<2, 2, Float>&);
extern template MAGNUM_EXPORT Corrade::Utility::Debug& operator<<(Corrade::Utility::Debug&, const RectangularMatrix<3, 3, Float>&);
@ -758,6 +758,7 @@ template<std::size_t cols, std::size_t rows, class T> struct ConfigurationValue<
}
};
/* Explicit instantiation for commonly used types */
#if !defined(DOXYGEN_GENERATING_OUTPUT) && !defined(__MINGW32__)
/* Square matrices */
extern template struct MAGNUM_EXPORT ConfigurationValue<Magnum::Math::RectangularMatrix<2, 2, Magnum::Float>>;

4
src/Magnum/Math/Vector.h

@ -1088,7 +1088,7 @@ template<std::size_t size, class T> Corrade::Utility::Debug& operator<<(Corrade:
return debug << Corrade::Utility::Debug::nospace << ")";
}
/* Explicit instantiation for types used in OpenGL */
/* Explicit instantiation for commonly used types */
#ifndef DOXYGEN_GENERATING_OUTPUT
extern template MAGNUM_EXPORT Corrade::Utility::Debug& operator<<(Corrade::Utility::Debug&, const Vector<2, Float>&);
extern template MAGNUM_EXPORT Corrade::Utility::Debug& operator<<(Corrade::Utility::Debug&, const Vector<3, Float>&);
@ -1403,8 +1403,8 @@ template<std::size_t size, class T> struct ConfigurationValue<Magnum::Math::Vect
}
};
/* Explicit instantiation for commonly used types */
#if !defined(DOXYGEN_GENERATING_OUTPUT) && !defined(__MINGW32__)
/* Vectors */
extern template struct MAGNUM_EXPORT ConfigurationValue<Magnum::Math::Vector<2, Magnum::Float>>;
extern template struct MAGNUM_EXPORT ConfigurationValue<Magnum::Math::Vector<3, Magnum::Float>>;
extern template struct MAGNUM_EXPORT ConfigurationValue<Magnum::Math::Vector<4, Magnum::Float>>;

Loading…
Cancel
Save