From 519eb347d194cec011fadd8f47a5dd488b2671bb Mon Sep 17 00:00:00 2001 From: Eryn Wells Date: Sat, 9 Aug 2014 09:57:35 -0700 Subject: [PATCH] Vector4 constructor from Matrix<4,1> --- src/basics/vector.cc | 7 ++++++- src/basics/vector.hh | 1 + 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/basics/vector.cc b/src/basics/vector.cc index 5f68bfa..314f026 100644 --- a/src/basics/vector.cc +++ b/src/basics/vector.cc @@ -33,6 +33,11 @@ Vector4::Vector4(const Double& x, } +Vector4::Vector4(const Matrix<4,1>&& rhs) + : Vector4(static_cast(rhs)) +{ } + + /* * charles::basics::Vector4::X -- */ @@ -96,7 +101,7 @@ Vector4 Vector4::operator*(const Double& rhs) const { - return dynamic_cast(*this * rhs); + return static_cast(*this * rhs); } diff --git a/src/basics/vector.hh b/src/basics/vector.hh index 9f34437..9ec4741 100644 --- a/src/basics/vector.hh +++ b/src/basics/vector.hh @@ -24,6 +24,7 @@ struct Vector4 { Vector4(); Vector4(const Double& x, const Double& y, const Double& z); + Vector4(const Matrix<4,1>&& m); Double& X(); const Double& X() const;