Extensions: Windows fixes

FreeCAD · Oct 8, 2016 · 790413f · 790413f
1 parent 558e128
commit 790413f
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/src/App/DocumentObjectGroup.h b/src/App/DocumentObjectGroup.h
@@ -34,7 +34,7 @@
 namespace App
 {
 
-class DocumentObjectGroup : public DocumentObject, public GroupExtension {
+class AppExport DocumentObjectGroup : public DocumentObject, public GroupExtension {
 
     PROPERTY_HEADER_WITH_EXTENSIONS(App::DocumentObjectGroup);
 

diff --git a/src/App/PreCompiled.h b/src/App/PreCompiled.h
@@ -33,6 +33,7 @@
 #pragma warning( disable : 4275 )
 #pragma warning( disable : 4503 )
 #pragma warning( disable : 4786 )  // specifier longer then 255 chars
+#pragma warning( disable : 4250 )  // virtual inheritance warning
 #endif
 
 
@@ -81,11 +82,11 @@
 #include <boost/program_options.hpp>
 //namespace po = boost::program_options;
 
-#include <boost/filesystem/path.hpp>
-#include <boost/filesystem/operations.hpp>
-#include <boost/filesystem/exception.hpp>
+#include <boost/filesystem/path.hpp>
+#include <boost/filesystem/operations.hpp>
+#include <boost/filesystem/exception.hpp>
+
 
-
 #endif //_PreComp_
 
 #endif // APP_PRECOMPILED_H
diff --git a/src/Gui/PreCompiled.h b/src/Gui/PreCompiled.h
@@ -25,7 +25,7 @@
 #define GUI_PRECOMPILED_H
 
 #include <FCConfig.h>
-
+
 #ifdef _PreComp_
 
 // here get the warnings of too long specifiers disabled (needed for VC6)
@@ -35,6 +35,7 @@
 #pragma warning( disable : 4275 )
 #pragma warning( disable : 4503 )
 #pragma warning( disable : 4786 )  // specifier longer then 255 chars
+#pragma warning( disable : 4250 )  // virtual inheritance warning
 #endif
 
 // standard
@@ -81,7 +82,8 @@
 #include <boost/filesystem/path.hpp>
 #include <boost/filesystem/operations.hpp>
 #include <boost/filesystem/exception.hpp>
-
+
+
 #include "InventorAll.h"
 #include "Qt4All.h"