From 32a3e995459e44f624f2e7161deaf5ae9fb928e7 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: Mon, 9 Oct 2017 11:25:10 +0000 Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/pip@547 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5 --- main.cpp | 49 +++--------------------------------------- src_main/core/pibase.h | 1 + 2 files changed, 4 insertions(+), 46 deletions(-) diff --git a/main.cpp b/main.cpp index 1ec87b57..0e1de889 100644 --- a/main.cpp +++ b/main.cpp @@ -1,52 +1,11 @@ #include "pip.h" +#include "picodeparser.h" #include "pivector2d.h" -#include "pistring.h" -#ifdef QNX -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# ifdef BLACKBERRY -# include -# else -# include -# endif -# define ip_mreqn ip_mreq -# define imr_address imr_interface -#else -# ifdef WINDOWS -# include -# include -# include -# include -# include -# define ip_mreqn ip_mreq -# define imr_address imr_interface -# else -# include -# include -# include -# include -# include -# include -# include -# ifndef ANDROID -# include -# endif -# endif -#endif -#include int main(int argc, char *argv[]) { + PICodeParser cp; + cp.parseFile("cp.h"); /*PIString s = PIString::fromUTF8("hello, привет"); piCout << s; PIByteArray ba = s.toUTF8(); @@ -54,8 +13,6 @@ int main(int argc, char *argv[]) { PIString s2; s2 = PIString::fromUTF8(ba); piCout << s2;*/ - piCout << PIEthernet::Address::resolve("www.ya.ru:22"); - piCout << PIEthernet::Address::resolve("www.ya.ru", 22); return 0; } diff --git a/src_main/core/pibase.h b/src_main/core/pibase.h index 3d2950de..1adc25cf 100644 --- a/src_main/core/pibase.h +++ b/src_main/core/pibase.h @@ -203,6 +203,7 @@ c::__PrivateInitializer__ & c::__PrivateInitializer__::operator =(const c::__PrivateInitializer__ & o) {if (p) delete p; p = new c::__Private__(); return *this;} #define PRIVATE (__privateinitializer__.p) +#define PRIVATEWB __privateinitializer__.p //! Macro used for infinite loop