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 C++ part of kleontev/38044_auto_repair
[modules/geom.git]
/
src
/
GEOM
/
GEOM_Function.cxx
diff --git
a/src/GEOM/GEOM_Function.cxx
b/src/GEOM/GEOM_Function.cxx
index 5c0bb896a3c407fb474eaf49c1475951be3d8ad1..53731e11f768661e8a49d12c84d7d4820406b7b3 100644
(file)
--- a/
src/GEOM/GEOM_Function.cxx
+++ b/
src/GEOM/GEOM_Function.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
16 CEA/DEN, EDF R&D
, OPEN CASCADE
+// Copyright (C) 2007-20
24 CEA, EDF
, 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
@@
-27,8
+27,6
@@
#include <GEOM_Solver.hxx>
#include <GEOM_ISubShape.hxx>
#include <GEOM_Solver.hxx>
#include <GEOM_ISubShape.hxx>
-#include <Basics_OCCTVersion.hxx>
-
#include "utilities.h"
#include <TDF.hxx>
#include "utilities.h"
#include <TDF.hxx>
@@
-250,9
+248,8
@@
TopoDS_Shape GEOM_Function::GetValue()
return aShape;
}
}
return aShape;
}
}
- catch (Standard_Failure) {
- Handle(Standard_Failure) aFail = Standard_Failure::Caught();
- MESSAGE("GEOM_Function::GetValue Error: " << aFail->GetMessageString());
+ catch (Standard_Failure& aFail) {
+ MESSAGE("GEOM_Function::GetValue Error: " << aFail.GetMessageString());
return aShape;
}
}
return aShape;
}
}
@@
-980,4
+977,4
@@
void* GEOM_Function::GetCallBackData()
return reinterpret_cast<void*> ( address );
}
return reinterpret_cast<void*> ( address );
}
-OCCT_IMPLEMENT_STANDARD_RTTIEXT(GEOM_Function, Standard_Transient );
+IMPLEMENT_STANDARD_RTTIEXT(GEOM_Function, Standard_Transient )