diff --git a/src/App/DocumentObjectGroup.h b/src/App/DocumentObjectGroup.h index 42a4dd148014..c771ec9390c0 100644 --- 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 index 7b59f2108e21..6c6545ae0e1e 100644 --- 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 //namespace po = boost::program_options; -#include -#include -#include +#include +#include +#include + - #endif //_PreComp_ #endif // APP_PRECOMPILED_H diff --git a/src/Gui/PreCompiled.h b/src/Gui/PreCompiled.h index 23e7b317920c..9bd09593ea68 100644 --- a/src/Gui/PreCompiled.h +++ b/src/Gui/PreCompiled.h @@ -25,7 +25,7 @@ #define GUI_PRECOMPILED_H #include - + #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 #include #include - + + #include "InventorAll.h" #include "Qt4All.h"