OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-21 10:13:43 +03:00
Code

0022330: Compilation errors from 'clang' on OS X

Browse Source
This commit is contained in:
VSV and APL 2011-08-18 07:36:01 +00:00 committed by bugmaster
parent cf8e963aff
commit 1057600a59
1 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/Visual3d/Visual3d_TransientManager.cxx
View File

@ -78,6 +78,9 @@ return theCView;
} }
#define theCView _theCView() #define theCView _theCView()
static Aspect_CLayer2d UnderCLayer;
static Aspect_CLayer2d OverCLayer;
// //
//-Constructors //-Constructors
// //
@ -113,18 +116,16 @@ Standard_Boolean Visual3d_TransientManager::BeginDraw (const Handle(Visual3d_Vie
Handle(Visual3d_Layer) OverLayer = AView->OverLayer (); Handle(Visual3d_Layer) OverLayer = AView->OverLayer ();
Handle(Visual3d_Layer) UnderLayer = AView->UnderLayer (); Handle(Visual3d_Layer) UnderLayer = AView->UnderLayer ();
Aspect_CLayer2d OverCLayer;
Aspect_CLayer2d UnderCLayer;
OverCLayer.ptrLayer = UnderCLayer.ptrLayer = NULL; OverCLayer.ptrLayer = UnderCLayer.ptrLayer = NULL;
theCView = *(CALL_DEF_VIEW *)AView->CView (); theCView = *(CALL_DEF_VIEW *)AView->CView ();
if (! UnderLayer.IsNull ()){ if (! UnderLayer.IsNull ()){
UnderCLayer = UnderLayer->CLayer (); UnderCLayer = UnderLayer->CLayer();
theCView.ptrUnderLayer = (CALL_DEF_LAYER *) &(UnderLayer->CLayer ()); theCView.ptrUnderLayer = (CALL_DEF_LAYER *) &UnderCLayer;
} }
if (! OverLayer.IsNull ()){ if (! OverLayer.IsNull ()){
OverCLayer = OverLayer->CLayer (); OverCLayer = OverLayer->CLayer();
theCView.ptrOverLayer = (CALL_DEF_LAYER *) &(OverLayer->CLayer ()); theCView.ptrOverLayer = (CALL_DEF_LAYER *) &OverCLayer;
} }
// Begin rendering // Begin rendering
@ -188,11 +189,14 @@ void Visual3d_TransientManager::ClearDraw (const Handle(Visual3d_View)& AView,
// Begin rendering // Begin rendering
theCView = *(CALL_DEF_VIEW *)AView->CView (); theCView = *(CALL_DEF_VIEW *)AView->CView ();
if (!AView->UnderLayer().IsNull()) if (!AView->UnderLayer().IsNull()) {
theCView.ptrUnderLayer = (CALL_DEF_LAYER *)&(AView->UnderLayer()->CLayer()); UnderCLayer = AView->UnderLayer()->CLayer();
if (!AView->OverLayer().IsNull()) theCView.ptrUnderLayer = (CALL_DEF_LAYER *) &UnderCLayer;
theCView.ptrOverLayer = (CALL_DEF_LAYER *)&(AView->OverLayer()->CLayer()); }
if (!AView->OverLayer().IsNull()) {
OverCLayer = AView->OverLayer()->CLayer();
theCView.ptrOverLayer = (CALL_DEF_LAYER *) &OverCLayer;
}
Handle(Aspect_GraphicDriver) agd = AView->GraphicDriver (); Handle(Aspect_GraphicDriver) agd = AView->GraphicDriver ();
theGraphicDriver = *(Handle(Graphic3d_GraphicDriver) *) &agd; theGraphicDriver = *(Handle(Graphic3d_GraphicDriver) *) &agd;
@ -228,11 +232,14 @@ Standard_Boolean Visual3d_TransientManager::BeginAddDraw (const Handle(Visual3d_
// Begin rendering // Begin rendering
theCView = *(CALL_DEF_VIEW *)AView->CView (); theCView = *(CALL_DEF_VIEW *)AView->CView ();
if (!AView->UnderLayer().IsNull()) if (!AView->UnderLayer().IsNull()) {
theCView.ptrUnderLayer = (CALL_DEF_LAYER *) &(AView->UnderLayer()->CLayer ()); UnderCLayer = AView->UnderLayer()->CLayer();
if (!AView->OverLayer().IsNull()) theCView.ptrUnderLayer = (CALL_DEF_LAYER *) &UnderCLayer;
theCView.ptrOverLayer = (CALL_DEF_LAYER *) &(AView->OverLayer()->CLayer ()); }
if (!AView->OverLayer().IsNull()) {
OverCLayer = AView->OverLayer()->CLayer();
theCView.ptrOverLayer = (CALL_DEF_LAYER *) &OverCLayer;
}
Handle(Aspect_GraphicDriver) agd = AView->GraphicDriver (); Handle(Aspect_GraphicDriver) agd = AView->GraphicDriver ();
theGraphicDriver = *(Handle(Graphic3d_GraphicDriver) *) &agd; theGraphicDriver = *(Handle(Graphic3d_GraphicDriver) *) &agd;