Salome HOME
projects
/
modules
/
smesh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix error introduced in 465e5be442f0
[modules/smesh.git]
/
src
/
SMESH_I
/
SMESH_PreMeshInfo.cxx
diff --git
a/src/SMESH_I/SMESH_PreMeshInfo.cxx
b/src/SMESH_I/SMESH_PreMeshInfo.cxx
index 275acb0430aaf220fc1791cf56a1e0af42b2e892..cb9cdb5d4dd7c40d2629dd1659c218031cd768aa 100644
(file)
--- a/
src/SMESH_I/SMESH_PreMeshInfo.cxx
+++ b/
src/SMESH_I/SMESH_PreMeshInfo.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
19
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-20
21
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
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-53,6
+53,8
@@
#include "SMESH_TryCatch.hxx"
#include "SMESH_TryCatch.hxx"
+#include <memory>
+
#include CORBA_SERVER_HEADER(SALOME_Session)
using namespace std;
#include CORBA_SERVER_HEADER(SALOME_Session)
using namespace std;
@@
-72,7
+74,7
@@
namespace
*/
//================================================================================
*/
//================================================================================
- void meshInfoLoaded( SMESH_Mesh_i*
mesh
)
+ void meshInfoLoaded( SMESH_Mesh_i*
/*mesh*/
)
{
theMeshCounter++;
}
{
theMeshCounter++;
}
@@
-82,7
+84,7
@@
namespace
*/
//================================================================================
*/
//================================================================================
- void filesNoMoreNeeded(SMESH_Mesh_i*
mesh
,
+ void filesNoMoreNeeded(SMESH_Mesh_i*
/*mesh*/
,
std::string medFile,
std::string hdfFile)
{
std::string medFile,
std::string hdfFile)
{
@@
-242,9
+244,9
@@
namespace
*/
//================================================================================
*/
//================================================================================
- void meshInfo2hdf( SMESH::
long
_array_var meshInfo,
- const std::string& name,
- HDFgroup* hdfGroup)
+ void meshInfo2hdf( SMESH::
smIdType
_array_var meshInfo,
+ const std::string&
name,
+ HDFgroup*
hdfGroup)
{
// we use med identification of element (MED::EGeometrieElement) types
// but not enum SMDSAbs_EntityType because values of SMDSAbs_EntityType may
{
// we use med identification of element (MED::EGeometrieElement) types
// but not enum SMDSAbs_EntityType because values of SMDSAbs_EntityType may
@@
-262,8
+264,8
@@
namespace
if ( !data.empty() )
{
if ( !data.empty() )
{
- hdf_size
datasetSize[] = { data.size() }
;
-
HDFarray* anArray = new HDFarray(0, HDF_INT32, 1, datasetSize
);
+ hdf_size
*datasetSize = new hdf_size[1]; datasetSize[0] = data.size()
;
+
std::unique_ptr<HDFarray> anArray( new HDFarray(0, HDF_INT32, 1, datasetSize)
);
anArray->CreateOnDisk();
datasetSize[0] = 1;
HDFdataset* dataset = new HDFdataset( name.c_str(), hdfGroup, HDF_ARRAY, datasetSize, 1 );
anArray->CreateOnDisk();
datasetSize[0] = 1;
HDFdataset* dataset = new HDFdataset( name.c_str(), hdfGroup, HDF_ARRAY, datasetSize, 1 );
@@
-1198,9
+1200,9
@@
SMESH::array_of_ElementType* SMESH_PreMeshInfo::GetTypes() const
*/
//================================================================================
*/
//================================================================================
-SMESH::
long
_array* SMESH_PreMeshInfo::GetMeshInfo() const
+SMESH::
smIdType
_array* SMESH_PreMeshInfo::GetMeshInfo() const
{
{
- SMESH::
long_array_var aRes = new SMESH::long
_array();
+ SMESH::
smIdType_array_var aRes = new SMESH::smIdType
_array();
aRes->length(SMESH::Entity_Last);
for (int i = SMESH::Entity_Node; i < SMESH::Entity_Last; i++)
aRes[i] = 0;
aRes->length(SMESH::Entity_Last);
for (int i = SMESH::Entity_Node; i < SMESH::Entity_Last; i++)
aRes[i] = 0;
@@
-1233,7
+1235,7
@@
void SMESH_PreMeshInfo::RemoveStudyFiles_TMP_METHOD(SALOMEDS::SComponent_ptr sme
{
if ( theMeshCounter > 0 )
{
{
if ( theMeshCounter > 0 )
{
- SALOMEDS::ChildIterator_wrap itBig = SMESH_Gen_i::getStudyServant()->NewChildIterator( smeshComp );
+ SALOMEDS::ChildIterator_wrap itBig = SMESH_Gen_i::
GetSMESHGen()->
getStudyServant()->NewChildIterator( smeshComp );
for ( ; itBig->More(); itBig->Next() ) {
SALOMEDS::SObject_wrap gotBranch = itBig->Value();
CORBA::Object_var anObject = SMESH_Gen_i::SObjectToObject( gotBranch );
for ( ; itBig->More(); itBig->Next() ) {
SALOMEDS::SObject_wrap gotBranch = itBig->Value();
CORBA::Object_var anObject = SMESH_Gen_i::SObjectToObject( gotBranch );