From dbcea3a97908f60b304c3d513cade47705bedf5b Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Wed, 20 Jul 2016 18:58:21 +0300 Subject: [PATCH] GCC warnings. --HG-- branch : develop --- common.pri | 6 +++--- src/libs/vobj/predicates.cpp | 7 +++++++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/common.pri b/common.pri index 43c450566..c96667d56 100644 --- a/common.pri +++ b/common.pri @@ -238,7 +238,7 @@ GCC_DEBUG_CXXFLAGS += \ -Wmissing-include-dirs \ -Wpacked \ -Wredundant-decls \ - -Winline \ +# -Winline \ -Winvalid-pch \ -Wunsafe-loop-optimizations \ -Wlong-long \ @@ -427,7 +427,7 @@ CLANG_DEBUG_CXXFLAGS += \ -Winherited-variadic-ctor \ -Winit-self \ -Winitializer-overrides \ - -Winline \ +# -Winline \ -Wint-conversion \ -Wint-conversions \ -Wint-to-pointer-cast \ @@ -641,7 +641,7 @@ ICC_DEBUG_CXXFLAGS += \ -Weffc++ \ -Wextra-tokens \ -Wformat \ - #-Winline \ +# -Winline \ -Wmain \ -Wmissing-declarations \ -Wmissing-prototypes \ diff --git a/src/libs/vobj/predicates.cpp b/src/libs/vobj/predicates.cpp index 0e08ed674..b46aa05a3 100644 --- a/src/libs/vobj/predicates.cpp +++ b/src/libs/vobj/predicates.cpp @@ -498,6 +498,10 @@ qreal estimate(int elen, qreal *e) return Q; } +#if defined(Q_CC_GNU) + #pragma GCC diagnostic push + #pragma GCC diagnostic ignored "-Wmaybe-uninitialized" +#endif qreal incircleadapt(qreal *pa, qreal *pb, qreal *pc, qreal *pd, qreal permanent) { INEXACT qreal adx, bdx, cdx, ady, bdy, cdy; @@ -1031,6 +1035,9 @@ qreal incircleadapt(qreal *pa, qreal *pb, qreal *pc, qreal *pd, qreal permanent) return finnow[finlength - 1]; } +#if defined(Q_CC_GNU) + #pragma GCC diagnostic pop +#endif qreal incircle(qreal *pa, qreal *pb, qreal *pc, qreal *pd) {