occt: master 9fd2d2c3

Author Committer Branch Timestamp Parent
kgv bugmaster master 2017-02-03 19:27:02 master e3d02d1f
Affected Issues  0028838: Configuration - undefine macros coming from X11 headers in place of collision
Changeset 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.
mod - src/BRepFeat/BRepFeat_MakeCylindricalHole.hxx Diff File
mod - src/BRepFilletAPI/BRepFilletAPI_MakeFillet2d.hxx Diff File
mod - src/BRepOffset/BRepOffset.cxx Diff File
mod - src/BRepOffset/BRepOffset.hxx Diff File
mod - src/BRepOffset/BRepOffset_Offset.hxx Diff File
mod - src/BRepOffsetAPI/BRepOffsetAPI_DraftAngle.hxx Diff File
mod - src/BRepOffsetAPI/BRepOffsetAPI_MakePipeShell.cxx Diff File
mod - src/BRepTools/BRepTools_ReShape.hxx Diff File
mod - src/BRepTopAdaptor/BRepTopAdaptor_FClass2d.cxx Diff File
mod - src/BSplCLib/BSplCLib.hxx Diff File
mod - src/BSplCLib/BSplCLib_2.cxx Diff File
mod - src/BSplCLib/BSplCLib_CurveComputation.gxx Diff File
mod - src/BSplSLib/BSplSLib.cxx Diff File
mod - src/BSplSLib/BSplSLib.hxx Diff File
mod - src/CDM/CDM_Application.cxx Diff File
mod - src/CDM/CDM_Application.hxx Diff File
mod - src/ChFi2d/ChFi2d_Builder.hxx Diff File
mod - src/ChFiDS/ChFiDS_Spine.hxx Diff File
mod - src/CSLib/CSLib.cxx Diff File
mod - src/CSLib/CSLib.hxx Diff File
mod - src/DNaming/DNaming.cxx Diff File
mod - src/DNaming/DNaming.hxx Diff File
mod - src/DNaming/DNaming_BasicCommands.cxx Diff File
mod - src/FairCurve/FairCurve_EnergyOfBatten.hxx Diff File
mod - src/FairCurve/FairCurve_EnergyOfMVC.hxx Diff File
mod - src/GC/GC_Root.hxx Diff File
mod - src/gce/gce_Root.hxx Diff File
mod - src/GCE2d/GCE2d_Root.hxx Diff File
mod - src/Geom2dConvert/Geom2dConvert.cxx Diff File
mod - src/Geom2dHatch/Geom2dHatch_Hatcher.hxx Diff File
mod - src/Geom2dHatch/Geom2dHatch_Hatching.cxx Diff File
mod - src/Geom2dHatch/Geom2dHatch_Hatching.hxx Diff File
mod - src/GeomConvert/GeomConvert.cxx Diff File
mod - src/HLRBRep/HLRBRep_EdgeData.hxx Diff File
mod - src/HLRBRep/HLRBRep_PolyAlgo.cxx Diff File
mod - src/IGESSelect/IGESSelect_SelectSubordinate.hxx Diff File
mod - src/IntAna/IntAna_IntQuadQuad.cxx Diff File
mod - src/IntAna/IntAna_IntQuadQuad.hxx Diff File
mod - src/IntCurve/IntCurve_IntConicConic_1.cxx Diff File
mod - src/Interface/Interface_Check.hxx Diff File
mod - src/Interface/Interface_CheckIterator.hxx Diff File
mod - src/Interface/Interface_Graph.hxx Diff File
mod - src/InterfaceGraphic/InterfaceGraphic.hxx Diff File
mod - src/IntTools/IntTools_FClass2d.cxx Diff File
mod - src/IntWalk/IntWalk_IWalking_3.gxx Diff File
mod - src/IntWalk/IntWalk_IWalking_4.gxx Diff File
mod - src/IntWalk/IntWalk_IWalking_5.gxx Diff File
mod - src/IntWalk/IntWalk_PWalking.cxx Diff File
mod - src/LProp/LProp_SLProps.gxx Diff File
mod - src/math/math_IntegerVector.hxx Diff File
mod - src/math/math_Matrix.hxx Diff File
mod - src/math/math_Vector.hxx Diff File
mod - src/MeshTest/MeshTest.cxx Diff File
mod - src/Message/Message_Messenger.hxx Diff File
mod - src/OpenGl/OpenGl_GlFunctions.hxx Diff File
mod - src/OSD/OSD_Process.cxx Diff File
mod - src/OSD/OSD_Process.hxx Diff File
mod - src/QABugs/QABugs_18.cxx Diff File
mod - src/QABugs/QABugs_20.cxx Diff File
mod - src/QADNaming/QADNaming.cxx Diff File
mod - src/QADNaming/QADNaming.hxx Diff File
mod - src/QADNaming/QADNaming_BasicCommands.cxx Diff File
mod - src/Resource/Resource_Manager.cxx Diff File
mod - src/SelectMgr/SelectMgr_ViewerSelector.hxx Diff File
mod - src/ShapeAnalysis/ShapeAnalysis_BoxBndTree.hxx Diff File
mod - src/ShapeAnalysis/ShapeAnalysis_CheckSmallFace.hxx Diff File
mod - src/ShapeAnalysis/ShapeAnalysis_Edge.hxx Diff File
mod - src/ShapeAnalysis/ShapeAnalysis_Wire.hxx Diff File
mod - src/ShapeAnalysis/ShapeAnalysis_WireOrder.hxx Diff File
mod - src/ShapeAnalysis/ShapeAnalysis_WireVertex.hxx Diff File
mod - src/ShapeBuild/ShapeBuild_ReShape.hxx Diff File
mod - src/ShapeConstruct/ShapeConstruct_ProjectCurveOnSurface.cxx Diff File
mod - src/ShapeConstruct/ShapeConstruct_ProjectCurveOnSurface.hxx Diff File
mod - src/ShapeFix/ShapeFix_ComposeShell.hxx Diff File
mod - src/ShapeFix/ShapeFix_Edge.hxx Diff File
mod - src/ShapeFix/ShapeFix_Face.hxx Diff File
mod - src/ShapeFix/ShapeFix_Shape.hxx Diff File
mod - src/ShapeFix/ShapeFix_Shell.hxx Diff File
mod - src/ShapeFix/ShapeFix_Solid.hxx Diff File
mod - src/ShapeUpgrade/ShapeUpgrade_FaceDivide.hxx Diff File
mod - src/ShapeUpgrade/ShapeUpgrade_FixSmallCurves.hxx Diff File
mod - src/ShapeUpgrade/ShapeUpgrade_RemoveInternalWires.hxx Diff File
mod - src/ShapeUpgrade/ShapeUpgrade_ShapeDivide.hxx Diff File
mod - src/ShapeUpgrade/ShapeUpgrade_SplitCurve.hxx Diff File
mod - src/ShapeUpgrade/ShapeUpgrade_SplitSurface.hxx Diff File
mod - src/ShapeUpgrade/ShapeUpgrade_WireDivide.hxx Diff File
mod - src/StepBasic/StepBasic_ApplicationProtocolDefinition.hxx Diff File
mod - src/StepBasic/StepBasic_Approval.hxx Diff File
mod - src/StlTransfer/StlTransfer.cxx Diff File
mod - src/TNaming/TNaming_NamedShape.cxx Diff File
mod - src/TopoDS/TopoDS_Shape.hxx Diff File
mod - src/TopoDS/TopoDS_TShape.hxx Diff File
mod - src/TopoDS/TopoDS_TVertex.hxx Diff File
mod - src/TopOpeBRep/TopOpeBRep_Point2d.hxx Diff File
mod - src/TopOpeBRepBuild/FILES Diff File
mod - src/TopOpeBRepBuild/TopOpeBRepBuild_Builder.cxx Diff File
mod - src/TopOpeBRepBuild/TopOpeBRepBuild_Builder.hxx Diff File
mod - src/Transfer/Transfer_Binder.hxx Diff File
mod - src/Transfer/Transfer_TransferIterator.hxx Diff File
mod - src/VrmlConverter/VrmlConverter_ShadedShape.cxx Diff File
mod - src/VrmlData/VrmlData_Scene.hxx Diff File