From f53b0b0a03ed1d0d3a0e4aa98884857ef49b80fe Mon Sep 17 00:00:00 2001 From: Alan Garny Date: Tue, 22 Oct 2019 14:09:27 +1300 Subject: [PATCH] Some minor cleaning up. --- .../dataStore/DataStore/src/datastorepythonwrapper.cpp | 3 +-- src/plugins/thirdParty/Python/src/pythonbegin.h | 4 +--- src/plugins/thirdParty/Python/src/pythonend.h | 4 +--- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/src/plugins/dataStore/DataStore/src/datastorepythonwrapper.cpp b/src/plugins/dataStore/DataStore/src/datastorepythonwrapper.cpp index c5468d767d..4845814c2c 100644 --- a/src/plugins/dataStore/DataStore/src/datastorepythonwrapper.cpp +++ b/src/plugins/dataStore/DataStore/src/datastorepythonwrapper.cpp @@ -28,8 +28,7 @@ along with this program. If not, see . #include "pythonbegin.h" //============================================================================== -// Note: the order in which we include the two following header files is -// important... +// Note: yes, these two header files must be included in this order... #include "datastorepythonwrapper.h" #include "datastorepythonnumpy.h" diff --git a/src/plugins/thirdParty/Python/src/pythonbegin.h b/src/plugins/thirdParty/Python/src/pythonbegin.h index c80c0e768d..122053b82f 100644 --- a/src/plugins/thirdParty/Python/src/pythonbegin.h +++ b/src/plugins/thirdParty/Python/src/pythonbegin.h @@ -21,9 +21,7 @@ along with this program. If not, see . // Python begin //============================================================================== -#if defined(Q_OS_WIN) - #pragma warning(push) -#elif defined(Q_OS_LINUX) +#if defined(Q_OS_LINUX) #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wmissing-field-initializers" #elif defined(Q_OS_MAC) diff --git a/src/plugins/thirdParty/Python/src/pythonend.h b/src/plugins/thirdParty/Python/src/pythonend.h index 3eefa37c83..5b9b3eb897 100644 --- a/src/plugins/thirdParty/Python/src/pythonend.h +++ b/src/plugins/thirdParty/Python/src/pythonend.h @@ -21,9 +21,7 @@ along with this program. If not, see . // Python end //============================================================================== -#if defined(Q_OS_WIN) - #pragma warning(pop) -#elif defined(Q_OS_LINUX) +#if defined(Q_OS_LINUX) #pragma GCC diagnostic pop #elif defined(Q_OS_MAC) #pragma GCC diagnostic pop