From 395273dfe6205bcb83439222f06089df8e398b23 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: Thu, 20 Apr 2017 14:39:40 +0000 Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/pip@458 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5 --- src_main/thread/pitimer.cpp | 14 +++++++------- src_main/thread/pitimer.h | 7 +++++-- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/src_main/thread/pitimer.cpp b/src_main/thread/pitimer.cpp index 5720fa73..27026ab4 100755 --- a/src_main/thread/pitimer.cpp +++ b/src_main/thread/pitimer.cpp @@ -457,13 +457,13 @@ PITimer::PITimer(TimerEvent slot, void * data, PITimer::TimerImplementation ti): } -PITimer::PITimer(const PITimer & other): PIObject() { - piMonitor.timers++; - imp_mode = other.imp_mode; - initFirst(); - data_t = other.data_t; - ret_func = other.ret_func; -} +//PITimer::PITimer(const PITimer & other): PIObject() { +// piMonitor.timers++; +// imp_mode = other.imp_mode; +// initFirst(); +// data_t = other.data_t; +// ret_func = other.ret_func; +//} PITimer::~PITimer() { diff --git a/src_main/thread/pitimer.h b/src_main/thread/pitimer.h index 07740b6c..609e05c1 100755 --- a/src_main/thread/pitimer.h +++ b/src_main/thread/pitimer.h @@ -94,7 +94,7 @@ public: //! \brief Constructs timer with "slot" slot, "data" data and "ti" implementation explicit PITimer(TimerEvent slot, void * data = 0, TimerImplementation ti = Thread); - PITimer(const PITimer & other); +// PITimer(const PITimer & other); virtual ~PITimer(); @@ -246,7 +246,10 @@ protected: PIVector delims; _PITimerBase * imp; - + +private: + explicit PITimer(const PITimer & ); + void operator =(const PITimer & ); };