]> SALOME platform Git repositories - tools/sat_salome.git/commitdiff
Salome HOME
Add HEXABLOCK patch need for dedicated occ20256 dev build
authorQuentin Cozette <quentin.cozette@cea.fr>
Thu, 15 Apr 2021 18:15:08 +0000 (20:15 +0200)
committerQuentin Cozette <quentin.cozette@cea.fr>
Thu, 15 Apr 2021 18:15:08 +0000 (20:15 +0200)
applications/SALOME-master.pyconf
products/patches/HEXABLOCK_occ20256.patch [new file with mode: 0644]

index 4318fe414c45ad10f3e31cd21a5cc30275034289..5f3ddc3bfac10a760d218c6eee522f92495a00ac 100644 (file)
@@ -183,6 +183,7 @@ __overwrite__ :
     'APPLICATION.products.GUI' : {tag : 'occ/20256'}
     'APPLICATION.products.SMESH' : {tag : 'occ/20256'}
     'APPLICATION.products.HEXABLOCK' : {tag : 'occ/20256'}
+    'PRODUCTS.HEXABLOCK.default.patches' : ['HEXABLOCK_occ20256.patch']
     'APPLICATION.products.HEXABLOCKPLUGIN' : {tag : 'occ/20256'}
     'APPLICATION.products.NETGENPLUGIN' : {tag : 'occ/20256'}
     'APPLICATION.products.GHS3DPRLPLUGIN' : {tag : 'occ/20256'}
diff --git a/products/patches/HEXABLOCK_occ20256.patch b/products/patches/HEXABLOCK_occ20256.patch
new file mode 100644 (file)
index 0000000..a285623
--- /dev/null
@@ -0,0 +1,13 @@
+diff --git a/src/HEXABLOCKGUI/HEXABLOCKGUI.cxx b/src/HEXABLOCKGUI/HEXABLOCKGUI.cxx
+index b01745b..f7998d0 100644
+--- a/src/HEXABLOCKGUI/HEXABLOCKGUI.cxx
++++ b/src/HEXABLOCKGUI/HEXABLOCKGUI.cxx
+@@ -413,7 +413,7 @@ bool HEXABLOCKGUI::deactivateModule( SUIT_Study* theStudy )
+ SALOMEDS::Study_var HEXABLOCKGUI::getStudyServant()
+ {
+-  SALOME_NamingService *aNamingService = SalomeApp_Application::namingService();
++  SALOME_NamingService_Abstract *aNamingService = SalomeApp_Application::namingService();
+   CORBA::Object_var aSMObject = aNamingService->Resolve("/Study");
+   SALOMEDS::Study_var aDSStudy = SALOMEDS::Study::_narrow(aSMObject);
+   return aDSStudy._retn();