From 7508d9eabee890c6ce1fe01098694884efe166a9 Mon Sep 17 00:00:00 2001
From: Aleksei Kanash <sc.kanash.aleksei@gmail.com>
Date: Tue, 28 Feb 2012 16:23:07 +0200
Subject: [PATCH] Fix to NO_THIRD_PARTY_WARNINGS macro.
---
Sankore_3.1.pro | 1 -
src/globals/UBGlobals.h | 9 ++++-----
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/Sankore_3.1.pro b/Sankore_3.1.pro
index e17a120a..57cd996e 100644
--- a/Sankore_3.1.pro
+++ b/Sankore_3.1.pro
@@ -35,7 +35,6 @@ QT += script
QT += xmlpatterns
INCLUDEPATH += src
-INCLUDEPATH += globals
include($$THIRD_PARTY_PATH/libs.pri)
include(src/adaptors/adaptors.pri)
diff --git a/src/globals/UBGlobals.h b/src/globals/UBGlobals.h
index 363c11e4..5a98fd10 100644
--- a/src/globals/UBGlobals.h
+++ b/src/globals/UBGlobals.h
@@ -18,8 +18,6 @@
// just save old state (needs for not empty define)
#define THIRD_PARTY_WARNINGS_DISABLE __pragma(warning(push));
#endif //#ifdef NO_THIRD_PARTY_WARNINGS
-// anyway on WIN
-#define THIRD_PARTY_WARNINGS_ENABLE WARNINGS_ENABLE
#else //#ifdef Q_WS_WIN
@@ -33,15 +31,16 @@ _Pragma("GCC diagnostic ignored \"-Wsign-compare\"");
#ifdef NO_THIRD_PARTY_WARNINGS
//disabling some warnings
#define THIRD_PARTY_WARNINGS_DISABLE WARNINGS_DISABLE
-
-#define THIRD_PARTY_WARNINGS_ENABLE WARNINGS_ENABLE
#else
// just save old state (needs for not empty define)
-#define THIRD_PARTY_WARNINGS_ENABLE WARNINGS_ENABLE
+#define THIRD_PARTY_WARNINGS_DISABLE _Pragma("GCC diagnostic push");
#endif //#ifdef NO_THIRD_PARTY_WARNINGS
#endif //#ifdef Q_WS_WIN
+// anyway on any OS
+#define THIRD_PARTY_WARNINGS_ENABLE WARNINGS_ENABLE
+
#endif // UBGLOBALS_H
--
2.18.1