From a23c9e3f07e5e463acbea91cfbc3c29c62121b94 Mon Sep 17 00:00:00 2001 From: Mathew Sutcliffe Date: Tue, 14 Jan 2014 00:51:41 +0000 Subject: [PATCH] Normalizing argument types of CEarthAngle comparison and arithmetic operators: argument type should be same type as the this pointer. --- src/blackmisc/geoearthangle.cpp | 2 +- src/blackmisc/geoearthangle.h | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/blackmisc/geoearthangle.cpp b/src/blackmisc/geoearthangle.cpp index 23e769793..4c0d56b4c 100644 --- a/src/blackmisc/geoearthangle.cpp +++ b/src/blackmisc/geoearthangle.cpp @@ -94,7 +94,7 @@ namespace BlackMisc */ template int CEarthAngle::compareImpl(const CValueObject &otherBase) const { - const auto &other = static_cast(otherBase); + const auto &other = static_cast(otherBase); if (*this < other) { return -1; } else if (*this > other) { return 1; } diff --git a/src/blackmisc/geoearthangle.h b/src/blackmisc/geoearthangle.h index c17b5c010..c695b98bc 100644 --- a/src/blackmisc/geoearthangle.h +++ b/src/blackmisc/geoearthangle.h @@ -89,7 +89,7 @@ namespace BlackMisc * \param latOrLon * \return */ - bool operator==(const LATorLON &latOrLon) const + bool operator==(const CEarthAngle &latOrLon) const { return this->CAngle::operator ==(latOrLon); } @@ -99,7 +99,7 @@ namespace BlackMisc * \param latOrLon * \return */ - bool operator!=(const LATorLON &latOrLon) const + bool operator!=(const CEarthAngle &latOrLon) const { return this->CAngle::operator !=(latOrLon); } @@ -131,7 +131,7 @@ namespace BlackMisc * \param latOrLon * \return */ - bool operator >(const LATorLON &latOrLon) const + bool operator >(const CEarthAngle &latOrLon) const { return this->CAngle::operator >(latOrLon); } @@ -141,7 +141,7 @@ namespace BlackMisc * \param latOrLon * \return */ - bool operator <(const LATorLON &latOrLon) const + bool operator <(const CEarthAngle &latOrLon) const { return this->CAngle::operator >(latOrLon); } @@ -151,7 +151,7 @@ namespace BlackMisc * \param latOrLon * \return */ - bool operator <=(const LATorLON &latOrLon) const + bool operator <=(const CEarthAngle &latOrLon) const { return this->CAngle::operator <=(latOrLon); } @@ -161,7 +161,7 @@ namespace BlackMisc * \param latOrLon * \return */ - bool operator >=(const LATorLON &latOrLon) const + bool operator >=(const CEarthAngle &latOrLon) const { return this->CAngle::operator >=(latOrLon); } @@ -171,7 +171,7 @@ namespace BlackMisc * \param latOrLon * \return */ - LATorLON operator +(const LATorLON &latOrLon) const + LATorLON operator +(const CEarthAngle &latOrLon) const { LATorLON l(*this); l += latOrLon; @@ -183,7 +183,7 @@ namespace BlackMisc * \param latOrLon * \return */ - LATorLON operator -(const LATorLON &latOrLon) const + LATorLON operator -(const CEarthAngle &latOrLon) const { LATorLON l(*this); l -= latOrLon;