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

6
src/QABugs/QABugs_18.cxx
View File

@@ -152,7 +152,7 @@ static Standard_Integer OCC367 (Draw_Interpretor& di, Standard_Integer argc, con
Standard_Real goodY = Draw::Atof(argv[4]);
Standard_Real goodZ = Draw::Atof(argv[5]);
Standard_Real percent = Draw::Atof(argv[6]);
Standard_Boolean Status = Standard_False;
Standard_Boolean aStatus = Standard_False;
// Find the first vertex of the wire
BRepTools_WireExplorer wire_exp(myTopoDSWire);
@@ -221,14 +221,14 @@ static Standard_Integer OCC367 (Draw_Interpretor& di, Standard_Integer argc, con
deltaY = delta_percent(FirstEdgeY, goodY);
deltaZ = delta_percent(FirstEdgeZ, goodZ);
if (deltaX <= percent && deltaY <= percent && deltaZ <= percent) {
Status = Standard_True;
aStatus = Standard_True;
}
}
}
}
di << "\n\nFirstEdge = " << FirstEdgeX <<" " << FirstEdgeY <<" " << FirstEdgeZ << "\n";
di << "deltaX = " << deltaX << " deltaY = " << deltaY << " deltaZ = " << deltaZ << "\n";
if (Status) {
if (aStatus) {
di << argv[0] << " : OK\n";
} else {
di << argv[0] << " : ERROR\n";

2
src/QABugs/QABugs_20.cxx
View File

@@ -1281,7 +1281,7 @@ namespace AllocTest
// The test is based of occupying of all available virtual memory.
// Obviously it has no sense on 64-bit platforms.
enum Status
enum AllocTestStatus
{
NotApplicable = 0x1,
OUMCatchOK = 0x2,