OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-09-03 14:10:33 +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

11
src/Geom2dHatch/Geom2dHatch_Hatcher.hxx
View File

@@ -26,15 +26,14 @@
#include <TopAbs_Orientation.hxx>
#include <HatchGen_ErrorStatus.hxx>
class Standard_NoSuchObject;
class Standard_OutOfRange;
class StdFail_NotDone;
class Geom2dHatch_Intersector;
class Geom2dHatch_Element;
class Geom2dHatch_Hatching;
class HatchGen_PointOnHatching;
class HatchGen_Domain;
// resolve name collisions with X11 headers
#ifdef Status
#undef Status
#endif
class Geom2dHatch_Hatcher
{
public:

4
src/Geom2dHatch/Geom2dHatch_Hatching.cxx
View File

@@ -137,9 +137,9 @@ Standard_Boolean Geom2dHatch_Hatching::IsDone () const
// Purpose : Sets the error status.
//=======================================================================
void Geom2dHatch_Hatching::Status (const HatchGen_ErrorStatus Status)
void Geom2dHatch_Hatching::Status (const HatchGen_ErrorStatus theStatus)
{
myStatus = Status ;
myStatus = theStatus;
}
//=======================================================================

12
src/Geom2dHatch/Geom2dHatch_Hatching.hxx
View File

@@ -28,13 +28,13 @@
#include <HatchGen_Domains.hxx>
#include <Standard_Real.hxx>
#include <Standard_Integer.hxx>
class Standard_OutOfRange;
class Geom2dAdaptor_Curve;
class HatchGen_PointOnHatching;
class HatchGen_Domain;
class gp_Pnt2d;
// resolve name collisions with X11 headers
#ifdef Status
#undef Status
#endif
class Geom2dHatch_Hatching
{
@@ -76,7 +76,7 @@ public:
Standard_EXPORT Standard_Boolean IsDone() const;
//! Sets the error status.
Standard_EXPORT void Status (const HatchGen_ErrorStatus Status);
Standard_EXPORT void Status (const HatchGen_ErrorStatus theStatus);
//! Returns the error status.
Standard_EXPORT HatchGen_ErrorStatus Status() const;