Salome HOME
projects
/
modules
/
geom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge V8_4_BR branch.
[modules/geom.git]
/
src
/
GEOMImpl
/
GEOMImpl_ChamferDriver.cxx
diff --git
a/src/GEOMImpl/GEOMImpl_ChamferDriver.cxx
b/src/GEOMImpl/GEOMImpl_ChamferDriver.cxx
index b8e4dd345aef7726471480d8f621195dba2f5499..cf7bd0cc67eef62492d6cbee18aed18fdcc8a2af 100644
(file)
--- a/
src/GEOMImpl/GEOMImpl_ChamferDriver.cxx
+++ b/
src/GEOMImpl/GEOMImpl_ChamferDriver.cxx
@@
-95,7
+95,7
@@
static Standard_Boolean isGoodForChamfer (const TopoDS_Shape& theShape)
//function : Execute
//purpose :
//=======================================================================
//function : Execute
//purpose :
//=======================================================================
-Standard_Integer GEOMImpl_ChamferDriver::Execute(
LOGBOOK
& log) const
+Standard_Integer GEOMImpl_ChamferDriver::Execute(
Handle(TFunction_Logbook)
& log) const
{
if (Label().IsNull()) return 0;
Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label());
{
if (Label().IsNull()) return 0;
Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label());
@@
-267,11
+267,7
@@
Standard_Integer GEOMImpl_ChamferDriver::Execute(LOGBOOK& log) const
aFunction->SetValue(aShape);
aFunction->SetValue(aShape);
-#if OCC_VERSION_MAJOR < 7
- log.SetTouched(Label());
-#else
log->SetTouched(Label());
log->SetTouched(Label());
-#endif
return 1;
}
return 1;
}
@@
-361,4
+357,4
@@
GetCreationInformation(std::string& theOperationName,
return true;
}
return true;
}
-
OCCT_
IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ChamferDriver,GEOM_BaseDriver);
+IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_ChamferDriver,GEOM_BaseDriver);