Merge master branch into V9_dev.

[modules/geom.git] / src / GEOM_I / GEOM_IOperations_i.hh

diff --git a/src/GEOM_I/GEOM_IOperations_i.hh b/src/GEOM_I/GEOM_IOperations_i.hh
index 15c0bd269f7ecbd5445ceb20fa842ee99e9c943d..71b349378de0ed1d98f136b30e4908c3b084678c 100644 (file)
--- a/src/GEOM_I/GEOM_IOperations_i.hh
+++ b/src/GEOM_I/GEOM_IOperations_i.hh
@@ -45,10 +45,10 @@ class GEOM_I_EXPORT GEOM_IOperations_i : public virtual POA_GEOM::GEOM_IOperatio
   
   virtual char* GetErrorCode();
 
-  virtual GEOM::GEOM_BaseObject_ptr GetBaseObject(HANDLE_NAMESPACE(GEOM_BaseObject) theObject);
-  virtual HANDLE_NAMESPACE(GEOM_BaseObject) GetBaseObjectImpl(GEOM::GEOM_BaseObject_ptr theObject);
-  virtual GEOM::GEOM_Object_ptr GetObject(HANDLE_NAMESPACE(GEOM_Object) theObject);
-  virtual HANDLE_NAMESPACE(GEOM_Object) GetObjectImpl(GEOM::GEOM_Object_ptr theObject);
+  virtual GEOM::GEOM_BaseObject_ptr GetBaseObject(Handle(::GEOM_BaseObject) theObject);
+  virtual Handle(::GEOM_BaseObject) GetBaseObjectImpl(GEOM::GEOM_BaseObject_ptr theObject);
+  virtual GEOM::GEOM_Object_ptr GetObject(Handle(::GEOM_Object) theObject);
+  virtual Handle(::GEOM_Object) GetObjectImpl(GEOM::GEOM_Object_ptr theObject);
 
   virtual void StartOperation();
 
@@ -66,7 +66,7 @@ protected:
   Handle(TColStd_HSequenceOfTransient)
                GetListOfObjectsImpl(const GEOM::ListOfGO& theObjects);
   bool GetListOfObjectsImpl(const GEOM::ListOfGO& theObjects,
-                            std::list< HANDLE_NAMESPACE(GEOM_Object) >& theList);
+                            std::list< Handle(::GEOM_Object) >& theList);
 
   Handle(TColStd_HArray1OfExtendedString)
                ConvertStringArray(const GEOM::string_array &theInArray);