From 2ef7af2eadff0990aa3e9dc0f222cda649364592 Mon Sep 17 00:00:00 2001 From: wmayer Date: Thu, 24 Mar 2022 21:02:01 +0100 Subject: [PATCH] Part: include header with export macros --- src/Mod/Part/App/BRepOffsetAPI_MakeOffsetFix.h | 1 + src/Mod/Part/App/CrossSection.h | 1 + src/Mod/Part/App/ExtrusionHelper.h | 1 + src/Mod/Part/App/FaceMaker.h | 1 + src/Mod/Part/App/GeometryExtension.h | 1 + src/Mod/Part/App/ImportIges.h | 1 + src/Mod/Part/App/ImportStep.h | 1 + src/Mod/Part/App/OCCError.h | 1 + src/Mod/Part/App/PreCompiled.h | 11 +---------- src/Mod/Part/App/PrismExtension.h | 1 + src/Mod/Part/App/ProgressIndicator.h | 1 + src/Mod/Part/App/edgecluster.h | 1 + src/Mod/Part/App/modelRefine.h | 1 + src/Mod/Part/Gui/PreCompiled.h | 18 ++++-------------- src/Mod/Part/Gui/SoBrepEdgeSet.h | 1 + src/Mod/Part/Gui/SoBrepFaceSet.h | 1 + src/Mod/Part/Gui/SoBrepPointSet.h | 1 + src/Mod/Part/Gui/SoFCShapeObject.h | 1 + src/Mod/Part/Gui/ViewProviderAttachExtension.h | 1 + src/Mod/Part/Gui/Workbench.h | 1 + src/Mod/Part/PartGlobal.h | 8 ++++++-- 21 files changed, 29 insertions(+), 26 deletions(-) diff --git a/src/Mod/Part/App/BRepOffsetAPI_MakeOffsetFix.h b/src/Mod/Part/App/BRepOffsetAPI_MakeOffsetFix.h index 5eff7dd25b..b09e1018b5 100644 --- a/src/Mod/Part/App/BRepOffsetAPI_MakeOffsetFix.h +++ b/src/Mod/Part/App/BRepOffsetAPI_MakeOffsetFix.h @@ -24,6 +24,7 @@ #ifndef PART_BREPOFFSETAPI_MAKEOFFSETFIX_H #define PART_BREPOFFSETAPI_MAKEOFFSETFIX_H +#include #include #include #include diff --git a/src/Mod/Part/App/CrossSection.h b/src/Mod/Part/App/CrossSection.h index 309509bf90..c8ee35e567 100644 --- a/src/Mod/Part/App/CrossSection.h +++ b/src/Mod/Part/App/CrossSection.h @@ -24,6 +24,7 @@ #ifndef PART_CROSSSECTION_H #define PART_CROSSSECTION_H +#include #include #include diff --git a/src/Mod/Part/App/ExtrusionHelper.h b/src/Mod/Part/App/ExtrusionHelper.h index 8930b3f7c6..ab455320fc 100644 --- a/src/Mod/Part/App/ExtrusionHelper.h +++ b/src/Mod/Part/App/ExtrusionHelper.h @@ -28,6 +28,7 @@ #include #include #include +#include namespace Part { diff --git a/src/Mod/Part/App/FaceMaker.h b/src/Mod/Part/App/FaceMaker.h index bf18897bce..dc21eeab85 100644 --- a/src/Mod/Part/App/FaceMaker.h +++ b/src/Mod/Part/App/FaceMaker.h @@ -30,6 +30,7 @@ #include #include +#include namespace Part { diff --git a/src/Mod/Part/App/GeometryExtension.h b/src/Mod/Part/App/GeometryExtension.h index 6ea307b28c..afd6586628 100644 --- a/src/Mod/Part/App/GeometryExtension.h +++ b/src/Mod/Part/App/GeometryExtension.h @@ -25,6 +25,7 @@ #define PART_GEOMETRYEXTENSION_H #include +#include #include #include diff --git a/src/Mod/Part/App/ImportIges.h b/src/Mod/Part/App/ImportIges.h index c527d8be03..ebc40e57d5 100644 --- a/src/Mod/Part/App/ImportIges.h +++ b/src/Mod/Part/App/ImportIges.h @@ -24,6 +24,7 @@ #ifndef PART_IMPORT_IGES_H #define PART_IMPORT_IGES_H +#include #include namespace App { diff --git a/src/Mod/Part/App/ImportStep.h b/src/Mod/Part/App/ImportStep.h index 4d736cf0c1..65b7f4148d 100644 --- a/src/Mod/Part/App/ImportStep.h +++ b/src/Mod/Part/App/ImportStep.h @@ -27,6 +27,7 @@ #define _ImportStep_h_ #include +#include #include namespace App { diff --git a/src/Mod/Part/App/OCCError.h b/src/Mod/Part/App/OCCError.h index 411641858a..19e8208179 100644 --- a/src/Mod/Part/App/OCCError.h +++ b/src/Mod/Part/App/OCCError.h @@ -54,6 +54,7 @@ # include # include +#include #include #include #include diff --git a/src/Mod/Part/App/PreCompiled.h b/src/Mod/Part/App/PreCompiled.h index db8239d08b..e6cf1ef526 100644 --- a/src/Mod/Part/App/PreCompiled.h +++ b/src/Mod/Part/App/PreCompiled.h @@ -26,16 +26,7 @@ #include - -// Exporting of App classes -#ifdef FC_OS_WIN32 -# define PartExport __declspec(dllexport) -#else // for Linux -# define PartExport -#endif - -//needed to make autogenerated Py interface source code to compile -#define AttacherExport PartExport +#include // here get the warnings of too long specifiers disabled (needed for VC6) #ifdef _MSC_VER diff --git a/src/Mod/Part/App/PrismExtension.h b/src/Mod/Part/App/PrismExtension.h index 42294ddde3..dcebae0fcf 100644 --- a/src/Mod/Part/App/PrismExtension.h +++ b/src/Mod/Part/App/PrismExtension.h @@ -23,6 +23,7 @@ #ifndef PART_PRISM_EXTENSION_H #define PART_PRISM_EXTENSION_H +#include #include #include #include diff --git a/src/Mod/Part/App/ProgressIndicator.h b/src/Mod/Part/App/ProgressIndicator.h index ad34d2ee5e..f9221fff22 100644 --- a/src/Mod/Part/App/ProgressIndicator.h +++ b/src/Mod/Part/App/ProgressIndicator.h @@ -27,6 +27,7 @@ #include #include #include +#include #include namespace Part { diff --git a/src/Mod/Part/App/edgecluster.h b/src/Mod/Part/App/edgecluster.h index 10f108aedb..dcc9a2b417 100644 --- a/src/Mod/Part/App/edgecluster.h +++ b/src/Mod/Part/App/edgecluster.h @@ -24,6 +24,7 @@ #ifndef PART_EDGECLUSTER_H #define PART_EDGECLUSTER_H +#include #include #include #include diff --git a/src/Mod/Part/App/modelRefine.h b/src/Mod/Part/App/modelRefine.h index 8efa1271bb..5ba8e6a950 100644 --- a/src/Mod/Part/App/modelRefine.h +++ b/src/Mod/Part/App/modelRefine.h @@ -38,6 +38,7 @@ #include #include #include +#include namespace ModelRefine diff --git a/src/Mod/Part/Gui/PreCompiled.h b/src/Mod/Part/Gui/PreCompiled.h index 3b2b7b46d7..1eabcbbde6 100644 --- a/src/Mod/Part/Gui/PreCompiled.h +++ b/src/Mod/Part/Gui/PreCompiled.h @@ -26,20 +26,7 @@ #include -// Importing of App classes -#ifdef FC_OS_WIN32 -# define PartExport __declspec(dllimport) -# define PartGuiExport __declspec(dllexport) -#else // for Linux -# define PartExport -# define PartGuiExport -#endif - -#ifdef FC_OS_WIN32 -# ifndef NOMINMAX -# define NOMINMAX -# endif -#endif +#include // here get the warnings of too long specifiers disabled (needed for VC6) #ifdef _MSC_VER @@ -50,6 +37,9 @@ #endif #ifdef FC_OS_WIN32 +# ifndef NOMINMAX +# define NOMINMAX +# endif # include #endif diff --git a/src/Mod/Part/Gui/SoBrepEdgeSet.h b/src/Mod/Part/Gui/SoBrepEdgeSet.h index ca1c65fd2b..aad298b186 100644 --- a/src/Mod/Part/Gui/SoBrepEdgeSet.h +++ b/src/Mod/Part/Gui/SoBrepEdgeSet.h @@ -34,6 +34,7 @@ #include #include #include +#include class SoCoordinateElement; class SoGLCoordinateElement; diff --git a/src/Mod/Part/Gui/SoBrepFaceSet.h b/src/Mod/Part/Gui/SoBrepFaceSet.h index 749423fd68..8e89c4c81f 100644 --- a/src/Mod/Part/Gui/SoBrepFaceSet.h +++ b/src/Mod/Part/Gui/SoBrepFaceSet.h @@ -34,6 +34,7 @@ #include #include #include +#include class SoGLCoordinateElement; class SoTextureCoordinateBundle; diff --git a/src/Mod/Part/Gui/SoBrepPointSet.h b/src/Mod/Part/Gui/SoBrepPointSet.h index cdfa1bdb1d..84c256ab20 100644 --- a/src/Mod/Part/Gui/SoBrepPointSet.h +++ b/src/Mod/Part/Gui/SoBrepPointSet.h @@ -34,6 +34,7 @@ #include #include #include +#include class SoCoordinateElement; class SoGLCoordinateElement; diff --git a/src/Mod/Part/Gui/SoFCShapeObject.h b/src/Mod/Part/Gui/SoFCShapeObject.h index 1c6f4cb30d..aaa4679c0b 100644 --- a/src/Mod/Part/Gui/SoFCShapeObject.h +++ b/src/Mod/Part/Gui/SoFCShapeObject.h @@ -29,6 +29,7 @@ #include #include #include +#include namespace PartGui { diff --git a/src/Mod/Part/Gui/ViewProviderAttachExtension.h b/src/Mod/Part/Gui/ViewProviderAttachExtension.h index fb19a7e5b6..1669235c12 100644 --- a/src/Mod/Part/Gui/ViewProviderAttachExtension.h +++ b/src/Mod/Part/Gui/ViewProviderAttachExtension.h @@ -26,6 +26,7 @@ #include #include +#include namespace PartGui { diff --git a/src/Mod/Part/Gui/Workbench.h b/src/Mod/Part/Gui/Workbench.h index 2296380951..50dbeb1b99 100644 --- a/src/Mod/Part/Gui/Workbench.h +++ b/src/Mod/Part/Gui/Workbench.h @@ -25,6 +25,7 @@ #define PART_WORKBENCH_H #include +#include namespace PartGui { diff --git a/src/Mod/Part/PartGlobal.h b/src/Mod/Part/PartGlobal.h index a6d29ec10c..d6d6cb773b 100644 --- a/src/Mod/Part/PartGlobal.h +++ b/src/Mod/Part/PartGlobal.h @@ -29,12 +29,16 @@ // Part #ifndef PartExport #ifdef Part_EXPORTS -# define PartExport FREECAD_DECL_EXPORT +# define PartExport FREECAD_DECL_EXPORT #else -# define PartExport FREECAD_DECL_IMPORT +# define PartExport FREECAD_DECL_IMPORT #endif #endif +#ifndef AttacherExport +#define AttacherExport PartExport +#endif + // PartGui #ifndef PartGuiExport #ifdef PartGui_EXPORTS