From 0706db87c833e9b616da05c53c630af883e3a986 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: Fri, 28 Feb 2020 10:05:00 +0000 Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/pip@889 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5 --- CMakeLists.txt | 1 + src_main/concurrent/executor.h | 4 ---- src_main/core/piobject.h | 1 - 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 431aabd7..9f9a9179 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -64,6 +64,7 @@ endif() if(STATIC_LIB) set(PIP_LIB_TYPE STATIC) + add_definitions(-DPIP_STATIC_DEFINE) message(STATUS "Building PIP static library") else() set(PIP_LIB_TYPE SHARED) diff --git a/src_main/concurrent/executor.h b/src_main/concurrent/executor.h index f4568af0..aee36030 100644 --- a/src_main/concurrent/executor.h +++ b/src_main/concurrent/executor.h @@ -1,7 +1,3 @@ -// -// Created by fomenko on 20.09.2019. -// - #ifndef PIP_TESTS_EXECUTOR_H #define PIP_TESTS_EXECUTOR_H diff --git a/src_main/core/piobject.h b/src_main/core/piobject.h index cfa77b5c..7c7e33af 100755 --- a/src_main/core/piobject.h +++ b/src_main/core/piobject.h @@ -785,7 +785,6 @@ public: bool isPIObject() const {return isPIObject(this);} template bool isTypeOf() const { - if (!this) return false; if (!isPIObject()) return false; return scopeList().contains(T::__classNameS()); }