OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-09 13:22:24 +03:00
Code Activity

0028838: Configuration - undefine macros coming from X11 headers in place of collision

Browse Source 
The macros Status, Convex, Opposite, FillSolid (coming from X11 headers)
are now undefined in place of definition of methods with same name in OCCT headers.
The usage of variables with name Status is now avoided.

GL_GLEXT_LEGACY is now defined only if not already defined.

The macros AddPrinter (coming from WinAPI headers) is now undefined
within Message_Messenger class definition having method with the same name.
CurrentDirectory macro is now undefined in OSD_Process.hxx.
This commit is contained in:
kgv
2017-02-03 23:27:02 +04:00
committed by bugmaster
parent e3d02d1f84
commit 9fd2d2c382
103 changed files with 598 additions and 482 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/ShapeFix/ShapeFix_ComposeShell.hxx
View File

@@ -35,14 +35,15 @@
#include <TopTools_SequenceOfShape.hxx>
class ShapeExtend_CompositeSurface;
class ShapeAnalysis_TransferParameters;
class TopLoc_Location;
class TopoDS_Face;
class TopoDS_Shape;
class ShapeExtend_WireData;
class gp_Lin2d;
class ShapeFix_WireSegment;
class Geom_Surface;
// resolve name collisions with X11 headers
#ifdef Status
#undef Status
#endif
class ShapeFix_ComposeShell;
DEFINE_STANDARD_HANDLE(ShapeFix_ComposeShell, ShapeFix_Root)

5
src/ShapeFix/ShapeFix_Edge.hxx
View File

@@ -33,6 +33,11 @@ class TopLoc_Location;
class ShapeAnalysis_Surface;
class ShapeBuild_ReShape;
// resolve name collisions with X11 headers
#ifdef Status
#undef Status
#endif
class ShapeFix_Edge;
DEFINE_STANDARD_HANDLE(ShapeFix_Edge, MMgt_TShared)

5
src/ShapeFix/ShapeFix_Face.hxx
View File

@@ -32,13 +32,16 @@
#include <ShapeExtend_Status.hxx>
class ShapeAnalysis_Surface;
class ShapeFix_Wire;
class TopoDS_Face;
class Geom_Surface;
class ShapeExtend_BasicMsgRegistrator;
class TopoDS_Wire;
class ShapeExtend_WireData;
class TopoDS_Vertex;
// resolve name collisions with X11 headers
#ifdef Status
#undef Status
#endif
class ShapeFix_Face;
DEFINE_STANDARD_HANDLE(ShapeFix_Face, ShapeFix_Root)

5
src/ShapeFix/ShapeFix_Shape.hxx
View File

@@ -31,7 +31,6 @@
#include <Message_ProgressIndicator.hxx>
class ShapeFix_Solid;
class TopoDS_Shape;
class Message_ProgressIndicator;
class ShapeFix_Shell;
class ShapeFix_Face;
@@ -39,6 +38,10 @@ class ShapeFix_Wire;
class ShapeFix_Edge;
class ShapeExtend_BasicMsgRegistrator;
// resolve name collisions with X11 headers
#ifdef Status
#undef Status
#endif
class ShapeFix_Shape;
DEFINE_STANDARD_HANDLE(ShapeFix_Shape, ShapeFix_Root)

8
src/ShapeFix/ShapeFix_Shell.hxx
View File

@@ -26,11 +26,13 @@
#include <ShapeExtend_Status.hxx>
class ShapeFix_Face;
class TopoDS_Shell;
class TopoDS_Shape;
class TopoDS_Compound;
class ShapeExtend_BasicMsgRegistrator;
// resolve name collisions with X11 headers
#ifdef Status
#undef Status
#endif
class ShapeFix_Shell;
DEFINE_STANDARD_HANDLE(ShapeFix_Shell, ShapeFix_Root)

5
src/ShapeFix/ShapeFix_Solid.hxx
View File

@@ -30,9 +30,12 @@ class ShapeFix_Shell;
class TopoDS_Solid;
class Message_ProgressIndicator;
class TopoDS_Shell;
class TopoDS_Shape;
class ShapeExtend_BasicMsgRegistrator;
// resolve name collisions with X11 headers
#ifdef Status
#undef Status
#endif
class ShapeFix_Solid;
DEFINE_STANDARD_HANDLE(ShapeFix_Solid, ShapeFix_Root)