complex macros with ;

libs/main/thread/piconditionvar.h

@@ -37,7 +37,7 @@
  */
 class PIP_EXPORT PIConditionVariable {
 public:
-	NO_COPY_CLASS(PIConditionVariable)
+	NO_COPY_CLASS(PIConditionVariable);
 	explicit PIConditionVariable();
 	virtual ~PIConditionVariable();
 

libs/main/thread/pigrabberbase.h

@@ -33,7 +33,7 @@
 template<typename T = PIByteArray>
 class PIGrabberBase: public PIThread
 {
-	PIOBJECT_SUBCLASS(PIGrabberBase, PIThread)
+	PIOBJECT_SUBCLASS(PIGrabberBase, PIThread);
 public:
 	PIGrabberBase() {
 		is_opened = false;
@@ -130,9 +130,9 @@ public:
 		close();
 	}
 
-	EVENT(dataReady)
-	EVENT(opened)
-	EVENT(closed)
+	EVENT(dataReady);
+	EVENT(opened);
+	EVENT(closed);
 
 protected:
 	virtual void init() {}

libs/main/thread/pimutex.h

@@ -32,7 +32,7 @@
 class PIP_EXPORT PIMutex
 {
 public:
-	NO_COPY_CLASS(PIMutex)
+	NO_COPY_CLASS(PIMutex);
 
 	//! \~english Constructs unlocked mutex
 	//! \~russian Создает незаблокированный мьютекс
@@ -69,7 +69,7 @@ private:
 class PIP_EXPORT PIMutexLocker
 {
 public:
-	NO_COPY_CLASS(PIMutexLocker)
+	NO_COPY_CLASS(PIMutexLocker);
 
 	//! \~english Constructs and lock "m" if "condition" is \c true
 	//! \~russian Создает и блокирует мьютекс "m" если "condition" \c true

libs/main/thread/pipipelinethread.h

@@ -34,7 +34,7 @@
 template <typename Tin, typename Tout>
 class PIPipelineThread : public PIThread
 {
-	PIOBJECT_SUBCLASS(PIPipelineThread, PIThread)
+	PIOBJECT_SUBCLASS(PIPipelineThread, PIThread);
 public:
 	PIPipelineThread() {
 		cnt = 0;
@@ -51,9 +51,9 @@ public:
 	}
 	template <typename T>
 	void connectTo(PIPipelineThread<Tout, T> * next) {
-		CONNECT3(void, Tout, bool, bool *, this, calculated, next, enqueue)
+		CONNECT3(void, Tout, bool, bool *, this, calculated, next, enqueue);
 	}
-	EVENT3(calculated, const Tout &, v, bool, wait, bool *, overload)
+	EVENT3(calculated, const Tout &, v, bool, wait, bool *, overload);
 	EVENT_HANDLER3(void, enqueue, const Tin &, v, bool, wait, bool *, overload) {
 		mutex.lock();
 		//piCoutObj << "enque" << overload;

libs/main/thread/pispinlock.h

@@ -33,7 +33,7 @@
 class PIP_EXPORT PISpinlock
 {
 public:
-	NO_COPY_CLASS(PISpinlock)
+	NO_COPY_CLASS(PISpinlock);
 
 	//! \~english Constructs unlocked spinlock
 	//! \~russian Создает незаблокированный спинлок
@@ -73,7 +73,7 @@ private:
 class PIP_EXPORT PISpinlockLocker
 {
 public:
-	NO_COPY_CLASS(PISpinlockLocker)
+	NO_COPY_CLASS(PISpinlockLocker);
 
 	//! \~english Constructs and lock "s" if "condition" is \c true
 	//! \~russianСоздает и блокирует спинлок "m" если "condition" \c true

libs/main/thread/pithread.h

@@ -68,12 +68,12 @@ typedef std::function<void(void *)> ThreadFunc;
 
 class PIP_EXPORT PIThread: public PIObject
 {
-	PIOBJECT_SUBCLASS(PIThread, PIObject)
+	PIOBJECT_SUBCLASS(PIThread, PIObject);
 #ifndef MICRO_PIP
 	friend class PIIntrospectionThreads;
 #endif
 public:
-	NO_COPY_CLASS(PIThread)
+	NO_COPY_CLASS(PIThread);
 
 	//! \~english Contructs thread with custom data "data", external function "func" and main loop delay "loop_delay"
 	//! \~russian Создает поток с данными "data", функцией "func" и задержкой цикла "loop_delay"
@@ -166,8 +166,8 @@ public:
 	void __thread_func__();
 	void __thread_func_once__();
 
-	EVENT(started)
-	EVENT(stopped)
+	EVENT(started);
+	EVENT(stopped);
 
 	//! \~english Call event handler "handler" of object "object" in separate thread
 	//! \~russian Вызывает обработчик "handler" объекта "object" в отдельном потоке

libs/main/thread/pitimer.h

@@ -74,9 +74,9 @@ protected:
 
 
 class PIP_EXPORT PITimer: public PIObject {
-	PIOBJECT_SUBCLASS(PITimer, PIObject)
+	PIOBJECT_SUBCLASS(PITimer, PIObject);
 public:
-	NO_COPY_CLASS(PITimer)
+	NO_COPY_CLASS(PITimer);
 
 	//! \~english Constructs timer with PITimer::Thread implementation
 	//! \~russian Создает таймер с реализацией PITimer::Thread
@@ -215,7 +215,7 @@ public:
 	
 	EVENT_HANDLER0(void, clearDelimiters) {delims.clear();}
 	
-	EVENT2(tickEvent, void * , data_, int, delimiter)
+	EVENT2(tickEvent, void * , data_, int, delimiter);
 	
 //! \handlers
 //! \{