From 5470c6435ef773a129e1651c9f2f5c77c650730b Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Sat, 23 Jul 2022 18:32:39 +1000 Subject: [PATCH] AP_Math: rename * operator for vector3f * matrix3f --- libraries/AP_Math/vector3.cpp | 2 +- libraries/AP_Math/vector3.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/AP_Math/vector3.cpp b/libraries/AP_Math/vector3.cpp index 2bbf57790b..669ecb2f28 100644 --- a/libraries/AP_Math/vector3.cpp +++ b/libraries/AP_Math/vector3.cpp @@ -437,7 +437,7 @@ T Vector3::angle(const Vector3 &v2) const // multiplication of transpose by a vector template -Vector3 Vector3::operator *(const Matrix3 &m) const +Vector3 Vector3::row_times_mat(const Matrix3 &m) const { return Vector3(*this * m.colx(), *this * m.coly(), diff --git a/libraries/AP_Math/vector3.h b/libraries/AP_Math/vector3.h index 3862a23ef4..08f6337cef 100644 --- a/libraries/AP_Math/vector3.h +++ b/libraries/AP_Math/vector3.h @@ -158,7 +158,7 @@ public: } // multiply a row vector by a matrix, to give a row vector - Vector3 operator *(const Matrix3 &m) const; + Vector3 row_times_mat(const Matrix3 &m) const; // multiply a column vector by a row vector, returning a 3x3 matrix Matrix3 mul_rowcol(const Vector3 &v) const;