Suppress GCC's warning Wstack-protector.
--HG-- branch : develop
This commit is contained in:
parent
365f971d5f
commit
f701cc95f9
|
@ -102,6 +102,9 @@ int dxfReader::getHandleString(){
|
||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
QT_WARNING_PUSH
|
||||||
|
QT_WARNING_DISABLE_GCC("-Wstack-protector")
|
||||||
|
|
||||||
bool dxfReaderBinary::readCode(int *code) {
|
bool dxfReaderBinary::readCode(int *code) {
|
||||||
unsigned short *int16p;
|
unsigned short *int16p;
|
||||||
char buffer[2];
|
char buffer[2];
|
||||||
|
@ -120,6 +123,8 @@ bool dxfReaderBinary::readCode(int *code) {
|
||||||
return (filestr->good());
|
return (filestr->good());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
QT_WARNING_POP
|
||||||
|
|
||||||
bool dxfReaderBinary::readString() {
|
bool dxfReaderBinary::readString() {
|
||||||
type = STRING;
|
type = STRING;
|
||||||
std::getline(*filestr, strData, '\0');
|
std::getline(*filestr, strData, '\0');
|
||||||
|
@ -134,6 +139,9 @@ bool dxfReaderBinary::readString(std::string *text) {
|
||||||
return (filestr->good());
|
return (filestr->good());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
QT_WARNING_PUSH
|
||||||
|
QT_WARNING_DISABLE_GCC("-Wstack-protector")
|
||||||
|
|
||||||
bool dxfReaderBinary::readInt16() {
|
bool dxfReaderBinary::readInt16() {
|
||||||
type = INT32;
|
type = INT32;
|
||||||
char buffer[2];
|
char buffer[2];
|
||||||
|
@ -143,6 +151,8 @@ bool dxfReaderBinary::readInt16() {
|
||||||
return (filestr->good());
|
return (filestr->good());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
QT_WARNING_POP
|
||||||
|
|
||||||
bool dxfReaderBinary::readInt32() {
|
bool dxfReaderBinary::readInt32() {
|
||||||
type = INT32;
|
type = INT32;
|
||||||
unsigned int *int32p;
|
unsigned int *int32p;
|
||||||
|
@ -177,6 +187,9 @@ bool dxfReaderBinary::readDouble() {
|
||||||
return (filestr->good());
|
return (filestr->good());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
QT_WARNING_PUSH
|
||||||
|
QT_WARNING_DISABLE_GCC("-Wstack-protector")
|
||||||
|
|
||||||
//saved as int or add a bool member??
|
//saved as int or add a bool member??
|
||||||
bool dxfReaderBinary::readBool() {
|
bool dxfReaderBinary::readBool() {
|
||||||
char buffer[1];
|
char buffer[1];
|
||||||
|
@ -186,6 +199,8 @@ bool dxfReaderBinary::readBool() {
|
||||||
return (filestr->good());
|
return (filestr->good());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
QT_WARNING_POP
|
||||||
|
|
||||||
bool dxfReaderAscii::readCode(int *code) {
|
bool dxfReaderAscii::readCode(int *code) {
|
||||||
std::string text;
|
std::string text;
|
||||||
std::getline(*filestr, text);
|
std::getline(*filestr, text);
|
||||||
|
|
Loading…
Reference in New Issue
Block a user