diff --git a/common.pri b/common.pri index 55fd53a16..25cabf27a 100644 --- a/common.pri +++ b/common.pri @@ -264,7 +264,7 @@ GCC_DEBUG_CXXFLAGS += \ -Wold-style-cast \ -Wconversion \ -Winit-self \ - -Wstack-protector \ +# -Wstack-protector \ -Wunreachable-code \ -Wcast-align \ -Wcast-qual \ @@ -615,7 +615,7 @@ CLANG_DEBUG_CXXFLAGS += \ -Wsizeof-pointer-memaccess \ -Wsometimes-uninitialized \ -Wsource-uses-openmp \ - -Wstack-protector \ +# -Wstack-protector \ -Wstatic-float-init \ -Wstatic-in-inline \ -Wstatic-local-in-inline \ diff --git a/src/libs/vdxf/libdxfrw/intern/dxfreader.cpp b/src/libs/vdxf/libdxfrw/intern/dxfreader.cpp index 6023b548d..15f5e6991 100644 --- a/src/libs/vdxf/libdxfrw/intern/dxfreader.cpp +++ b/src/libs/vdxf/libdxfrw/intern/dxfreader.cpp @@ -17,7 +17,6 @@ #include "dxfreader.h" #include "drw_textcodec.h" #include "drw_dbg.h" -#include "../vmisc/diagnostic.h" bool dxfReader::readRec(int *codeData) { // std::string text; @@ -103,9 +102,6 @@ int dxfReader::getHandleString(){ return res; } -QT_WARNING_PUSH -QT_WARNING_DISABLE_GCC("-Wstack-protector") - bool dxfReaderBinary::readCode(int *code) { unsigned short *int16p; char buffer[2]; @@ -124,8 +120,6 @@ bool dxfReaderBinary::readCode(int *code) { return (filestr->good()); } -QT_WARNING_POP - bool dxfReaderBinary::readString() { type = STRING; std::getline(*filestr, strData, '\0'); @@ -140,9 +134,6 @@ bool dxfReaderBinary::readString(std::string *text) { return (filestr->good()); } -QT_WARNING_PUSH -QT_WARNING_DISABLE_GCC("-Wstack-protector") - bool dxfReaderBinary::readInt16() { type = INT32; char buffer[2]; @@ -152,8 +143,6 @@ bool dxfReaderBinary::readInt16() { return (filestr->good()); } -QT_WARNING_POP - bool dxfReaderBinary::readInt32() { type = INT32; unsigned int *int32p; @@ -188,9 +177,6 @@ bool dxfReaderBinary::readDouble() { return (filestr->good()); } -QT_WARNING_PUSH -QT_WARNING_DISABLE_GCC("-Wstack-protector") - //saved as int or add a bool member?? bool dxfReaderBinary::readBool() { char buffer[1]; @@ -200,8 +186,6 @@ bool dxfReaderBinary::readBool() { return (filestr->good()); } -QT_WARNING_POP - bool dxfReaderAscii::readCode(int *code) { std::string text; std::getline(*filestr, text);