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

12
src/IntAna/IntAna_IntQuadQuad.cxx
View File

@@ -1089,15 +1089,15 @@ Standard_Boolean IntAna_IntQuadQuad::HasNextCurve(const Standard_Integer I) cons
//purpose :
//=======================================================================
Standard_Integer IntAna_IntQuadQuad::PreviousCurve (const Standard_Integer I,
Standard_Boolean& Opposite) const
Standard_Boolean& theOpposite) const
{
if(HasPreviousCurve(I)) {
if(previouscurve[I-1]>0) {
Opposite = Standard_False;
theOpposite = Standard_False;
return(previouscurve[I-1]);
}
else {
Opposite = Standard_True;
theOpposite = Standard_True;
return( - previouscurve[I-1]);
}
}
@@ -1110,15 +1110,15 @@ Standard_Integer IntAna_IntQuadQuad::PreviousCurve (const Standard_Integer I,
//purpose :
//=======================================================================
Standard_Integer IntAna_IntQuadQuad::NextCurve (const Standard_Integer I,
Standard_Boolean& Opposite) const
Standard_Boolean& theOpposite) const
{
if(HasNextCurve(I)) {
if(nextcurve[I]>0) {
Opposite = Standard_False;
theOpposite = Standard_False;
return(nextcurve[I-1]);
}
else {
Opposite = Standard_True;
theOpposite = Standard_True;
return( - nextcurve[I-1]);
}
}

8
src/IntAna/IntAna_IntQuadQuad.hxx
View File

@@ -102,13 +102,13 @@ public:
//! If HasNextCurve(I) returns True, this function
//! returns the Index J of the curve which has a
//! common bound with the curve I. If Opposite ==
//! common bound with the curve I. If theOpposite ==
//! True , then the last parameter of the curve I, and
//! the last parameter of the curve J give the same
//! point. Else the last parameter of the curve I and
//! the first parameter of the curve J are the same
//! point.
Standard_EXPORT Standard_Integer NextCurve (const Standard_Integer I, Standard_Boolean& Opposite) const;
Standard_EXPORT Standard_Integer NextCurve (const Standard_Integer I, Standard_Boolean& theOpposite) const;
//! Returns True if the Curve I shares its first bound
//! with another curve.
@@ -116,13 +116,13 @@ public:
//! if HasPreviousCurve(I) returns True, this function
//! returns the Index J of the curve which has a
//! common bound with the curve I. If Opposite ==
//! common bound with the curve I. If theOpposite ==
//! True , then the first parameter of the curve I,
//! and the first parameter of the curve J give the
//! same point. Else the first parameter of the curve
//! I and the last parameter of the curve J are the
//! same point.
Standard_EXPORT Standard_Integer PreviousCurve (const Standard_Integer I, Standard_Boolean& Opposite) const;
Standard_EXPORT Standard_Integer PreviousCurve (const Standard_Integer I, Standard_Boolean& theOpposite) const;