From 2507fe6a4220fe58e9d36204f572e0fd79582919 Mon Sep 17 00:00:00 2001 From: Viktor UZLOV Date: Sat, 20 Feb 2021 19:58:35 +0300 Subject: [PATCH] 64 bit NumberOfSegments --- idl/SMESH_BasicHypothesis.idl | 2 +- src/SMESH_I/SMESH_PythonDump.cxx | 7 ++++--- src/SMESH_I/SMESH_PythonDump.hxx | 7 ++++--- src/StdMeshers_I/StdMeshers_NumberOfSegments_i.cxx | 2 +- src/StdMeshers_I/StdMeshers_NumberOfSegments_i.hxx | 2 +- 5 files changed, 11 insertions(+), 9 deletions(-) diff --git a/idl/SMESH_BasicHypothesis.idl b/idl/SMESH_BasicHypothesis.idl index a6443122a..f4758d240 100644 --- a/idl/SMESH_BasicHypothesis.idl +++ b/idl/SMESH_BasicHypothesis.idl @@ -169,7 +169,7 @@ module StdMeshers /*! * Sets parameter value */ - void SetNumberOfSegments(in long segmentsNumber) + void SetNumberOfSegments(in SMESH::smIdType segmentsNumber) raises (SALOME::SALOME_Exception); /*! diff --git a/src/SMESH_I/SMESH_PythonDump.cxx b/src/SMESH_I/SMESH_PythonDump.cxx index 1aea50e31..25e501374 100644 --- a/src/SMESH_I/SMESH_PythonDump.cxx +++ b/src/SMESH_I/SMESH_PythonDump.cxx @@ -60,9 +60,10 @@ namespace SMESH size_t TPythonDump::myCounter = 0; const char theNotPublishedObjectName[] = "__NOT__Published__Object__"; - TVar::TVar(CORBA::Double value):myVals(1), myIsList(false) { myVals[0] = SMESH_Comment(value); } - TVar::TVar(CORBA::Long value):myVals(1), myIsList(false) { myVals[0] = SMESH_Comment(value); } - TVar::TVar(CORBA::Short value):myVals(1), myIsList(false) { myVals[0] = SMESH_Comment(value); } + TVar::TVar(CORBA::Double value):myVals(1), myIsList(false) { myVals[0] = SMESH_Comment(value); } + TVar::TVar(CORBA::Long value):myVals(1), myIsList(false) { myVals[0] = SMESH_Comment(value); } + TVar::TVar(SMESH::smIdType value):myVals(1), myIsList(false) { myVals[0] = SMESH_Comment(value); } + TVar::TVar(CORBA::Short value):myVals(1), myIsList(false) { myVals[0] = SMESH_Comment(value); } TVar::TVar(const SMESH::double_array& value):myVals(value.length()), myIsList(true) { for ( size_t i = 0; i < value.length(); i++) diff --git a/src/SMESH_I/SMESH_PythonDump.hxx b/src/SMESH_I/SMESH_PythonDump.hxx index ab27d956f..50b552a83 100644 --- a/src/SMESH_I/SMESH_PythonDump.hxx +++ b/src/SMESH_I/SMESH_PythonDump.hxx @@ -99,9 +99,10 @@ namespace SMESH { std::vector< std::string > myVals; bool myIsList; - TVar(CORBA::Double value); - TVar(CORBA::Long value); - TVar(CORBA::Short value); + TVar(CORBA::Double value); + TVar(CORBA::Long value); + TVar(SMESH::smIdType value); + TVar(CORBA::Short value); TVar(const SMESH::double_array& value); // string used to temporary quote variable names in order // not to confuse variables with string arguments diff --git a/src/StdMeshers_I/StdMeshers_NumberOfSegments_i.cxx b/src/StdMeshers_I/StdMeshers_NumberOfSegments_i.cxx index 1d1687253..749e2bc38 100644 --- a/src/StdMeshers_I/StdMeshers_NumberOfSegments_i.cxx +++ b/src/StdMeshers_I/StdMeshers_NumberOfSegments_i.cxx @@ -127,7 +127,7 @@ StdMeshers_NumberOfSegments_i::BuildDistributionTab( const SMESH::double_array& */ //============================================================================= -void StdMeshers_NumberOfSegments_i::SetNumberOfSegments( CORBA::Long theSegmentsNumber ) +void StdMeshers_NumberOfSegments_i::SetNumberOfSegments( SMESH::smIdType theSegmentsNumber ) { ASSERT( myBaseImpl ); try { diff --git a/src/StdMeshers_I/StdMeshers_NumberOfSegments_i.hxx b/src/StdMeshers_I/StdMeshers_NumberOfSegments_i.hxx index 5f00a8fb9..5d1efb29c 100644 --- a/src/StdMeshers_I/StdMeshers_NumberOfSegments_i.hxx +++ b/src/StdMeshers_I/StdMeshers_NumberOfSegments_i.hxx @@ -58,7 +58,7 @@ public: SMESH::double_array* BuildDistributionTab( const SMESH::double_array&, CORBA::Long, CORBA::Long ); // Set number of segments - void SetNumberOfSegments( CORBA::Long theSegmentsNumber ); + void SetNumberOfSegments( SMESH::smIdType theSegmentsNumber ); // Get number of segments CORBA::Long GetNumberOfSegments(); -- 2.39.2