diff --git a/src/Array.h b/src/Array.h index b1c6fb763..b2099a88a 100644 --- a/src/Array.h +++ b/src/Array.h @@ -24,7 +24,7 @@ DEALINGS IN THE SOFTWARE. */ -/** @file +/** @file /Array.h * @brief Class Magnum::Array, Magnum::Array1D, Magnum::Array2D, Magnum::Array3D */ diff --git a/src/Math/Geometry/Distance.h b/src/Math/Geometry/Distance.h index c6e20b57a..c5aa422a9 100644 --- a/src/Math/Geometry/Distance.h +++ b/src/Math/Geometry/Distance.h @@ -160,7 +160,13 @@ class Distance { template static T lineSegmentPointSquared(const Vector3& a, const Vector3& b, const Vector3& point); }; -template T Distance::lineSegmentPoint(const Vector2& a, const Vector2& b, const Vector2& point) { +/** @todoc Remove workaround when Doxygen is sane */ +#ifdef DOXYGEN_GENERATING_OUTPUT +template static +#else +template +#endif +T Distance::lineSegmentPoint(const Vector2& a, const Vector2& b, const Vector2& point) { const Vector2 pointMinusA = point - a; const Vector2 pointMinusB = point - b; const Vector2 bMinusA = b - a; @@ -180,7 +186,13 @@ template T Distance::lineSegmentPoint(const Vector2& a, const Vector return std::abs(Vector2::cross(bMinusA, -pointMinusA))/std::sqrt(bDistanceA); } -template T Distance::lineSegmentPointSquared(const Vector2& a, const Vector2& b, const Vector2& point) { +/** @todoc Remove workaround when Doxygen is sane */ +#ifdef DOXYGEN_GENERATING_OUTPUT +template static +#else +template +#endif +T Distance::lineSegmentPointSquared(const Vector2& a, const Vector2& b, const Vector2& point) { const Vector2 pointMinusA = point - a; const Vector2 pointMinusB = point - b; const Vector2 bMinusA = b - a; @@ -200,7 +212,13 @@ template T Distance::lineSegmentPointSquared(const Vector2& a, const return Math::pow<2>(Vector2::cross(bMinusA, -pointMinusA))/bDistanceA; } -template T Distance::lineSegmentPointSquared(const Vector3& a, const Vector3& b, const Vector3& point) { +/** @todoc Remove workaround when Doxygen is sane */ +#ifdef DOXYGEN_GENERATING_OUTPUT +template static +#else +template +#endif +T Distance::lineSegmentPointSquared(const Vector3& a, const Vector3& b, const Vector3& point) { const Vector3 pointMinusA = point - a; const Vector3 pointMinusB = point - b; const T pointDistanceA = pointMinusA.dot(); diff --git a/src/Math/RectangularMatrix.h b/src/Math/RectangularMatrix.h index ffa9b0224..1079ef9a9 100644 --- a/src/Math/RectangularMatrix.h +++ b/src/Math/RectangularMatrix.h @@ -180,7 +180,7 @@ template class RectangularMatrix { * @see row(), data() */ Vector& operator[](std::size_t col) { return _data[col]; } - constexpr const Vector& operator[](std::size_t col) const { return _data[col]; } /** @overload */ + constexpr const Vector& operator[](std::size_t col) const { return _data[col]; } /**< @overload */ /** * @brief %Matrix row