From 6cd7c12d666936ed157e73c92dc379ca51fdbc7e 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: Mon, 27 Nov 2017 08:49:22 +0000 Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/pip@561 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5 --- CMakeLists.txt | 2 +- main_.cpp | 4 ++-- main_tcp_server.cpp | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c6c16a81..09278bed 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -383,7 +383,7 @@ endif() # Test program -add_executable(pip_test "main.cpp" "1.cpp") +add_executable(pip_test "main.cpp") target_link_libraries(pip_test pip pip_compress) diff --git a/main_.cpp b/main_.cpp index 557171f9..109f9743 100644 --- a/main_.cpp +++ b/main_.cpp @@ -53,8 +53,8 @@ class B: public PIObject { PIOBJECT(B) public: B() {} - EVENT1(eventB1, float, f); - EVENT1(eventB2, PIString, s); + EVENT1(eventB1, float, f) + EVENT1(eventB2, PIString, s) //uchar _[0x20]; }; diff --git a/main_tcp_server.cpp b/main_tcp_server.cpp index 7cfb4162..58cac913 100644 --- a/main_tcp_server.cpp +++ b/main_tcp_server.cpp @@ -1,7 +1,7 @@ #include "pip.h" class Client: public PIObject { - PIOBJECT(Client); + PIOBJECT(Client) public: Client(PIEthernet * eth_) { eth = eth_; @@ -12,7 +12,7 @@ public: } ~Client() {} EVENT_HANDLER2(void, readed, uchar * , data, int, size) { - PIByteArray ba(data, size) + PIByteArray ba(data, size); piCoutObj << uint(eth) << "readed" << size << "bytes" << Hex << ba; eth->write(ba); } @@ -32,7 +32,7 @@ public: }; class Server: public PIObject { - PIOBJECT(Server); + PIOBJECT(Server) public: Server(int port) { eth = new PIEthernet(PIEthernet::TCP_Server);