diff --git a/libs/main/core/pistring.h b/libs/main/core/pistring.h index b1c9d540..ad291508 100644 --- a/libs/main/core/pistring.h +++ b/libs/main/core/pistring.h @@ -785,9 +785,9 @@ inline PIString operator +(const char c, const PIString & f) {return PIChar(c) + inline PIString operator +(const PIString & f, const char c) {return f + PIChar(c);} -int versionCompare(const PIString & v0, const PIString & v1, int components = 6); +int PIP_EXPORT versionCompare(const PIString & v0, const PIString & v1, int components = 6); -PIString versionNormalize(const PIString & v); +PIString PIP_EXPORT versionNormalize(const PIString & v); diff --git a/libs/main/math/pimathmatrix.h b/libs/main/math/pimathmatrix.h index 676a4486..1f50bfab 100644 --- a/libs/main/math/pimathmatrix.h +++ b/libs/main/math/pimathmatrix.h @@ -347,7 +347,15 @@ public: bool isValid() const {return !PIVector2D::isEmpty();} _CMatrix & operator =(const PIVector > & v) {*this = _CMatrix(v); return *this;} - bool operator ==(const _CMatrix & sm) const {PIMM_FOR_A(i) if (_V2D::mat[i] != sm.mat[i]) return false; return true;} + bool operator ==(const _CMatrix & sm) const { + if(_V2D::mat.size() != sm.mat.size()) + return false; + PIMM_FOR_A(i) { + if (_V2D::mat[i] != sm.mat[i]) + return false; + } + return true; + } bool operator !=(const _CMatrix & sm) const {return !(*this == sm);} void operator +=(const _CMatrix & sm) {PIMM_FOR_A(i) _V2D::mat[i] += sm.mat[i];} void operator -=(const _CMatrix & sm) {PIMM_FOR_A(i) _V2D::mat[i] -= sm.mat[i];} diff --git a/main.cpp b/main.cpp index 3764b12d..709bbb77 100644 --- a/main.cpp +++ b/main.cpp @@ -1,6 +1,7 @@ #include "pip.h" int main() { + versionCompare("",""); PICloudServer s("127.0.0.1:10101"); s.startThreadedRead(); piSleep(10);