From 3246823c64b9c12cd13cb452c4a508db5b7b794b 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: Wed, 6 Feb 2019 22:06:31 +0000 Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/pip@708 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5 --- src_main/system/pisystemmonitor.cpp | 2 ++ src_main/system/pisystemmonitor.h | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src_main/system/pisystemmonitor.cpp b/src_main/system/pisystemmonitor.cpp index 7f734fdb..9ac44135 100755 --- a/src_main/system/pisystemmonitor.cpp +++ b/src_main/system/pisystemmonitor.cpp @@ -34,6 +34,7 @@ #endif +#ifndef FREERTOS PRIVATE_DEFINITION_START(PISystemMonitor) #ifndef WINDOWS # ifdef MAC_OS @@ -51,6 +52,7 @@ PRIVATE_DEFINITION_START(PISystemMonitor) PITimeMeasurer tm; #endif PRIVATE_DEFINITION_END(PISystemMonitor) +#endif PISystemMonitor::PISystemMonitor(): PIThread() { diff --git a/src_main/system/pisystemmonitor.h b/src_main/system/pisystemmonitor.h index 1068027a..0dbcc71b 100755 --- a/src_main/system/pisystemmonitor.h +++ b/src_main/system/pisystemmonitor.h @@ -92,8 +92,9 @@ private: PIMap tbid; bool self_; int pID_, page_size, cpu_count, cycle; +#ifndef FREERTOS PRIVATE_DECLARATION - +#endif }; inline PICout operator <<(PICout s, const PISystemMonitor::ThreadStats & v) {