From acd8d4fbb78a0f3ea428e18cad536012c216b387 Mon Sep 17 00:00:00 2001 From: ageay Date: Fri, 26 Nov 2004 12:52:56 +0000 Subject: [PATCH] Porting on CCRT. --- src/Communication/SALOME_Comm_i.cxx | 8 ++++++++ src/Communication/SALOME_Comm_i.hxx | 5 ++--- src/HDFPersist/HDFconvert.cc | 2 +- src/Loader/Makefile.in | 2 +- src/MPIContainer/Makefile.in | 1 + src/ModuleCatalog/Makefile.in | 3 ++- src/SALOMEDS/SALOMEDS_AttributeGraphic_i.cxx | 2 +- src/SALOMEDS/SALOMEDS_SObject_i.cxx | 2 +- src/SALOMEDS/SALOMEDS_SObject_i.hxx | 2 +- src/SALOMEDS/SALOMEDS_StudyManager_i.cxx | 5 +++-- 10 files changed, 21 insertions(+), 11 deletions(-) diff --git a/src/Communication/SALOME_Comm_i.cxx b/src/Communication/SALOME_Comm_i.cxx index 49dd14a17..c9b677a84 100644 --- a/src/Communication/SALOME_Comm_i.cxx +++ b/src/Communication/SALOME_Comm_i.cxx @@ -256,6 +256,10 @@ void SALOME_MPISender_i::close(const SALOME::MPISender::param& p) #ifdef HAVE_SOCKET +//CCRT porting +#define _POSIX_PII_SOCKET +#define _LIBC_POLLUTION_H_ + #include #include #include @@ -481,4 +485,8 @@ void SALOME_SocketSender_i::endOfCom() delete [] _argsForThr; } +//CCRT porting +#undef _LIBC_POLLUTION_H_ +#undef _POSIX_PII_SOCKET + #endif diff --git a/src/Communication/SALOME_Comm_i.hxx b/src/Communication/SALOME_Comm_i.hxx index 3fac77789..7b6e8df43 100644 --- a/src/Communication/SALOME_Comm_i.hxx +++ b/src/Communication/SALOME_Comm_i.hxx @@ -1,7 +1,6 @@ #ifndef _SALOME_COMM_I_HXX_ #define _SALOME_COMM_I_HXX_ -#include #include #include #include CORBA_SERVER_HEADER(SALOME_Comm) @@ -59,7 +58,7 @@ class SALOME_CorbaDoubleCSender_i : public POA_SALOME::CorbaDoubleCSender, public SALOME_Sender_i { public: - SALOME_CorbaDoubleCSender_i(const double *tabToSend,const long lgrTabToSend); + SALOME_CorbaDoubleCSender_i(const double *tabToSend,long lgrTabToSend); ~SALOME_CorbaDoubleCSender_i(); CORBA::ULong getSize(); SALOME::vectorOfDouble* sendPart(CORBA::ULong offset, CORBA::ULong length); @@ -71,7 +70,7 @@ class SALOME_CorbaLongNCSender_i : public POA_SALOME::CorbaLongNCSender, public SALOME_Sender_i { public: - SALOME_CorbaLongNCSender_i(const int *tabToSend,const long lgrTabToSend); + SALOME_CorbaLongNCSender_i(const int *tabToSend,long lgrTabToSend); ~SALOME_CorbaLongNCSender_i(); CORBA::ULong getSize(); SALOME::vectorOfLong* sendPart(CORBA::ULong offset, CORBA::ULong length); diff --git a/src/HDFPersist/HDFconvert.cc b/src/HDFPersist/HDFconvert.cc index 434c666da..0249c933a 100644 --- a/src/HDFPersist/HDFconvert.cc +++ b/src/HDFPersist/HDFconvert.cc @@ -68,7 +68,7 @@ int HDFConvert::FromAscii(const string& file, const HDFcontainerObject & hdf_con #endif // Creation du Dataset utilisateur - hdf_dataset = new HDFdataset::HDFdataset( (char *) nomdataset.c_str(), /*discard const */ + hdf_dataset = new HDFdataset( (char *) nomdataset.c_str(), /*discard const */ (HDFcontainerObject*) &hdf_container, /*discard const, pas de constructeur par référence */ HDF_STRING, &length_long,1); diff --git a/src/Loader/Makefile.in b/src/Loader/Makefile.in index 6caf10e2c..972c503b6 100644 --- a/src/Loader/Makefile.in +++ b/src/Loader/Makefile.in @@ -27,7 +27,7 @@ BIN_CLIENT_IDL = SALOME_Session.idl \ SALOME_Component.idl \ SALOME_ModuleCatalog.idl \ SALOME_Registry.idl \ - SALOME_Exception.idl + SALOME_Exception.idl Logger.idl CPPFLAGS+=$(QT_MT_INCLUDES) CXXFLAGS+=$(OCC_CXXFLAGS) diff --git a/src/MPIContainer/Makefile.in b/src/MPIContainer/Makefile.in index ae1ab2757..d01e24df8 100644 --- a/src/MPIContainer/Makefile.in +++ b/src/MPIContainer/Makefile.in @@ -44,6 +44,7 @@ EXPORT_HEADERS = \ LIB = libSalomeMPIContainer.la LIB_SRC = MPIObject_i.cxx MPIContainer_i.cxx +LIB_CLIENT_IDL = SALOME_Component.idl LIB_SERVER_IDL = SALOME_MPIObject.idl SALOME_MPIContainer.idl # Executables targets diff --git a/src/ModuleCatalog/Makefile.in b/src/ModuleCatalog/Makefile.in index e6b0cc72d..3d9a203c8 100644 --- a/src/ModuleCatalog/Makefile.in +++ b/src/ModuleCatalog/Makefile.in @@ -51,13 +51,14 @@ LIB_SRC = \ SALOME_ModuleCatalog_impl.cxx \ SALOME_ModuleCatalog_Acomponent_impl.cxx -CXXFLAGS+=-ftemplate-depth-32 +CXXFLAGS+=@CXXTMPDPTHFLAGS@ # Executables targets # trouble we have client and serveur and build don't known about this with rule # in fact client is a test ! So it may go away BIN ! BIN = SALOME_ModuleCatalog_Server SALOME_ModuleCatalog_Client BIN_SRC = +LIB_CLIENT_IDL = SALOME_ModuleCatalog.idl BIN_SERVER_IDL = SALOME_ModuleCatalog.idl CPPFLAGS+= $(QT_MT_INCLUDES) diff --git a/src/SALOMEDS/SALOMEDS_AttributeGraphic_i.cxx b/src/SALOMEDS/SALOMEDS_AttributeGraphic_i.cxx index f7610ae9a..3ac440514 100644 --- a/src/SALOMEDS/SALOMEDS_AttributeGraphic_i.cxx +++ b/src/SALOMEDS/SALOMEDS_AttributeGraphic_i.cxx @@ -26,10 +26,10 @@ // Module : SALOME // $Header$ -using namespace std; #include "SALOMEDS_AttributeGraphic_i.hxx" #include "SALOMEDS_SObject_i.hxx" +using namespace std; /* Class : SALOMEDS_AttributeGraphic_i diff --git a/src/SALOMEDS/SALOMEDS_SObject_i.cxx b/src/SALOMEDS/SALOMEDS_SObject_i.cxx index 04478d1de..00e37cfad 100644 --- a/src/SALOMEDS/SALOMEDS_SObject_i.cxx +++ b/src/SALOMEDS/SALOMEDS_SObject_i.cxx @@ -192,7 +192,7 @@ CORBA::Boolean SALOMEDS_SObject_i::ReferencedObject(SALOMEDS::SObject_out obj) * Purpose : */ //============================================================================ -CORBA::Boolean SALOMEDS_SObject_i::FindSubObject(long atag, SALOMEDS::SObject_out obj) +CORBA::Boolean SALOMEDS_SObject_i::FindSubObject(CORBA::Long atag, SALOMEDS::SObject_out obj) { TDF_Label L = _lab.FindChild(atag,false); if (L.IsNull()) return false; diff --git a/src/SALOMEDS/SALOMEDS_SObject_i.hxx b/src/SALOMEDS/SALOMEDS_SObject_i.hxx index 67ab9d9ba..1b6a29060 100644 --- a/src/SALOMEDS/SALOMEDS_SObject_i.hxx +++ b/src/SALOMEDS/SALOMEDS_SObject_i.hxx @@ -73,7 +73,7 @@ public: virtual SALOMEDS::SObject_ptr GetFather() ; virtual CORBA::Boolean FindAttribute(SALOMEDS::GenericAttribute_out anAttribute, const char* aTypeOfAttribute); virtual CORBA::Boolean ReferencedObject(SALOMEDS::SObject_out obj) ; - virtual CORBA::Boolean FindSubObject(long atag, SALOMEDS::SObject_out obj ); + virtual CORBA::Boolean FindSubObject(CORBA::Long atag, SALOMEDS::SObject_out obj ); virtual SALOMEDS::Study_ptr GetStudy() ; virtual char* Name(); diff --git a/src/SALOMEDS/SALOMEDS_StudyManager_i.cxx b/src/SALOMEDS/SALOMEDS_StudyManager_i.cxx index 71033bb23..4e2e56a67 100644 --- a/src/SALOMEDS/SALOMEDS_StudyManager_i.cxx +++ b/src/SALOMEDS/SALOMEDS_StudyManager_i.cxx @@ -327,7 +327,8 @@ SALOMEDS::Study_ptr SALOMEDS_StudyManager_i::Open(const char* aUrl) // MESSAGE( "HDFexception ! " ); // cerr << "HDFexception ! " << endl; delete aHDFUrl; - char eStr[strlen(aUrl)+17]; +// char eStr[strlen(aUrl)+17]; + char *eStr = new char[strlen(aUrl)+17+1]; sprintf(eStr,"Can't open file %s",aUrl); THROW_SALOME_CORBA_EXCEPTION(CORBA::string_dup(eStr),SALOME::BAD_PARAM); @@ -375,7 +376,7 @@ SALOMEDS::Study_ptr SALOMEDS_StudyManager_i::Open(const char* aUrl) // MESSAGE( "HDFexception ! " ); // cerr << "HDFexception ! " << endl; delete aHDFUrl; - char eStr[strlen(aUrl)+17]; + char *eStr=new char[strlen(aUrl)+17]; sprintf(eStr,"Can't open file %s",aUrl); THROW_SALOME_CORBA_EXCEPTION(CORBA::string_dup(eStr),SALOME::BAD_PARAM); } -- 2.39.2