From 8d52e56486aaca17e47c01a2159768072d64878a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9F=D0=B5=D0=BB=D0=B8=D0=BF=D0=B5=D0=BD=D0=BA=D0=BE=20?= =?UTF-8?q?=D0=98=D0=B2=D0=B0=D0=BD?= Date: Thu, 5 Mar 2020 10:07:42 +0000 Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/pip@899 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5 --- src_main/concurrent/piconditionvar.h | 2 +- src_main/math/pimathcomplex.h | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src_main/concurrent/piconditionvar.h b/src_main/concurrent/piconditionvar.h index a506b8c6..a6337f31 100644 --- a/src_main/concurrent/piconditionvar.h +++ b/src_main/concurrent/piconditionvar.h @@ -15,7 +15,7 @@ class PIP_EXPORT PIConditionVariable { public: explicit PIConditionVariable(); - ~PIConditionVariable(); + virtual ~PIConditionVariable(); /** * @brief Unblocks one of the threads currently waiting for this condition. If no threads are waiting, the function diff --git a/src_main/math/pimathcomplex.h b/src_main/math/pimathcomplex.h index 28d78ca3..dcfaf1c9 100644 --- a/src_main/math/pimathcomplex.h +++ b/src_main/math/pimathcomplex.h @@ -67,14 +67,13 @@ inline complexd sign(const complexd & x) {return complexd(sign(x.real()), sign(x inline complexd round(const complexd & c) {return complexd(piRound(c.real()), piRound(c.imag()));} inline complexd floor(const complexd & c) {return complexd(floor(c.real()), floor(c.imag()));} -inline complexd ceil(const complexd & c) {return complexd(ceil(c.real()), ceil(c.imag()));} - +inline complexd ceil (const complexd & c) {return complexd(ceil(c.real()), ceil(c.imag()));} #ifdef PIP_CXX11_SUPPORT # define acosc acos # define asinc asin # define atanc atan #else -inline complexd atanc(const complexd & c) {return -complexd(-0.5, 1.) * log((complexd_1 + complexd_i * c) / (complexd_1 - complexd_i * c));} +inline complexd atanc(const complexd & c) {return complexd(0., 0.5) * log((complexd_1 - complexd_i * c) / (complexd_1 + complexd_i * c));} inline complexd asinc(const complexd & c) {return -complexd_i * log(complexd_i * c + sqrt(complexd_1 - c * c));} inline complexd acosc(const complexd & c) {return -complexd_i * log(c + complexd_i * sqrt(complexd_1 - c * c));} #endif