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

16
src/Resource/Resource_Manager.cxx
View File

@@ -255,7 +255,7 @@ Standard_Boolean Resource_Manager::Save() const
TCollection_AsciiString aFilePath(dir);
OSD_Path anOSDPath(aFilePath);
OSD_Directory Dir = anOSDPath;
Standard_Boolean Status = Standard_True;
Standard_Boolean aStatus = Standard_True;
if ( !Dir.Exists() ) {
{
try {
@@ -263,11 +263,11 @@ Standard_Boolean Resource_Manager::Save() const
Dir.Build(OSD_Protection(OSD_RX, OSD_RWXD, OSD_RX, OSD_RX));
}
catch (Standard_Failure) {
Status = Standard_False;
aStatus = Standard_False;
}
}
Status = Status && !Dir.Failed();
if (!Status) {
aStatus = aStatus && !Dir.Failed();
if (!aStatus) {
if (myVerbose)
cout << "Resource Manager: Error opening or creating directory \"" << aFilePath
<< "\". Permission denied. Cannot save resources." << endl;
@@ -285,18 +285,18 @@ Standard_Boolean Resource_Manager::Save() const
OSD_File File = anOSDPath;
OSD_Protection theProt;
Status = Standard_True;
aStatus = Standard_True;
{
try {
OCC_CATCH_SIGNALS
File.Build(OSD_ReadWrite, theProt);
}
catch (Standard_Failure) {
Status = Standard_False;
aStatus = Standard_False;
}
}
Status = Status && !File.Failed();
if (!Status) {
aStatus = aStatus && !File.Failed();
if (!aStatus) {
if (myVerbose)
cout << "Resource Manager: Error opening or creating file \"" << aFilePath
<< "\". Permission denied. Cannot save resources." << endl;