From: rnv <rnv@opencascade.com>
Date: Wed, 13 Dec 2017 08:47:35 +0000 (+0300)
Subject: Merge V8_4_BR branch.
X-Git-Tag: V9_0_0~1^2~6
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=2736f682fe0d63fbaf9dff49c46b4fa6c23d72ce;p=modules%2Fgeom.git

Merge V8_4_BR branch.
---

2736f682fe0d63fbaf9dff49c46b4fa6c23d72ce
diff --cc src/GEOM_I/GEOM_Gen_i.cc
index 862d95beb,63064b051..7ccc970dd
--- a/src/GEOM_I/GEOM_Gen_i.cc
+++ b/src/GEOM_I/GEOM_Gen_i.cc
@@@ -262,9 -262,9 +262,9 @@@ SALOMEDS::SObject_ptr GEOM_Gen_i::Publi
    // BEGIN: try to find existed name for current shape
    if ( !aShape->_is_nil() && mytype != GEOM_GROUP)
    {
 -    // recieve current TopoDS shape
 +    // receive current TopoDS shape
      CORBA::String_var entry = aShape->GetEntry();
-     HANDLE_NAMESPACE(GEOM_Object) aGShape = HANDLE_NAMESPACE(GEOM_Object)::DownCast
+     Handle(::GEOM_Object) aGShape = Handle(::GEOM_Object)::DownCast
        ( _impl->GetObject( aShape->GetStudyID(), entry ));
      TopoDS_Shape TopoSh = aGShape->GetValue();
      // find label of main shape