OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-04 13:13:25 +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

8
src/BRepOffsetAPI/BRepOffsetAPI_DraftAngle.hxx
View File

@@ -29,15 +29,15 @@
#include <Draft_ErrorStatus.hxx>
#include <BRepTools_ReShape.hxx>
class StdFail_NotDone;
class Standard_NullObject;
class Standard_NoSuchObject;
class Standard_ConstructionError;
class TopoDS_Shape;
class TopoDS_Face;
class gp_Dir;
class gp_Pln;
// resolve name collisions with X11 headers
#ifdef Status
#undef Status
#endif
//! Taper-adding transformations on a shape.
//! The resulting shape is constructed by defining one face

13
src/BRepOffsetAPI/BRepOffsetAPI_MakePipeShell.cxx
View File

@@ -172,29 +172,24 @@ void BRepOffsetAPI_MakePipeShell::Delete( const TopoDS_Shape& Profile)
//=======================================================================
BRepBuilderAPI_PipeError BRepOffsetAPI_MakePipeShell::GetStatus() const
{
BRepBuilderAPI_PipeError Status;
GeomFill_PipeError stat;
stat = myPipe->GetStatus();
switch (stat) {
case GeomFill_PipeOk :
{
Status = BRepBuilderAPI_PipeDone;
break;
return BRepBuilderAPI_PipeDone;
}
case GeomFill_PlaneNotIntersectGuide :
{
Status = BRepBuilderAPI_PlaneNotIntersectGuide;
break;
return BRepBuilderAPI_PlaneNotIntersectGuide;
}
case GeomFill_ImpossibleContact :
{
Status = BRepBuilderAPI_ImpossibleContact;
break;
return BRepBuilderAPI_ImpossibleContact;
}
default :
Status = BRepBuilderAPI_PipeNotDone;
return BRepBuilderAPI_PipeNotDone;
}
return Status;
}
//=======================================================================