in forward declaration replace class keyword when struct is expected

comment out unused parameters
This commit is contained in:
wmayer
2016-12-29 17:52:39 +01:00
parent 35b76c5205
commit 3114df352d
18 changed files with 54 additions and 42 deletions

View File

@@ -481,6 +481,9 @@ eRefType AttachEngine::getShapeType(const TopoDS_Shape& sh)
case GeomAbs_BezierCurve:
case GeomAbs_BSplineCurve:
case GeomAbs_OtherCurve:
#if OCC_VERSION_HEX >= 0x070000
case GeomAbs_OffsetCurve:
#endif
return rtCurve;
}
}break;

View File

@@ -398,7 +398,7 @@ bool GeomCurve::closestParameterToBasicCurve(const Base::Vector3d& point, double
if (c->IsKind(STANDARD_TYPE(Geom_TrimmedCurve))){
Handle_Geom_TrimmedCurve tc = Handle_Geom_TrimmedCurve::DownCast(handle());
Handle_Geom_Curve bc = Handle_Geom_Curve::DownCast(tc->BasisCurve());
Handle_Geom_Curve bc = tc->BasisCurve();
try {
if (!bc.IsNull()) {
gp_Pnt pnt(point.x,point.y,point.z);

View File

@@ -309,7 +309,7 @@ bool Geom2dCurve::closestParameterToBasicCurve(const Base::Vector2d& point, doub
if (c->IsKind(STANDARD_TYPE(Geom2d_TrimmedCurve))){
Handle_Geom2d_TrimmedCurve tc = Handle_Geom2d_TrimmedCurve::DownCast(handle());
Handle_Geom2d_Curve bc = Handle_Geom2d_Curve::DownCast(tc->BasisCurve());
Handle_Geom2d_Curve bc = tc->BasisCurve();
try {
if (!bc.IsNull()) {
gp_Pnt2d pnt(point.x,point.y);

View File

@@ -233,6 +233,7 @@ int Part::ImportStepParts(App::Document *pcDoc, const char* Name)
return 0;
}
#if OCC_VERSION_HEX < 0x070000
static void findStyledSR (const Handle(StepVisual_StyledItem) &style,
Handle(StepShape_ShapeRepresentation)& aSR)
{
@@ -251,10 +252,13 @@ static void findStyledSR (const Handle(StepVisual_StyledItem) &style,
break;
}
}
#endif
bool Part::ReadColors (const Handle(XSControl_WorkSession) &WS, std::map<int, Quantity_Color>& hash_col)
{
#if OCC_VERSION_HEX >= 0x070000
(void)WS;
(void)hash_col;
return Standard_False;
#else
STEPConstruct_Styles Styles (WS);
@@ -387,6 +391,7 @@ bool Part::ReadColors (const Handle(XSControl_WorkSession) &WS, std::map<int, Qu
bool Part::ReadNames (const Handle(XSControl_WorkSession) &WS)
{
#if OCC_VERSION_HEX >= 0x070000
(void)WS;
return Standard_False;
#else
// get starting data