+ fix build failure, fix warning

FreeCAD · Apr 6, 2014 · 00d3a5d · 00d3a5d
1 parent b5b6d49
commit 00d3a5d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/src/App/FeatureTest.cpp b/src/App/FeatureTest.cpp
@@ -131,7 +131,7 @@ DocumentObjectExecReturn *FeatureTest::execute(void)
     case 3: *i=0;printf("%i",*i);break; // seg-vault
     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 6: s = malloc(3600000000);break; // out-of-memory
+    case 6: s = malloc(3600000000ul);break; // out-of-memory
   }
 
   ExecCount.setValue(ExecCount.getValue() + 1);

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