Porting to OCCT 7.4.1 dev

[modules/geom.git] / src / GEOMBase / GEOM_GenericObjPtr.h

diff --git a/src/GEOMBase/GEOM_GenericObjPtr.h b/src/GEOMBase/GEOM_GenericObjPtr.h
index b4ece1236a6295b2f3951bee9dd11e4d8e1a661c..6f78a6e30b345e54bf0435d86d019e01f728cdfe 100644 (file)
--- a/src/GEOMBase/GEOM_GenericObjPtr.h
+++ b/src/GEOMBase/GEOM_GenericObjPtr.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2020  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
@@ -57,7 +57,7 @@ namespace GEOM
     object that should be removed by the caller as soon as the object is no more required.
     For example, function GetSubShape() of the GEOM_IShapesOperation interface always creates
     new servant object and returns new object reference to it. If the object is not published
-    in the study, it has to be destroyed and the coresponding servant should be deleted.
+    in the study, it has to be destroyed and the corresponding servant should be deleted.
     
     Examples:
     \code
@@ -87,15 +87,15 @@ namespace GEOM
     void Register()
     {
       if ( !CORBA::is_nil( this->myObject ) )
-       this->myObject->Register();
+        this->myObject->Register();
     }
 
     //! Decrement counter for the object.
     void UnRegister()
     {
       if ( !CORBA::is_nil( this->myObject ) ) {
-       this->myObject->UnRegister();
-       this->myObject = TInterface::_nil();
+        this->myObject->UnRegister();
+        this->myObject = TInterface::_nil();
       }
     }
       
@@ -216,6 +216,7 @@ namespace GEOM
   };
   
   typedef GenericObjPtr<GEOM::GEOM_Object>               GeomObjPtr;
+  typedef GenericObjPtr<GEOM::GEOM_Field>                GeomFieldPtr;
   typedef GenericObjPtr<GEOM::GEOM_IBasicOperations>     BasicOpPtr;
   typedef GenericObjPtr<GEOM::GEOM_ITransformOperations> TransformOpPtr;
   typedef GenericObjPtr<GEOM::GEOM_I3DPrimOperations>    I3DPrimOpPtr;
@@ -228,7 +229,6 @@ namespace GEOM
   typedef GenericObjPtr<GEOM::GEOM_IInsertOperations>    InsertOpPtr;
   typedef GenericObjPtr<GEOM::GEOM_IMeasureOperations>   MeasureOpPtr;
   typedef GenericObjPtr<GEOM::GEOM_IGroupOperations>     GroupOpPtr;
-  typedef GenericObjPtr<GEOM::GEOM_IAdvancedOperations>  AdvancedOpPtr;
 
   template<> bool GEOMBASE_EXPORT GenericObjPtr<GEOM::GEOM_Object>::isSame( GEOM::GEOM_Object_ptr theLeft, GEOM::GEOM_Object_ptr theRight );
 }