Migration to OCCT 7.0

[modules/geom.git] / src / GEOM / GEOM_Solver.cxx

diff --git a/src/GEOM/GEOM_Solver.cxx b/src/GEOM/GEOM_Solver.cxx
index 81e97403b8329d194c5f31f123dd69b608e2f41c..2e6475362eb7560f97cf761c4f84aa4de4230c74 100644 (file)
--- a/src/GEOM/GEOM_Solver.cxx
+++ b/src/GEOM/GEOM_Solver.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2016  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
@@ -6,7 +6,7 @@
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
 // License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License, or (at your option) any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -56,15 +56,19 @@ bool GEOM_Solver::UpdateObject(Handle(GEOM_Object) theObject, TDF_LabelSequence&
 //=============================================================================  
 bool GEOM_Solver::ComputeFunction(Handle(GEOM_Function) theFunction)
 {
-  if(theFunction == NULL) return false;
+  if(theFunction.IsNull()) return false;
   Standard_GUID aGUID = theFunction->GetDriverGUID();
       
   Handle(TFunction_Driver) aDriver;
   if(!TFunction_DriverTable::Get()->FindDriver(aGUID, aDriver)) return false;
           
   aDriver->Init(theFunction->GetEntry());
-            
+
+#if OCC_VERSION_MAJOR < 7
   TFunction_Logbook aLog;
+#else
+  Handle(TFunction_Logbook) aLog = TFunction_Logbook::Set( aDriver->Label() );
+#endif
   if(aDriver->Execute(aLog) == 0) return false;
                 
   return true;