suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

+ fix build failure, fix warning

Browse Source
This commit is contained in:
wmayer 2014-04-06 10:23:17 +02:00
parent b5b6d49d2e
commit 00d3a5d619
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/App/FeatureTest.cpp
View File

@ -131,7 +131,7 @@ DocumentObjectExecReturn *FeatureTest::execute(void)
case 3: *i=0;printf("%i",*i);break; // seg-vault case 3: *i=0;printf("%i",*i);break; // seg-vault
case 4: j=0; printf("%i",1/j); break; // int devision by zero case 4: j=0; printf("%i",1/j); break; // int devision by zero
case 5: f=0.0; printf("%f",1/f); break; // float devision by zero case 5: f=0.0; printf("%f",1/f); break; // float devision by zero
case 6: s = malloc(3600000000);break; // out-of-memory case 6: s = malloc(3600000000ul);break; // out-of-memory
} }
ExecCount.setValue(ExecCount.getValue() + 1); ExecCount.setValue(ExecCount.getValue() + 1);

21
src/Gui/SoFCUnifiedSelection.cpp
View File

@ -25,6 +25,7 @@
#ifndef _PreComp_ #ifndef _PreComp_
# include <qstatusbar.h> # include <qstatusbar.h>
# include <qstring.h> # include <qstring.h>
# include <QGLWidget>
# include <Inventor/details/SoFaceDetail.h> # include <Inventor/details/SoFaceDetail.h>
# include <Inventor/details/SoLineDetail.h> # include <Inventor/details/SoLineDetail.h>
#endif #endif
@ -168,16 +169,16 @@ const char* SoFCUnifiedSelection::getFileFormatName(void) const
void SoFCUnifiedSelection::write(SoWriteAction * action) void SoFCUnifiedSelection::write(SoWriteAction * action)
{ {
SoOutput * out = action->getOutput(); SoOutput * out = action->getOutput();
if (out->getStage() == SoOutput::WRITE) { if (out->getStage() == SoOutput::WRITE) {
// Do not write out the fields of this class // Do not write out the fields of this class
if (this->writeHeader(out, TRUE, FALSE)) return; if (this->writeHeader(out, TRUE, FALSE)) return;
SoGroup::doAction((SoAction *)action); SoGroup::doAction((SoAction *)action);
this->writeFooter(out); this->writeFooter(out);
} }
else { else {
inherited::write(action); inherited::write(action);
} }
} }
int SoFCUnifiedSelection::getPriority(const SoPickedPoint* p) int SoFCUnifiedSelection::getPriority(const SoPickedPoint* p)