From c1bbac06474bb4e19eaaea9d3886e6284f56db0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=91=D1=8B=D1=87=D0=BA=D0=BE=D0=B2=20=D0=90=D0=BD=D0=B4?= =?UTF-8?q?=D1=80=D0=B5=D0=B9?= Date: Tue, 16 May 2017 10:09:56 +0000 Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/pip@497 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5 --- src_main/core/pivarianttypes.cpp | 2 +- src_main/math/pifixedpoint.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src_main/core/pivarianttypes.cpp b/src_main/core/pivarianttypes.cpp index c7e19fdb..3afb2922 100644 --- a/src_main/core/pivarianttypes.cpp +++ b/src_main/core/pivarianttypes.cpp @@ -94,6 +94,6 @@ PIVariantTypes::Enum & PIVariantTypes::Enum::operator <<(const PIString & v) { PIVariantTypes::Enum & PIVariantTypes::Enum::operator <<(const PIStringList & v) { piForeachC (PIString & s, v) - (*this) << s; + (*this) << s.trimmed(); return *this; } diff --git a/src_main/math/pifixedpoint.h b/src_main/math/pifixedpoint.h index 4d00217a..0c1e881c 100644 --- a/src_main/math/pifixedpoint.h +++ b/src_main/math/pifixedpoint.h @@ -41,7 +41,7 @@ public: fp & operator =(const float &v) {val = PIFixedPoint(v).val; return *this;} fp & operator =(const double &v) {val = PIFixedPoint(v).val; return *this;} fp & operator =(const long double &v) {val = PIFixedPoint(v).val; return *this;} - fp operator -() {fp p = fp(*this); p.val = -val; return p;} + fp operator -() {fp p = fp(*this); p.val = -val; return p;} bool operator ==(const fp & v) const {return val == v.val;} bool operator !=(const fp & v) const {return val != v.val;}