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
XAO test fixed to work in salome test
[modules/geom.git]
/
src
/
GEOMImpl
/
GEOMImpl_EllipseDriver.cxx
diff --git
a/src/GEOMImpl/GEOMImpl_EllipseDriver.cxx
b/src/GEOMImpl/GEOMImpl_EllipseDriver.cxx
index 5f99502204159c2aac1edc062e83a6ef5b4baa86..291894b698b67ed549f815565e92ead4a9c1988a 100644
(file)
--- a/
src/GEOMImpl/GEOMImpl_EllipseDriver.cxx
+++ b/
src/GEOMImpl/GEOMImpl_EllipseDriver.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
5
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
6
CEA/DEN, EDF R&D, OPEN CASCADE
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-62,7
+62,7
@@
GEOMImpl_EllipseDriver::GEOMImpl_EllipseDriver()
//function : Execute
//purpose :
//=======================================================================
//function : Execute
//purpose :
//=======================================================================
-Standard_Integer GEOMImpl_EllipseDriver::Execute(
TFunction_Logbook
& log) const
+Standard_Integer GEOMImpl_EllipseDriver::Execute(
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());
@@
-154,7
+154,11
@@
Standard_Integer GEOMImpl_EllipseDriver::Execute(TFunction_Logbook& log) const
aFunction->SetValue(aShape);
aFunction->SetValue(aShape);
- log.SetTouched(Label());
+#if OCC_VERSION_MAJOR < 7
+ log.SetTouched(Label());
+#else
+ log->SetTouched(Label());
+#endif
return 1;
}
return 1;
}
@@
-192,5
+196,4
@@
GetCreationInformation(std::string& theOperationName,
return true;
}
return true;
}
-IMPLEMENT_STANDARD_HANDLE (GEOMImpl_EllipseDriver,GEOM_BaseDriver);
-IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_EllipseDriver,GEOM_BaseDriver);
+OCCT_IMPLEMENT_STANDARD_RTTIEXT (GEOMImpl_EllipseDriver,GEOM_BaseDriver);