From 58134952bed768784a07a4ff7ed1e3c25b886b0b 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, 14 Apr 2017 12:40:53 +0000 Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/pip@356 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5 --- src/core/pibase.h | 4 ++-- src/system/pisystemmonitor.cpp | 3 +++ src/system/pisystemtests.cpp | 1 + src/system/pisystemtests.h | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/core/pibase.h b/src/core/pibase.h index 8032c015..ee0b5d49 100644 --- a/src/core/pibase.h +++ b/src/core/pibase.h @@ -142,10 +142,10 @@ # ifdef MAC_OS # pragma GCC diagnostic ignored "-Wdeprecated-declarations" # else -# pragma GCC diagnostic ignored "-Wpragmas" +//# pragma GCC diagnostic ignored "-Wpragmas" # pragma GCC diagnostic ignored "-Waggressive-loop-optimizations" # endif -# pragma GCC diagnostic ignored "-Wformat" +//# pragma GCC diagnostic ignored "-Wformat" //# pragma GCC diagnostic ignored "-Wformat-extra-args" # pragma GCC diagnostic ignored "-Wstrict-aliasing" //# pragma GCC diagnostic ignored "-Wsign-compare" diff --git a/src/system/pisystemmonitor.cpp b/src/system/pisystemmonitor.cpp index 67adb4b6..04e2b749 100755 --- a/src/system/pisystemmonitor.cpp +++ b/src/system/pisystemmonitor.cpp @@ -22,6 +22,9 @@ #ifdef WINDOWS # include "tlhelp32.h" #endif +#ifdef CC_GCC +# include +#endif PISystemMonitor::PISystemMonitor(): PIThread() { diff --git a/src/system/pisystemtests.cpp b/src/system/pisystemtests.cpp index c4ba2ca6..3c403304 100755 --- a/src/system/pisystemtests.cpp +++ b/src/system/pisystemtests.cpp @@ -18,6 +18,7 @@ */ #include "pisystemtests.h" +#include "piconfig.h" namespace PISystemTests { diff --git a/src/system/pisystemtests.h b/src/system/pisystemtests.h index 442e9b5d..ae2d0099 100755 --- a/src/system/pisystemtests.h +++ b/src/system/pisystemtests.h @@ -20,7 +20,7 @@ #ifndef PISYSTEMTESTS_H #define PISYSTEMTESTS_H -#include "piconfig.h" +#include "pibase.h" namespace PISystemTests { PIP_EXPORT extern long time_resolution_ns;