From 33e0bc3a460f593144b74a96eb788b644431b645 Mon Sep 17 00:00:00 2001 From: wmayer Date: Thu, 2 Feb 2017 20:42:56 +0100 Subject: [PATCH] fix various warnings --- src/App/Expression.cpp | 5 +++++ src/Base/Quantity.cpp | 5 +++++ src/Gui/SelectionFilter.cpp | 5 +++++ src/Mod/Sketcher/Gui/CommandConstraints.cpp | 2 +- 4 files changed, 16 insertions(+), 1 deletion(-) diff --git a/src/App/Expression.cpp b/src/App/Expression.cpp index d068f7da1f..895f5359b5 100644 --- a/src/App/Expression.cpp +++ b/src/App/Expression.cpp @@ -1745,10 +1745,15 @@ int ExpressionParserlex(void); # pragma clang diagnostic push # pragma clang diagnostic ignored "-Wsign-compare" # pragma clang diagnostic ignored "-Wunneeded-internal-declaration" +#elif defined (__GNUC__) +# pragma GCC diagnostic push +# pragma GCC diagnostic ignored "-Wsign-compare" #endif #include "lex.ExpressionParser.c" #if defined(__clang__) # pragma clang diagnostic pop +#elif defined (__GNUC__) +# pragma GCC diagnostic pop #endif #endif // DOXYGEN_SHOULD_SKIP_THIS #ifdef _MSC_VER diff --git a/src/Base/Quantity.cpp b/src/Base/Quantity.cpp index bdbcfe7ae0..80fa01e5f2 100644 --- a/src/Base/Quantity.cpp +++ b/src/Base/Quantity.cpp @@ -360,10 +360,15 @@ int QuantityLexer(void); # pragma clang diagnostic push # pragma clang diagnostic ignored "-Wsign-compare" # pragma clang diagnostic ignored "-Wunneeded-internal-declaration" +#elif defined (__GNUC__) +# pragma GCC diagnostic push +# pragma GCC diagnostic ignored "-Wsign-compare" #endif #include "QuantityLexer.c" #if defined(__clang__) # pragma clang diagnostic pop +#elif defined (__GNUC__) +# pragma GCC diagnostic pop #endif #endif // DOXYGEN_SHOULD_SKIP_THIS } diff --git a/src/Gui/SelectionFilter.cpp b/src/Gui/SelectionFilter.cpp index 6ea185df23..7236237cac 100644 --- a/src/Gui/SelectionFilter.cpp +++ b/src/Gui/SelectionFilter.cpp @@ -351,10 +351,15 @@ int SelectionFilterlex(void); # pragma clang diagnostic push # pragma clang diagnostic ignored "-Wsign-compare" # pragma clang diagnostic ignored "-Wunneeded-internal-declaration" +#elif defined (__GNUC__) +# pragma GCC diagnostic push +# pragma GCC diagnostic ignored "-Wsign-compare" #endif #include "lex.SelectionFilter.c" #if defined(__clang__) # pragma clang diagnostic pop +#elif defined (__GNUC__) +# pragma GCC diagnostic pop #endif #endif // DOXYGEN_SHOULD_SKIP_THIS } diff --git a/src/Mod/Sketcher/Gui/CommandConstraints.cpp b/src/Mod/Sketcher/Gui/CommandConstraints.cpp index 4348050145..79f09fcc3d 100644 --- a/src/Mod/Sketcher/Gui/CommandConstraints.cpp +++ b/src/Mod/Sketcher/Gui/CommandConstraints.cpp @@ -833,7 +833,7 @@ class DrawSketchHandlerGenConstraint: public DrawSketchHandler { public: DrawSketchHandlerGenConstraint(const char* cursor[], CmdSketcherConstraint *_cmd) - : constraintCursor(cursor), cmd(_cmd), selFilterGate(nullptr) {} + : selFilterGate(nullptr), constraintCursor(cursor), cmd(_cmd) {} virtual ~DrawSketchHandlerGenConstraint() { Gui::Selection().rmvSelectionGate();