mirror of
https://git.dev.opencascade.org/repos/occt.git
synced 2025-08-09 13:22:24 +03:00
0028838: Configuration - undefine macros coming from X11 headers in place of collision
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:
@@ -91,11 +91,11 @@ void CDM_Application::BeginOfUpdate (const Handle(CDM_Document)& aDocument)
|
||||
|
||||
void CDM_Application::EndOfUpdate
|
||||
(const Handle(CDM_Document)& aDocument,
|
||||
const Standard_Boolean Status,
|
||||
const Standard_Boolean theStatus,
|
||||
const TCollection_ExtendedString& /*ErrorString*/)
|
||||
{
|
||||
TCollection_ExtendedString message;
|
||||
if (Status)
|
||||
if (theStatus)
|
||||
message="Updated:";
|
||||
else
|
||||
message="Error during updating:";
|
||||
|
@@ -55,7 +55,7 @@ public:
|
||||
|
||||
//! this method is called affter the update of a document.
|
||||
//! By default, writes in MessageDriver().
|
||||
Standard_EXPORT virtual void EndOfUpdate (const Handle(CDM_Document)& aDocument, const Standard_Boolean Status, const TCollection_ExtendedString& ErrorString);
|
||||
Standard_EXPORT virtual void EndOfUpdate (const Handle(CDM_Document)& aDocument, const Standard_Boolean theStatus, const TCollection_ExtendedString& ErrorString);
|
||||
|
||||
//! writes the string in the application MessagerDriver.
|
||||
Standard_EXPORT void Write (const Standard_ExtString aString);
|
||||
|
Reference in New Issue
Block a user