From 9d7cc0efa811d4651e09339cb4ded7c946974d9f Mon Sep 17 00:00:00 2001 From: Josh Koon <45607479+joshkoon@users.noreply.github.com> Date: Thu, 21 Feb 2019 16:48:57 -0800 Subject: [PATCH] Formatting of Rational function order --- src/CalcManager/CEngine/Rational.cpp | 12 ++++++------ src/CalcManager/Header Files/Rational.h | 3 +-- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/CalcManager/CEngine/Rational.cpp b/src/CalcManager/CEngine/Rational.cpp index 8cfbab0d..be2ac576 100644 --- a/src/CalcManager/CEngine/Rational.cpp +++ b/src/CalcManager/CEngine/Rational.cpp @@ -378,12 +378,7 @@ namespace CalcEngine lhs ^= rhs; return lhs; } - - bool Rational::IsZero() const - { - return this->P().IsZero(); - } - + bool operator==(Rational const& lhs, Rational const& rhs) { PRAT lhsRat = lhs.ToPRAT(); @@ -450,6 +445,11 @@ namespace CalcEngine return !(lhs < rhs); } + bool Rational::IsZero() const + { + return this->P().IsZero(); + } + wstring Rational::ToString(uint32_t radix, NUMOBJ_FMT fmt, int32_t precision) const { PRAT rat = this->ToPRAT(); diff --git a/src/CalcManager/Header Files/Rational.h b/src/CalcManager/Header Files/Rational.h index 0620f498..cd49d63e 100644 --- a/src/CalcManager/Header Files/Rational.h +++ b/src/CalcManager/Header Files/Rational.h @@ -56,8 +56,6 @@ namespace CalcEngine friend Rational operator|(Rational lhs, Rational const& rhs); friend Rational operator^(Rational lhs, Rational const& rhs); - bool IsZero() const; - friend bool operator==(Rational const& lhs, Rational const& rhs); friend bool operator!=(Rational const& lhs, Rational const& rhs); friend bool operator<(Rational const& lhs, Rational const& rhs); @@ -65,6 +63,7 @@ namespace CalcEngine friend bool operator<=(Rational const& lhs, Rational const& rhs); friend bool operator>=(Rational const& lhs, Rational const& rhs); + bool IsZero() const; std::wstring ToString(uint32_t radix, NUMOBJ_FMT format, int32_t precision) const; uint64_t ToUInt64_t() const;