Add multiplication operators between Matrix and float

Newer gcc versions are complaining about an ambiguity between the vector
multiplication operators in GL::Matrix and the scalar multiplication for
LinAl::Matrix.

diff --git a/source/matrix.h b/source/matrix.h
index 971d2b362e5441ab2d1dd5f8ff7496424d6d1021..cb61e292f0eaad46a195995f6c92a5bbf7c1afe8 100644 (file)
--- a/source/matrix.h
+++ b/source/matrix.h
@@ -38,6 +38,8 @@ public:
 
        Matrix operator*(const Matrix &m) const { return static_cast<const Base &>(*this)*static_cast<const Base &>(m); }
        Matrix &operator*=(const Matrix &m) { Base::operator*=(m); return *this; }
+       Matrix operator*(float s) const { return static_cast<const Base &>(*this)*s; }
+       Matrix &operator*=(float s) { Base::operator*=(s); return *this; }
        Vector4 operator*(const Vector4 &v) const { return static_cast<const Base &>(*this)*v; }
        Vector3 operator*(const Vector3 &v) const { return ((*this)*compose(v, 1.0f)).slice<3>(0); }
        float operator[](unsigned) const;