complex macros with ;

libs/main/io_devices/pibinarylog.h

@@ -34,7 +34,7 @@
 //! \~russian  Бинарный лог
 class PIP_EXPORT PIBinaryLog: public PIIODevice
 {
-	PIIODEVICE(PIBinaryLog, "binlog")
+	PIIODEVICE(PIBinaryLog, "binlog");
 public:
 	explicit PIBinaryLog();
 	virtual ~PIBinaryLog();
@@ -286,10 +286,10 @@ public:
 	//! \}
 	
 	EVENT_HANDLER(PIString, createNewFile);
-	EVENT(fileEnd)
-	EVENT(fileError)
-	EVENT1(newFile, const PIString &, filename)
-	EVENT1(posChanged, int, pos)
+	EVENT(fileEnd);
+	EVENT(fileError);
+	EVENT1(newFile, const PIString &, filename);
+	EVENT1(posChanged, int, pos);
 
 	//! Get binlog info and statistic
 	static BinLogInfo getLogInfo(const PIString & path);

libs/main/io_devices/pican.h

@@ -31,7 +31,7 @@
 
 class PIP_EXPORT PICAN: public PIIODevice
 {
-	PIIODEVICE(PICAN, "can")
+	PIIODEVICE(PICAN, "can");
 public:
 	explicit PICAN(const PIString & path = PIString(), PIIODevice::DeviceMode mode = PIIODevice::ReadWrite);
 	virtual ~PICAN();

libs/main/io_devices/piethernet.h

@@ -38,7 +38,7 @@ class
 
 class PIP_EXPORT PIEthernet: public PIIODevice
 {
-	PIIODEVICE(PIEthernet, "eth")
+	PIIODEVICE(PIEthernet, "eth");
 	friend class PIPeer;
 public:
 	
@@ -317,9 +317,9 @@ public:
 
 	int socket() const {return sock;}
 	
-	EVENT1(newConnection, PIEthernet * , client)
-	EVENT0(connected)
-	EVENT1(disconnected, bool, withError)
+	EVENT1(newConnection, PIEthernet * , client);
+	EVENT0(connected);
+	EVENT1(disconnected, bool, withError);
 	
 	
 	//! Flags of network interface

libs/main/io_devices/pifile.h

@@ -36,7 +36,7 @@
 //! \~russian Локальный файл.
 class PIP_EXPORT PIFile: public PIIODevice
 {
-	PIIODEVICE(PIFile, "file")
+	PIIODEVICE(PIFile, "file");
 public:
 	
 	//! \~english Constructs file with empty path

libs/main/io_devices/pigpio.h

@@ -35,7 +35,7 @@
 //! \~russian Поддержка GPIO.
 class PIP_EXPORT PIGPIO: public PIThread
 {
-	PIOBJECT_SUBCLASS(PIGPIO, PIThread)
+	PIOBJECT_SUBCLASS(PIGPIO, PIThread);
 public:
 
 	//! \~english Work mode for pin
@@ -82,7 +82,7 @@ public:
 	//! \~russian Заканчивает наблюдение за всеми пинами
 	void clearWatch();
 
-	EVENT2(pinChanged, int, gpio_num, bool, new_value)
+	EVENT2(pinChanged, int, gpio_num, bool, new_value);
 
 	//! \events
 	//! \{
@@ -100,7 +100,7 @@ public:
 private:
 	PIGPIO();
 	virtual ~PIGPIO();
-	NO_COPY_CLASS(PIGPIO)
+	NO_COPY_CLASS(PIGPIO);
 
 	struct PIP_EXPORT GPIOData {
 		GPIOData() {dir = PIGPIO::In; num = fd = -1;}

libs/main/io_devices/piiobytearray.h

@@ -35,7 +35,7 @@
 //! \~russian Обёртка PIIODevice вокруг PIByteArray
 class PIP_EXPORT PIIOByteArray: public PIIODevice
 {
-	PIIODEVICE(PIIOByteArray, "")
+	PIIODEVICE(PIIOByteArray, "");
 public:
 	
 	//! \~english Contructs %PIIOByteArray with "buffer" content and "mode" open mode

libs/main/io_devices/piiodevice.h

@@ -79,10 +79,10 @@ typedef bool (*ReadRetFunc)(void * , uchar * , int );
 //! \~russian Базовый класс утройств ввода/вывода.
 class PIP_EXPORT PIIODevice: public PIThread
 {
-	PIOBJECT_SUBCLASS(PIIODevice, PIThread)
+	PIOBJECT_SUBCLASS(PIIODevice, PIThread);
 	friend void __DevicePool_threadReadDP(void * ddp);
 public:
-	NO_COPY_CLASS(PIIODevice)
+	NO_COPY_CLASS(PIIODevice);
 	
 	//! \~english Constructs a empty %PIIODevice
 	//! \~russian Создает пустой %PIIODevice
@@ -367,10 +367,10 @@ public:
 
 	EVENT_VHANDLER(void, flush) {;}
 	
-	EVENT(opened)
-	EVENT(closed)
-	EVENT2(threadedReadEvent, uchar * , readed, int, size)
-	EVENT2(threadedWriteEvent, ullong, id, int, written_size)
+	EVENT(opened);
+	EVENT(closed);
+	EVENT2(threadedReadEvent, uchar * , readed, int, size);
+	EVENT2(threadedWriteEvent, ullong, id, int, written_size);
 
 //! \handlers
 //! \{

libs/main/io_devices/piiostring.h

@@ -35,7 +35,7 @@
 //! \~russian Обёртка PIIODevice вокруг PIString.
 class PIP_EXPORT PIIOString: public PIIODevice
 {
-	PIIODEVICE(PIIOString, "")
+	PIIODEVICE(PIIOString, "");
 public:
 	
 	//! \~english Contructs %PIIOString with "string" content and "mode" open mode

libs/main/io_devices/pipeer.cpp

@@ -36,7 +36,7 @@
 #define _PIPEER_PING_TIMEOUT     5.0
 
 class PIPeer::PeerData: public PIObject {
-	PIOBJECT_SUBCLASS(PeerData, PIObject)
+	PIOBJECT_SUBCLASS(PeerData, PIObject);
 public:
 	PeerData(const PIString & n);
 	~PeerData();
@@ -45,8 +45,8 @@ public:
 	EVENT_HANDLER1(void, dtReceiveFinishedIn, bool, ok) {if (ok) received(name(), dt_in.data());}
 	EVENT_HANDLER1(void, dtReceiveFinishedOut, bool, ok) {if (ok) received(name(), dt_out.data());}
 	EVENT_HANDLER(void, dtThread);
-	EVENT2(received, const PIString &, from, const PIByteArray &, data)
-	EVENT2(sendRequest, const PIString &, to, const PIByteArray &, data)
+	EVENT2(received, const PIString &, from, const PIByteArray &, data);
+	EVENT2(sendRequest, const PIString &, to, const PIByteArray &, data);
 	bool send(const PIByteArray & d);
 	void receivedPacket(uchar type, const PIByteArray & d);
 	void setDist(int dist);
@@ -61,11 +61,11 @@ PIPeer::PeerData::PeerData(const PIString & n): PIObject(n) {
 	dt_out.setPacketSize(_PIPEER_MSG_SIZE);
 	dt_in.setCRCEnabled(false);
 	dt_out.setCRCEnabled(false);
-	CONNECTU(&dt_in, sendRequest, this, dtSendRequestIn)
-	CONNECTU(&dt_out, sendRequest, this, dtSendRequestOut)
-	CONNECTU(&dt_in, receiveFinished, this, dtReceiveFinishedIn)
-	CONNECTU(&dt_out, receiveFinished, this, dtReceiveFinishedOut)
-	CONNECTU(&t, started, this, dtThread)
+	CONNECTU(&dt_in, sendRequest, this, dtSendRequestIn);
+	CONNECTU(&dt_out, sendRequest, this, dtSendRequestOut);
+	CONNECTU(&dt_in, receiveFinished, this, dtReceiveFinishedIn);
+	CONNECTU(&dt_out, receiveFinished, this, dtReceiveFinishedOut);
+	CONNECTU(&t, started, this, dtThread);
 }
 
 

libs/main/io_devices/pipeer.h

@@ -31,7 +31,7 @@
 
 class PIP_EXPORT PIPeer: public PIIODevice
 {
-	PIIODEVICE(PIPeer, "peer")
+	PIIODEVICE(PIPeer, "peer");
 private:
 	class PeerData;
 	
@@ -41,7 +41,7 @@ public:
 
 	class PIP_EXPORT PeerInfo {
 		friend class PIPeer;
-		BINARY_STREAM_FRIEND(PeerInfo)
+		BINARY_STREAM_FRIEND(PIPeer::PeerInfo);
 	public:
 		PeerInfo() {dist = sync = cnt = 0; trace = -1; was_update = false; _data = 0;}
 		~PeerInfo() {}
@@ -80,7 +80,7 @@ public:
 		
 	};
 
-	BINARY_STREAM_FRIEND(PIPeer::PeerInfo)
+	BINARY_STREAM_FRIEND(PIPeer::PeerInfo);
 
 	bool send(const PIString & to, const PIByteArray & data) {return send(to, data.data(), data.size_s());}
 	bool send(const PIString & to, const PIString & data) {return send(to, data.data(), data.size_s());}
@@ -117,9 +117,9 @@ public:
 	void setTcpServerIP(const PIString & ip) {server_ip = ip; tcpClientReconnect();}
 
 	
-	EVENT2(dataReceivedEvent, const PIString &, from, const PIByteArray &, data)
-	EVENT1(peerConnectedEvent, const PIString &, name)
-	EVENT1(peerDisconnectedEvent, const PIString &, name)
+	EVENT2(dataReceivedEvent, const PIString &, from, const PIByteArray &, data);
+	EVENT1(peerConnectedEvent, const PIString &, name);
+	EVENT1(peerDisconnectedEvent, const PIString &, name);
 
 //	bool lockedEth() const {return eth_mutex.isLocked();}
 //	bool lockedPeers() const {return peers_mutex.isLocked();}

libs/main/io_devices/piserial.h

@@ -36,7 +36,7 @@
 //! \~russian Последовательный порт.
 class PIP_EXPORT PISerial: public PIIODevice
 {
-	PIIODEVICE(PISerial, "ser")
+	PIIODEVICE(PISerial, "ser");
 public:
 	
 	//! \~english Contructs an empty %PISerial

libs/main/io_devices/pisharedmemory.h

@@ -35,7 +35,7 @@
 //! \~russian Разделяемая память.
 class PIP_EXPORT PISharedMemory: public PIIODevice
 {
-	PIIODEVICE(PISharedMemory, "shm")
+	PIIODEVICE(PISharedMemory, "shm");
 public:
 	
 	//! \~english Constructs empty %PISharedMemory

libs/main/io_devices/pispi.h

@@ -31,7 +31,7 @@
 
 class PIP_EXPORT PISPI: public PIIODevice
 {
-	PIIODEVICE(PISPI, "spi")
+	PIIODEVICE(PISPI, "spi");
 public:
 	explicit PISPI(const PIString & path = PIString(), uint speed_hz = 1000000, PIIODevice::DeviceMode mode = PIIODevice::ReadWrite);
 	virtual ~PISPI();

libs/main/io_devices/pitransparentdevice.h

@@ -35,7 +35,7 @@
 //! \~russian PIIODevice который транслирует запись на чтение.
 class PIP_EXPORT PITransparentDevice: public PIIODevice
 {
-	PIIODEVICE(PITransparentDevice, "tr")
+	PIIODEVICE(PITransparentDevice, "tr");
 public:
 	
 	//! \~english Contructs empty %PITransparentDevice

libs/main/io_devices/piusb.h

@@ -63,7 +63,7 @@ struct usb_dev_handle;
 
 class PIP_EXPORT PIUSB: public PIIODevice
 {
-	PIIODEVICE(PIUSB, "usb")
+	PIIODEVICE(PIUSB, "usb");
 public:
 	explicit PIUSB(ushort vid = 0, ushort pid = 0);
 	virtual ~PIUSB();