From 4ebcd53801e6bfdeef04c2f82aa0157fb71b10b2 Mon Sep 17 00:00:00 2001 From: Felix Geyer Date: Mon, 26 Dec 2011 19:34:34 +0100 Subject: [PATCH] Ignore compiler warnings in qendian.h. --- src/core/Endian.cpp | 7 +++++++ tests/modeltest.cpp | 5 ++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/core/Endian.cpp b/src/core/Endian.cpp index 177c3a7fb..afe5ce5e9 100644 --- a/src/core/Endian.cpp +++ b/src/core/Endian.cpp @@ -17,7 +17,14 @@ #include "Endian.h" +#if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 3)) +#pragma GCC push_options +#pragma GCC diagnostic ignored "-Wold-style-cast" +#endif #include +#if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 3)) +#pragma GCC pop_options +#endif #include namespace Endian diff --git a/tests/modeltest.cpp b/tests/modeltest.cpp index ccb5afaad..9e173b40f 100644 --- a/tests/modeltest.cpp +++ b/tests/modeltest.cpp @@ -40,11 +40,10 @@ ****************************************************************************/ -#include - #include "modeltest.h" -#include +#include +#include Q_DECLARE_METATYPE ( QModelIndex )