std::string cp_file_name(comp_file_name);
std::size_t index = cp_file_name.rfind("/");
- if (index != -1)
+ if (index != -1) //TODO: std::string::npos
{
file_name = cp_file_name.substr(index+1);
path = cp_file_name.substr(0,index+1);
std::string cp_file_name(comp_file_name);
std::size_t index = cp_file_name.rfind("/");
- if (index != -1)
+ if (index != -1) //TODO: std::string::npos
{
file_name = cp_file_name.substr(index+1);
path = cp_file_name.substr(0,index+1);
PortProperties_i::~PortProperties_i() {}
void
-PortProperties_i::set_property(const char * name, const CORBA::Any& value)
+PortProperties_i::set_property(const char * /*name*/, const CORBA::Any& /*value*/)
noexcept
{
// Default case, the object has no properties.
}
CORBA::Any*
-PortProperties_i::get_property(const char* name)
+PortProperties_i::get_property(const char* /*name*/)
noexcept
{
// Default case, the object has no properties.
* CORBA method : set a value to a property
* \see Ports::PortProperties::set_property
*/
- virtual void set_property(const char * name,
- const CORBA::Any& value)
+ virtual void set_property(const char * /*name*/,
+ const CORBA::Any& /*value*/)
noexcept;
/*!
* CORBA method : get the value of a property
* \see Ports::PortProperties::get_property
*/
- virtual CORBA::Any* get_property(const char* name)
+ virtual CORBA::Any* get_property(const char* /*name*/)
noexcept;
};
std::cerr << "data_short_port_uses::put is NULL" << std::endl;
else
{
- for(int i = 0; i < _my_ports->length(); i++)
+ for(int i = 0; i < (int)_my_ports->length(); i++) //TODO: mismatch signed/unsigned
{
Ports::Data_Short_Port_ptr port = Ports::Data_Short_Port::_narrow((*_my_ports)[i]);
port->put(data);
void
data_short_port_uses::uses_port_changed(Engines::DSC::uses_port * new_uses_port,
- const Engines::DSC::Message message)
+ const Engines::DSC::Message /*message*/)
{
if (_my_ports)
delete _my_ports;
* \param message message associated to the modification.
*/
virtual void uses_port_changed(Engines::DSC::uses_port * new_uses_port,
- const Engines::DSC::Message message);
+ const Engines::DSC::Message /*message*/);
private :
Engines::DSC::uses_port * _my_ports;
/* std::cerr << "-------- CalciumInterface(C Part) MARK 3 ------------------" << std::endl; */ \
\
return info; \
- }; \
+ } \
void ecp_##_name##_free ( _type _qual * data) { \
ecp_lecture_##_typeName##_free(data); \
- };
+ }
/* L'interface de cette routine diffère de celle obtenue par la macro :
*nRead=_nRead;
fflush(stdout);fflush(stderr);
return info;
-};
+}
void ecp_lch_free (char* * data) { \
ecp_lecture_str_free(data); \
-};
+}
#define STAR *
/*REVERIFIER MAINTENANT 0 COPY avec int2integer*/
-CALCIUM_EXT_LECT_INTERFACE_C_(len,float,int,int2integer,);
-CALCIUM_EXT_LECT_INTERFACE_C_(lre,float,float,float,);
+CALCIUM_EXT_LECT_INTERFACE_C_(len,float,int,int2integer,)
+CALCIUM_EXT_LECT_INTERFACE_C_(lre,float,float,float,)
/*Permet d'envoyer/recevoir des réels sur un port Double */
-CALCIUM_EXT_LECT_INTERFACE_C_(lrd,float ,float ,float2double,);
-CALCIUM_EXT_LECT_INTERFACE_C_(ldb,double,double,double,);
+CALCIUM_EXT_LECT_INTERFACE_C_(lrd,float ,float ,float2double,)
+CALCIUM_EXT_LECT_INTERFACE_C_(ldb,double,double,double,)
-CALCIUM_EXT_LECT_INTERFACE_C_(llo,float,int,bool,);
-CALCIUM_EXT_LECT_INTERFACE_C_(lcp,float,float,cplx,);
+CALCIUM_EXT_LECT_INTERFACE_C_(llo,float,int,bool,)
+CALCIUM_EXT_LECT_INTERFACE_C_(lcp,float,float,cplx,)
/* CALCIUM_EXT_LECT_INTERFACE_C_(lch,float,char,STAR[]); */
fflush(stderr); \
\
return info; \
- }; \
+ } \
void cp_##_name##_free ( _type _qual * data) { \
ecp_lecture_##_typeName##_free(data); \
- };
+ }
/* L'interface de cette routine diffère de celle obtenue par la macro :
/* CALCIUM_LECT_INTERFACE_C_( <suffixe du nom de l'interface à générer>, <type du paramètre temporel>, <type d'entier à utiliser pour les paramètres de type entier>,
<type de données>, <nom de l'interface C2CPP à utiliser>, <qualificateur de type optionnel des données>,<paramètres supplémentaire ignoré>)*/
-CALCIUM_LECT_INTERFACE_C_(len,float ,int,int ,int2integer,,);
+CALCIUM_LECT_INTERFACE_C_(len,float ,int,int ,int2integer,,)
/*llg ne fonctionnera pas toujours correctement (port calcium_integer) si sizeof(long) == 64 bits && cal_int==int (32 bits)
sinon problème de conversion de 64bits vers 32bits */
-CALCIUM_LECT_INTERFACE_C_(llg,float ,int,long ,long2integer,,);
+CALCIUM_LECT_INTERFACE_C_(llg,float ,int,long ,long2integer,,)
-CALCIUM_LECT_INTERFACE_C_(lln,float ,int,long ,long,,);
+CALCIUM_LECT_INTERFACE_C_(lln,float ,int,long ,long,,)
-CALCIUM_LECT_INTERFACE_C_(lre,float ,int,float ,float,,);
+CALCIUM_LECT_INTERFACE_C_(lre,float ,int,float ,float,,)
/*Permet d'envoyer/recevoir des réels sur un port Double */
-CALCIUM_LECT_INTERFACE_C_(lrd,float ,int,float ,float2double,,);
-CALCIUM_LECT_INTERFACE_C_(ldb,double,int,double ,double,,);
+CALCIUM_LECT_INTERFACE_C_(lrd,float ,int,float ,float2double,,)
+CALCIUM_LECT_INTERFACE_C_(ldb,double,int,double ,double,,)
-CALCIUM_LECT_INTERFACE_C_(llo,float ,int,int ,bool,,);
-CALCIUM_LECT_INTERFACE_C_(lcp,float ,int,float ,cplx,,);
+CALCIUM_LECT_INTERFACE_C_(llo,float ,int,int ,bool,,)
+CALCIUM_LECT_INTERFACE_C_(lcp,float ,int,float ,cplx,,)
#define STAR *
#define LCH_LAST_PARAM ,int strsize
-CALCIUM_LECT_INTERFACE_C_(lch,float ,int,char ,str,STAR, LCH_LAST_PARAM );
+CALCIUM_LECT_INTERFACE_C_(lch,float ,int,char ,str,STAR, LCH_LAST_PARAM )
/* Definition des méthodes calcium destinées à l'interfaçage fortran
avec une taille des INTEGER fortran paramétrés à la configuration du KERNEL */
-CALCIUM_LECT_INTERFACE_C_(len_fort_,float ,cal_int,cal_int ,integer,,);
-CALCIUM_LECT_INTERFACE_C_(lin_fort_,float ,cal_int,int ,int2integer,,);
+CALCIUM_LECT_INTERFACE_C_(len_fort_,float ,cal_int,cal_int ,integer,,)
+CALCIUM_LECT_INTERFACE_C_(lin_fort_,float ,cal_int,int ,int2integer,,)
/*llg_fort_ ne fonctionnera pas toujours correctement (port calcium_integer) si sizeof(long) == 64 bits && cal_int==int (32 bits)
sinon problème de conversion de 64bits vers 32bits */
-CALCIUM_LECT_INTERFACE_C_(llg_fort_,float ,cal_int,long ,long2integer,,);
+CALCIUM_LECT_INTERFACE_C_(llg_fort_,float ,cal_int,long ,long2integer,,)
-CALCIUM_LECT_INTERFACE_C_(lre_fort_,float ,cal_int,float ,float,,);
-CALCIUM_LECT_INTERFACE_C_(lrd_fort_,float ,cal_int,float ,float2double,,);
-CALCIUM_LECT_INTERFACE_C_(ldb_fort_,double,cal_int,double ,double,,);
-CALCIUM_LECT_INTERFACE_C_(llo_fort_,float ,cal_int,int ,bool,,); /*int pour bool ou cal_int */
-CALCIUM_LECT_INTERFACE_C_(lcp_fort_,float ,cal_int,float ,cplx,,);
-CALCIUM_LECT_INTERFACE_C_(lch_fort_,float ,cal_int,char ,str,STAR, LCH_LAST_PARAM );
+CALCIUM_LECT_INTERFACE_C_(lre_fort_,float ,cal_int,float ,float,,)
+CALCIUM_LECT_INTERFACE_C_(lrd_fort_,float ,cal_int,float ,float2double,,)
+CALCIUM_LECT_INTERFACE_C_(ldb_fort_,double,cal_int,double ,double,,)
+CALCIUM_LECT_INTERFACE_C_(llo_fort_,float ,cal_int,int ,bool,,) /*int pour bool ou cal_int */
+CALCIUM_LECT_INTERFACE_C_(lcp_fort_,float ,cal_int,float ,cplx,,)
+CALCIUM_LECT_INTERFACE_C_(lch_fort_,float ,cal_int,char ,str,STAR, LCH_LAST_PARAM )
-CALCIUM_LECT_INTERFACE_C_(lln_fort_,float ,cal_int,long ,long,,);
+CALCIUM_LECT_INTERFACE_C_(lln_fort_,float ,cal_int,long ,long,,)
/**********************************************/
/* INTERFACES DE DÉBUT ET DE FIN DE COUPLAGE */
fflush(stderr); \
\
return info; \
- }; \
+ } \
/* Definition des méthodes calcium standard */
/* CALCIUM_ECR_INTERFACE_C_(_name,_timeType,_calInt,type,_typeName,_qual) */
-CALCIUM_ECR_INTERFACE_C_(een,float ,int,int ,int2integer,,);
+CALCIUM_ECR_INTERFACE_C_(een,float ,int,int ,int2integer,,)
/*elg ne fonctionnera pas toujours correctement (port calcium_integer) si sizeof(long) == 64 bits && cal_int==int (32 bits)
sinon problème de conversion de 64bits vers 32bits */
-CALCIUM_ECR_INTERFACE_C_(elg,float ,int,long ,long2integer,,);
-CALCIUM_ECR_INTERFACE_C_(ere,float ,int,float ,float,,);
+CALCIUM_ECR_INTERFACE_C_(elg,float ,int,long ,long2integer,,)
+CALCIUM_ECR_INTERFACE_C_(ere,float ,int,float ,float,,)
/*Permet d'envoyer/recevoir des réels sur un port Double */
-CALCIUM_ECR_INTERFACE_C_(erd,float ,int,float ,float2double,,);
-CALCIUM_ECR_INTERFACE_C_(edb,double,int,double,double,,);
+CALCIUM_ECR_INTERFACE_C_(erd,float ,int,float ,float2double,,)
+CALCIUM_ECR_INTERFACE_C_(edb,double,int,double,double,,)
-CALCIUM_ECR_INTERFACE_C_(elo,float ,int,int ,bool,,);
-CALCIUM_ECR_INTERFACE_C_(ecp,float ,int,float ,cplx,,);
-CALCIUM_ECR_INTERFACE_C_(ech,float ,int,char ,str,STAR,LCH_LAST_PARAM );
+CALCIUM_ECR_INTERFACE_C_(elo,float ,int,int ,bool,,)
+CALCIUM_ECR_INTERFACE_C_(ecp,float ,int,float ,cplx,,)
+CALCIUM_ECR_INTERFACE_C_(ech,float ,int,char ,str,STAR,LCH_LAST_PARAM )
-CALCIUM_ECR_INTERFACE_C_(eln,float ,int,long ,long,,);
+CALCIUM_ECR_INTERFACE_C_(eln,float ,int,long ,long,,)
/* Definition des méthodes calcium destinées à l'interfaçage fortran
avec une taille des INTEGER fortran paramétrés à la configuration du KERNEL */
-CALCIUM_ECR_INTERFACE_C_(een_fort_,float ,cal_int,cal_int,integer,,);
+CALCIUM_ECR_INTERFACE_C_(een_fort_,float ,cal_int,cal_int,integer,,)
/*elg_fort_ ne fonctionnera pas toujours correctement (port calcium_integer) si sizeof(long) == 64 bits && cal_int==int (32 bits)
sinon problème de conversion de 64bits vers 32bits */
-CALCIUM_ECR_INTERFACE_C_(elg_fort_,float ,cal_int,long ,long2integer,,);
-CALCIUM_ECR_INTERFACE_C_(ein_fort_,float ,cal_int,int ,int2integer,,);
-CALCIUM_ECR_INTERFACE_C_(ere_fort_,float ,cal_int,float ,float,,);
-CALCIUM_ECR_INTERFACE_C_(erd_fort_,float ,cal_int,float ,float2double,,);
-CALCIUM_ECR_INTERFACE_C_(edb_fort_,double,cal_int,double,double,,);
-CALCIUM_ECR_INTERFACE_C_(elo_fort_,float ,cal_int,int ,bool,,);
-CALCIUM_ECR_INTERFACE_C_(ecp_fort_,float ,cal_int,float ,cplx,,);
-CALCIUM_ECR_INTERFACE_C_(ech_fort_,float ,cal_int,char ,str,STAR,LCH_LAST_PARAM );
-
-CALCIUM_ECR_INTERFACE_C_(eln_fort_,float ,cal_int,long ,long,,);
+CALCIUM_ECR_INTERFACE_C_(elg_fort_,float ,cal_int,long ,long2integer,,)
+CALCIUM_ECR_INTERFACE_C_(ein_fort_,float ,cal_int,int ,int2integer,,)
+CALCIUM_ECR_INTERFACE_C_(ere_fort_,float ,cal_int,float ,float,,)
+CALCIUM_ECR_INTERFACE_C_(erd_fort_,float ,cal_int,float ,float2double,,)
+CALCIUM_ECR_INTERFACE_C_(edb_fort_,double,cal_int,double,double,,)
+CALCIUM_ECR_INTERFACE_C_(elo_fort_,float ,cal_int,int ,bool,,)
+CALCIUM_ECR_INTERFACE_C_(ecp_fort_,float ,cal_int,float ,cplx,,)
+CALCIUM_ECR_INTERFACE_C_(ech_fort_,float ,cal_int,char ,str,STAR,LCH_LAST_PARAM )
+
+CALCIUM_ECR_INTERFACE_C_(eln_fort_,float ,cal_int,long ,long,,)
/***************************/
/* Interface for cleaning */
le manipulateur de données d'effectuer une recopie (qui fonctionne si les types sont compatibles).
*/
// CALCIUM_C2CPP_INTERFACE_CXX_(_name,_porttype,_type,_qual)
-CALCIUM_C2CPP_INTERFACE_CXX_(intc,int,int,);
-CALCIUM_C2CPP_INTERFACE_CXX_(long,long,long,);
+CALCIUM_C2CPP_INTERFACE_CXX_(intc,int,int,)
+CALCIUM_C2CPP_INTERFACE_CXX_(long,long,long,)
-CALCIUM_C2CPP_INTERFACE_CXX_(integer,integer,cal_int,);
-CALCIUM_C2CPP_INTERFACE_CXX_(int2integer ,integer, int,);
-CALCIUM_C2CPP_INTERFACE_CXX_(long2integer, integer, long,);
+CALCIUM_C2CPP_INTERFACE_CXX_(integer,integer,cal_int,)
+CALCIUM_C2CPP_INTERFACE_CXX_(int2integer ,integer, int,)
+CALCIUM_C2CPP_INTERFACE_CXX_(long2integer, integer, long,)
-CALCIUM_C2CPP_INTERFACE_CXX_(float,float,float, );
-CALCIUM_C2CPP_INTERFACE_CXX_(double,double,double,);
+CALCIUM_C2CPP_INTERFACE_CXX_(float,float,float, )
+CALCIUM_C2CPP_INTERFACE_CXX_(double,double,double,)
-CALCIUM_C2CPP_INTERFACE_CXX_(float2double,double,float, );
+CALCIUM_C2CPP_INTERFACE_CXX_(float2double,double,float, )
/* Fonnctionne mais essai suivant pour simplification de Calcium.c CALCIUM_C2CPP_INTERFACE_(bool,bool,);*/
-CALCIUM_C2CPP_INTERFACE_CXX_(bool,bool,int,);
-CALCIUM_C2CPP_INTERFACE_CXX_(cplx,cplx,float,);
-CALCIUM_C2CPP_INTERFACE_CXX_(str,str,char*,);
+CALCIUM_C2CPP_INTERFACE_CXX_(bool,bool,int,)
+CALCIUM_C2CPP_INTERFACE_CXX_(cplx,cplx,float,)
+CALCIUM_C2CPP_INTERFACE_CXX_(str,str,char*,)
/* Définition de ecp_fin */
extern "C" CalciumTypes::InfoType
extern "C" void ecp_lecture_##_name##_free ( _type _qual * data) \
{ \
CalciumInterface::ecp_free< _type, _porttype >(data); \
- }; \
+ } \
\
\
extern "C" CalciumTypes::InfoType ecp_ecriture_##_name (void * component, int dependencyType, \
} \
DEBTRACE( "-------- CalciumInterface(ecriture Inter Part), Valeur de data :" << data ) \
return CalciumTypes::CPOK; \
- }; \
+ } \
#endif
/* Erreur PVM */
// const int CPPVM = 37;
// const int CPCOM = 37;
- /* Erreur detectee au niveau de l'int CPERRINST = 38;
+ /* Erreur detectee au niveau de l'int CPERRINST = 38; */
/* Mode d'execution non defini */
// const int CPMODE = 39;
struct Copy2UserSpace{
template <class T1, class T2>
- static void apply( T1 * & data, T2 & corbaData, size_t nRead ){
+ static void apply( T1 * & data, T2 & corbaData, size_t /*nRead*/ ){
typedef typename DataManipulator::InnerType InnerType;
template <bool rel, typename DataManipulator >
struct DeleteTraits {
template <typename T>
- static void apply(T * dataPtr) {
+ static void apply(T * /*dataPtr*/) {
typedef typename DataManipulator::Type DataType; // Attention != T
lastarg ) ; \
-CALCIUM_ECR_INTERFACE_C_H(een_fort_,float ,cal_int,cal_int,integer,,);
-CALCIUM_ECR_INTERFACE_C_H(elg_fort_,float ,cal_int,long ,long2integer,,);
-CALCIUM_ECR_INTERFACE_C_H(eln_fort_,float ,cal_int,long ,long,,);
-CALCIUM_ECR_INTERFACE_C_H(ein_fort_,float ,cal_int,int ,int2integer,,);
-CALCIUM_ECR_INTERFACE_C_H(ere_fort_,float ,cal_int,float ,float,,);
-CALCIUM_ECR_INTERFACE_C_H(erd_fort_,float ,cal_int,float ,float2double,,);
-CALCIUM_ECR_INTERFACE_C_H(edb_fort_,double,cal_int,double,double,,);
-CALCIUM_ECR_INTERFACE_C_H(elo_fort_,float ,cal_int,int ,bool,,); /*int pour bool ou cal_int */
-CALCIUM_ECR_INTERFACE_C_H(ecp_fort_,float ,cal_int,float ,cplx,,);
-CALCIUM_ECR_INTERFACE_C_H(ech_fort_,float ,cal_int,char ,str,STAR,LCH_LAST_PARAM );
+CALCIUM_ECR_INTERFACE_C_H(een_fort_,float ,cal_int,cal_int,integer,,)
+CALCIUM_ECR_INTERFACE_C_H(elg_fort_,float ,cal_int,long ,long2integer,,)
+CALCIUM_ECR_INTERFACE_C_H(eln_fort_,float ,cal_int,long ,long,,)
+CALCIUM_ECR_INTERFACE_C_H(ein_fort_,float ,cal_int,int ,int2integer,,)
+CALCIUM_ECR_INTERFACE_C_H(ere_fort_,float ,cal_int,float ,float,,)
+CALCIUM_ECR_INTERFACE_C_H(erd_fort_,float ,cal_int,float ,float2double,,)
+CALCIUM_ECR_INTERFACE_C_H(edb_fort_,double,cal_int,double,double,,)
+CALCIUM_ECR_INTERFACE_C_H(elo_fort_,float ,cal_int,int ,bool,,) /*int pour bool ou cal_int */
+CALCIUM_ECR_INTERFACE_C_H(ecp_fort_,float ,cal_int,float ,cplx,,)
+CALCIUM_ECR_INTERFACE_C_H(ech_fort_,float ,cal_int,char ,str,STAR,LCH_LAST_PARAM )
\
-CALCIUM_LECT_INTERFACE_C_H(len_fort_,float ,cal_int,cal_int ,integer,,);
-CALCIUM_LECT_INTERFACE_C_H(llg_fort_,float ,cal_int,long ,long2integer,,);
-CALCIUM_LECT_INTERFACE_C_H(lln_fort_,float ,cal_int,long ,long,,);
-CALCIUM_LECT_INTERFACE_C_H(lin_fort_,float ,cal_int,int ,int2integer,,);
-CALCIUM_LECT_INTERFACE_C_H(lre_fort_,float ,cal_int,float ,float,,);
-CALCIUM_LECT_INTERFACE_C_H(lrd_fort_,float ,cal_int,float ,float2double,,);
-CALCIUM_LECT_INTERFACE_C_H(ldb_fort_,double,cal_int,double ,double,,);
-CALCIUM_LECT_INTERFACE_C_H(llo_fort_,float ,cal_int,int ,bool,,); /*int pour bool ou cal_int */
-CALCIUM_LECT_INTERFACE_C_H(lcp_fort_,float ,cal_int,float ,cplx,,);
-CALCIUM_LECT_INTERFACE_C_H(lch_fort_,float ,cal_int,char ,str,STAR, LCH_LAST_PARAM );
+CALCIUM_LECT_INTERFACE_C_H(len_fort_,float ,cal_int,cal_int ,integer,,)
+CALCIUM_LECT_INTERFACE_C_H(llg_fort_,float ,cal_int,long ,long2integer,,)
+CALCIUM_LECT_INTERFACE_C_H(lln_fort_,float ,cal_int,long ,long,,)
+CALCIUM_LECT_INTERFACE_C_H(lin_fort_,float ,cal_int,int ,int2integer,,)
+CALCIUM_LECT_INTERFACE_C_H(lre_fort_,float ,cal_int,float ,float,,)
+CALCIUM_LECT_INTERFACE_C_H(lrd_fort_,float ,cal_int,float ,float2double,,)
+CALCIUM_LECT_INTERFACE_C_H(ldb_fort_,double,cal_int,double ,double,,)
+CALCIUM_LECT_INTERFACE_C_H(llo_fort_,float ,cal_int,int ,bool,,) /*int pour bool ou cal_int */
+CALCIUM_LECT_INTERFACE_C_H(lcp_fort_,float ,cal_int,float ,cplx,,)
+CALCIUM_LECT_INTERFACE_C_H(lch_fort_,float ,cal_int,char ,str,STAR, LCH_LAST_PARAM )
// OLD : Pour l'instant on résoud PB2 en créant une copie de la donnée en cas
// OLD : de connexions multiples. Il faudra tester la collocalisation.
// OLD : DataType copyOfData; // = data; PB1
- for(int i = 0; i < _my_ports->length(); i++) {
+ for(int i = 0; i < (int)_my_ports->length(); i++) { //TODO: mismatch signed/unsigned
CorbaPortTypeVar port = CorbaPortType::_narrow((*_my_ports)[i]);
//if (i) { PB1
int main() {
TEST1 test1;
TEST2 test2;
-};
+}
class A {
public:
- DSC_EXCEPTION(Exp1);
- DSC_EXCEPTION(Exp2);
+ DSC_EXCEPTION(Exp1)
+ DSC_EXCEPTION(Exp2)
A() {};
virtual ~A() {};
}
};
-DSC_EXCEPTION_CXX(A,Exp1);
-DSC_EXCEPTION_CXX(A,Exp2);
+DSC_EXCEPTION_CXX(A,Exp1)
+DSC_EXCEPTION_CXX(A,Exp2)
int main() {
std::cout << "Exception ... reçue mais aurait dû recevoir Exception DSC" << std::endl;
}
-};
+}
delete [] name;
hdf_dataset->GetDim(dim);
- fprintf(fp, " %i\n", ndim);
+ fprintf(fp, " %li\n", ndim);
for(int i = 0;i < ndim;i++) {
- fprintf(fp, " %Ii", dim[i]);
+ fprintf(fp, " %li", dim[i]);
}
fprintf(fp, "\n");
delete [] dim;
- fprintf(fp, "%li %i:", size, order);
+ fprintf(fp, "%i %i:", size, order);
if( type == HDF_ARRAY ) {
HDFarray *array = new HDFarray(hdf_dataset);
hdf_type data_type = array->GetDataType();
array->GetDim(arr_dim);
for( int i = 0;i < arr_ndim; i++ ) {
- fprintf(fp, " %Ii", arr_dim[i]);
+ fprintf(fp, " %i", arr_dim[i]);
}
//And write the data array
size_t size = hdf_attribute->GetSize();
fprintf(fp, "%s\n", ATTRIBUTE_ID);
- fprintf(fp, "%s %i %Ii\n", name, type, size);
+ fprintf(fp, "%s %i %i\n", name, type, size);
delete [] name;
new_job->setWorkDirectory(job_params.MachinesList[clusterName].WorkDirectory);
new_job->setEnvFile(job_params.MachinesList[clusterName].EnvFile);
- for(int i=0; i < job_params.InputFile.size(); i++)
+ for(size_t i=0; i < job_params.InputFile.size(); i++)
new_job->add_in_file(job_params.InputFile[i]);
- for(int i=0; i < job_params.OutputFile.size();i++)
+ for(size_t i=0; i < job_params.OutputFile.size();i++)
new_job->add_out_file(job_params.OutputFile[i]);
resourceParams p;
if (_NS.Change_Directory(path.c_str()))
{
std::vector<std::string> subdirs = _NS.list_subdirs();
- for (int i=0; i<subdirs.size(); i++)
+ for (int i=0; i<(int)subdirs.size(); i++) //TODO: mismatch signed/unsigned
{
std::string subpath=path + "/" +subdirs[i];
_destroyDirectoryRecurs(subpath);
std::vector<std::string> components = dynamic_cast<SALOMEDSImpl_AttributeStudyProperties*>(_impl)->GetStoredComponents();
SALOMEDS::StringSeq_var c_components = new SALOMEDS::StringSeq();
c_components->length((_CORBA_ULong)components.size()); //!< TODO: conversion from size_t to _CORBA_ULong
- for (int i = 0; i < components.size(); i++) {
+ for (int i = 0; i < (int)components.size(); i++) { //TODO: mismatch signed/unsigned
c_components[i] = CORBA::string_dup(components[i].c_str());
}
return c_components._retn();
std::vector<std::string> versions = dynamic_cast<SALOMEDSImpl_AttributeStudyProperties*>(_impl)->GetComponentVersions(theComponent);
SALOMEDS::StringSeq_var c_versions = new SALOMEDS::StringSeq();
c_versions->length((_CORBA_ULong)versions.size()); //!< TODO: conversion from size_t to _CORBA_ULong
- for (int i = 0; i < versions.size(); i++) {
+ for (int i = 0; i < (int)versions.size(); i++) { //TODO: mismatch signed/unsigned
c_versions[i] = CORBA::string_dup(versions[i].c_str());
}
return c_versions._retn();
SALOMEDS::LongSeq_var CorbaSeq = new SALOMEDS::LongSeq;
std::vector<int> aSeq = aTable->GetSetRowIndices(theRow);
CorbaSeq->length((_CORBA_ULong)aSeq.size()); //!< TODO: conversion from size_t to _CORBA_ULong
- for (int i = 0; i < aSeq.size(); i++) {
+ for (int i = 0; i < (int)aSeq.size(); i++) { //TODO: mismatch signed/unsigned
CorbaSeq[i] = aSeq[i];
}
return CorbaSeq._retn();
throw SALOMEDS::AttributeTable::IncorrectIndex();
}
CorbaSeq->length((_CORBA_ULong)aSeq.size()); //!< TODO: conversion from size_t to _CORBA_ULong
- for (int i = 0; i < aSeq.size(); i++) {
+ for (int i = 0; i < (int)aSeq.size(); i++) { //TODO: mismatch signed/unsigned
CorbaSeq[i] = aSeq[i];
}
return CorbaSeq._retn();
throw SALOMEDS::AttributeTable::IncorrectIndex();
}
CorbaSeq->length((_CORBA_ULong)aSeq.size()); //!< TODO: conversion from size_t to _CORBA_ULong
- for (int i = 0; i < aSeq.size(); i++) {
+ for (int i = 0; i < (int)aSeq.size(); i++) { //TODO: mismatch signed/unsigned
CorbaSeq[i] = aSeq[i];
}
return CorbaSeq._retn();
throw SALOMEDS::AttributeTable::IncorrectIndex();
}
CorbaSeq->length((_CORBA_ULong)aSeq.size()); //!< TODO: conversion from size_t to _CORBA_ULong
- for (int i = 0; i < aSeq.size(); i++) {
+ for (int i = 0; i < (int)aSeq.size(); i++) { //TODO: mismatch signed/unsigned
CorbaSeq[i] = aSeq[i];
}
return CorbaSeq._retn();
throw SALOMEDS::AttributeTable::IncorrectIndex();
}
CorbaSeq->length((_CORBA_ULong)aSeq.size()); //!< TODO: conversion from size_t to _CORBA_ULong
- for (int i = 0; i < aSeq.size(); i++) {
+ for (int i = 0; i < (int)aSeq.size(); i++) { //TODO: mismatch signed/unsigned
CorbaSeq[i] = aSeq[i];
}
return CorbaSeq._retn();
throw SALOMEDS::AttributeTable::IncorrectIndex();
}
CorbaSeq->length((_CORBA_ULong)aSeq.size()); //!< TODO: conversion from size_t to _CORBA_ULong
- for (int i = 0; i < aSeq.size(); i++) {
+ for (int i = 0; i < (int)aSeq.size(); i++) { //TODO: mismatch signed/unsigned
CorbaSeq[i] = aSeq[i];
}
return CorbaSeq._retn();
throw SALOMEDS::AttributeTable::IncorrectIndex();
}
CorbaSeq->length((_CORBA_ULong)aSeq.size()); //!< TODO: conversion from size_t to _CORBA_ULong
- for (int i = 0; i < aSeq.size(); i++) {
+ for (int i = 0; i < (int)aSeq.size(); i++) { //TODO: mismatch signed/unsigned
CorbaSeq[i] = aSeq[i];
}
return CorbaSeq._retn();
throw SALOMEDS::AttributeTable::IncorrectIndex();
}
CorbaSeq->length((_CORBA_ULong)aSeq.size()); //!< TODO: conversion from size_t to _CORBA_ULong
- for (int i = 0; i < aSeq.size(); i++) {
+ for (int i = 0; i < (int)aSeq.size(); i++) { //TODO: mismatch signed/unsigned
CorbaSeq[i] = aSeq[i];
}
return CorbaSeq._retn();
throw SALOMEDS::AttributeTable::IncorrectIndex();
}
CorbaSeq->length((_CORBA_ULong)aSeq.size()); //!< TODO: conversion from size_t to _CORBA_ULong
- for (int i = 0; i < aSeq.size(); i++) {
+ for (int i = 0; i < (int)aSeq.size(); i++) { //TODO: mismatch signed/unsigned
CorbaSeq[i] = aSeq[i];
}
return CorbaSeq._retn();
#include "Utils_ExceptHandlers.hxx"
-UNEXPECT_CATCH(ATS_IncorrectIndex, SALOMEDS::AttributeTable::IncorrectIndex);
-UNEXPECT_CATCH(ATS_IncorrectArgumentLength, SALOMEDS::AttributeTable::IncorrectArgumentLength);
+UNEXPECT_CATCH(ATS_IncorrectIndex, SALOMEDS::AttributeTable::IncorrectIndex)
+UNEXPECT_CATCH(ATS_IncorrectArgumentLength, SALOMEDS::AttributeTable::IncorrectArgumentLength)
void SALOMEDS_AttributeTableOfString_i::SetTitle(const char* theTitle)
{
SALOMEDS::StringSeq_var CorbaSeq = new SALOMEDS::StringSeq;
std::vector<std::string> aRow = aTable->GetRowData(theRow);
CorbaSeq->length((_CORBA_ULong)aRow.size()); //!< TODO: conversion from size_t to _CORBA_ULong
- for (int i = 0; i < aRow.size(); i++) {
+ for (int i = 0; i < (int)aRow.size(); i++) { //TODO: mismatch signed/unsigned
CorbaSeq[i] = CORBA::string_dup(aRow[i].c_str());
}
return CorbaSeq._retn();
SALOMEDS::StringSeq_var CorbaSeq = new SALOMEDS::StringSeq;
std::vector<std::string> aColumn = aTable->GetColumnData(theColumn);
CorbaSeq->length((_CORBA_ULong)aColumn.size()); //!< TODO: conversion from size_t to _CORBA_ULong
- for (int i = 0; i < aColumn.size(); i++) {
+ for (int i = 0; i < (int)aColumn.size(); i++) { //TODO: mismatch signed/unsigned
CorbaSeq[i] = CORBA::string_dup(aColumn[i].c_str());
}
return CorbaSeq._retn();
SALOMEDS::LongSeq_var CorbaSeq = new SALOMEDS::LongSeq;
std::vector<int> aSeq = aTable->GetSetRowIndices(theRow);
CorbaSeq->length((_CORBA_ULong)aSeq.size()); //!< TODO: conversion from size_t to _CORBA_ULong
- for (int i = 0; i < aSeq.size(); i++) {
+ for (int i = 0; i < (int)aSeq.size(); i++) { //TODO: mismatch signed/unsigned
CorbaSeq[i] = aSeq[i];
}
return CorbaSeq._retn();
throw SALOMEDS::AttributeTable::IncorrectIndex();
}
CorbaSeq->length((_CORBA_ULong)aSeq.size()); //!< TODO: conversion from size_t to _CORBA_ULong
- for (int i = 0; i < aSeq.size(); i++) {
+ for (int i = 0; i < (int)aSeq.size(); i++) { //TODO: mismatch signed/unsigned
CorbaSeq[i] = aSeq[i];
}
return CorbaSeq._retn();
throw SALOMEDS::AttributeTable::IncorrectIndex();
}
CorbaSeq->length((_CORBA_ULong)aSeq.size()); //!< TODO: conversion from size_t to _CORBA_ULong
- for (int i = 0; i < aSeq.size(); i++) {
+ for (int i = 0; i < (int)aSeq.size(); i++) { //TODO: mismatch signed/unsigned
CorbaSeq[i] = aSeq[i];
}
return CorbaSeq._retn();
throw SALOMEDS::AttributeTable::IncorrectIndex();
}
CorbaSeq->length((_CORBA_ULong)aSeq.size()); //!< TODO: conversion from size_t to _CORBA_ULong
- for (int i = 0; i < aSeq.size(); i++) {
+ for (int i = 0; i < (int)aSeq.size(); i++) { //TODO: mismatch signed/unsigned
CorbaSeq[i] = aSeq[i];
}
return CorbaSeq._retn();
throw SALOMEDS::AttributeTable::IncorrectIndex();
}
CorbaSeq->length((_CORBA_ULong)aSeq.size()); //!< TODO: conversion from size_t to _CORBA_ULong
- for (int i = 0; i < aSeq.size(); i++) {
+ for (int i = 0; i < (int)aSeq.size(); i++) { //TODO: mismatch signed/unsigned
CorbaSeq[i] = aSeq[i];
}
return CorbaSeq._retn();
#include <unistd.h>
#endif
-UNEXPECT_CATCH(GALockProtection, SALOMEDS::GenericAttribute::LockProtection);
+UNEXPECT_CATCH(GALockProtection, SALOMEDS::GenericAttribute::LockProtection)
SALOMEDS_GenericAttribute_i::SALOMEDS_GenericAttribute_i(DF_Attribute* theImpl, CORBA::ORB_ptr theOrb) :
GenericObj_i(SALOMEDS_Study_i::GetThePOA())
if(!_ap) return "";
if(!_ap->IsSet(listName, PT_STRARRAY)) return "";
std::vector<std::string> v = _ap->GetStrArray(listName);
- if(index >= v.size()) return "";
+ if(index >= (int)v.size()) return ""; //TODO: mismatch signed/unsigned
return v[index];
}
std::string SALOMEDS_IParameters::decodeEntry(const std::string& entry)
{
int pos = (int)entry.rfind("_"); //!< TODO: conversion from size_t to int
- if(pos < 0 || pos >= entry.length()) return entry;
+ if(pos < 0 || pos >= (int)entry.length()) return entry; //TODO: mismatch signed/unsigned
std::string compName(entry, 0, pos), compID, tail(entry, pos+1, entry.length()-1);
#include <DF_Document.hxx>
#include <stdlib.h>
-UNEXPECT_CATCH(SBSalomeException, SALOME::SALOME_Exception);
-UNEXPECT_CATCH(SBLockProtection, SALOMEDS::StudyBuilder::LockProtection);
+UNEXPECT_CATCH(SBSalomeException, SALOME::SALOME_Exception)
+UNEXPECT_CATCH(SBLockProtection, SALOMEDS::StudyBuilder::LockProtection)
//============================================================================
/*! Function : constructor
#include <unistd.h>
#endif
-UNEXPECT_CATCH(SalomeException,SALOME::SALOME_Exception);
-UNEXPECT_CATCH(LockProtection, SALOMEDS::StudyBuilder::LockProtection);
+UNEXPECT_CATCH(SalomeException,SALOME::SALOME_Exception)
+UNEXPECT_CATCH(LockProtection, SALOMEDS::StudyBuilder::LockProtection)
static SALOMEDS_Driver_i* GetDriver(const SALOMEDSImpl_SObject& theObject, CORBA::ORB_ptr orb);
* Purpose :
*/
//============================================================================
-void SALOMEDS_Study_i::AddPostponed(const char* theIOR)
+void SALOMEDS_Study_i::AddPostponed(const char* /*theIOR*/)
{
SALOMEDS::Locker lock;
//Not implemented
}
-void SALOMEDS_Study_i::AddCreatedPostponed(const char* theIOR)
+void SALOMEDS_Study_i::AddCreatedPostponed(const char* /*theIOR*/)
{
SALOMEDS::Locker lock;
//Not implemented
* Purpose :
*/
//============================================================================
-void SALOMEDS_Study_i::UndoPostponed(CORBA::Long theWay)
+void SALOMEDS_Study_i::UndoPostponed(CORBA::Long /*theWay*/)
{
SALOMEDS::Locker lock;
//Not implemented
void EnableUseCaseAutoFilling(CORBA::Boolean isEnabled);
// postponed destroying of CORBA object functionality
- virtual void AddPostponed(const char* theIOR);
+ virtual void AddPostponed(const char* /*theIOR*/);
- virtual void AddCreatedPostponed(const char* theIOR);
+ virtual void AddCreatedPostponed(const char* /*theIOR*/);
virtual void RemovePostponed(CORBA::Long theUndoLimit); // removes postponed IORs of old transaction
// if theUndoLimit==0, removes all
- virtual void UndoPostponed(CORBA::Long theWay); // theWay = 1: resurrect objects,
+ virtual void UndoPostponed(CORBA::Long /*theWay*/); // theWay = 1: resurrect objects,
// theWay = -1: get back to the list of postponed
virtual SALOMEDS::AttributeParameter_ptr GetCommonParameters(const char* theID, CORBA::Long theSavePoint);
CPPUNIT_ASSERT(v.size() == 3);
- for(int i = 0; i<v.size(); i++)
+ for(int i = 0; i<(int)v.size(); i++)
CPPUNIT_ASSERT((i+1) == v[i]);
v.push_back(5);
}
result = indices;
- for ( int col = 0; col < indices.size(); col++ ) {
+ for ( int col = 0; col < (int)indices.size(); col++ ) {//TODO: mismatch signed/unsigned
int idx = indices[col];
if ( col+1 == idx ) continue;
SwapCells(theRow, col+1, theRow, idx);
int idx1 = 0;
- for ( int i = col+1; i < indices.size() && idx1 == 0; i++)
+ for ( int i = col+1; i < (int)indices.size() && idx1 == 0; i++)//TODO: mismatch signed/unsigned
if ( indices[i] == col+1 ) idx1 = i;
indices[idx1] = idx;
}
}
result = indices;
- for ( int row = 0; row < indices.size(); row++ ) {
+ for ( int row = 0; row < (int)indices.size(); row++ ) {//TODO: mismatch signed/unsigned
int idx = indices[row];
if ( row+1 == idx ) continue;
SwapCells(row+1, theColumn, idx, theColumn);
int idx1 = 0;
- for ( int i = row+1; i < indices.size() && idx1 == 0; i++)
+ for ( int i = row+1; i < (int)indices.size() && idx1 == 0; i++)//TODO: mismatch signed/unsigned
if ( indices[i] == row+1 ) idx1 = i;
indices[idx1] = idx;
}
}
result = indices;
- for ( int col = 0; col < indices.size(); col++ ) {
+ for ( int col = 0; col < (int)indices.size(); col++ ) {//TODO: mismatch signed/unsigned
int idx = indices[col];
if ( col+1 == idx ) continue;
SwapColumns(col+1, idx);
int idx1 = 0;
- for ( int i = col+1; i < indices.size() && idx1 == 0; i++)
+ for ( int i = col+1; i < (int)indices.size() && idx1 == 0; i++)//TODO: mismatch signed/unsigned
if ( indices[i] == col+1 ) idx1 = i;
indices[idx1] = idx;
}
}
result = indices;
- for ( int row = 0; row < indices.size(); row++ ) {
+ for ( int row = 0; row < (int)indices.size(); row++ ) { //TODO: mismatch signed/unsigned
int idx = indices[row];
if ( row+1 == idx ) continue;
SwapRows(row+1, idx);
int idx1 = 0;
- for ( int i = row+1; i < indices.size() && idx1 == 0; i++)
+ for ( int i = row+1; i < (int)indices.size() && idx1 == 0; i++) //TODO: mismatch signed/unsigned
if ( indices[i] == row+1 ) idx1 = i;
indices[idx1] = idx;
}
std::vector<std::string> v = ip.getProperties();
if(v.size() > 0) {
dump += "#Set up visual properties:\n";
- for(int i = 0; i<v.size(); i++) {
+ for(int i = 0; i<(int)v.size(); i++) {//TODO: mismatch signed/unsigned
std::string prp = ip.getProperty(v[i]);
dump += "ipar.setProperty(\""+v[i]+"\", \""+prp+"\")\n";
}
v = ip.getLists();
if(v.size() > 0) {
dump += "#Set up lists:\n";
- for(int i = 0; i<v.size(); i++) {
+ for(int i = 0; i<(int)v.size(); i++) { //TODO: mismatch signed/unsigned
std::vector<std::string> lst = ip.getValues(v[i]);
dump += "# fill list "+v[i]+"\n";
- for(int j = 0; j < lst.size(); j++) {
- if (lst[j].find('\"') == -1)
+ for(int j = 0; j < (int)lst.size(); j++) { //TODO: mismatch signed/unsigned
+ if (lst[j].find('\"') == -1) //TODO: std::string::npos
dump += "ipar.append(\""+v[i]+"\", \""+lst[j]+"\")\n";
else
dump += "ipar.append(\""+v[i]+"\", \"\"\""+lst[j]+"\"\"\")\n";
std::vector<std::string> v = ip.getProperties();
if(v.size() > 0) {
dump += shift +"#Set up visual properties:\n";
- for(int i = 0; i<v.size(); i++) {
+ for(int i = 0; i<(int)v.size(); i++) { //TODO: mismtach signed/unsigned
std::string prp = ip.getProperty(v[i]);
dump += shift +"ipar.setProperty(\""+v[i]+"\", \""+prp+"\")\n";
}
v = ip.getLists();
if(v.size() > 0) {
dump += shift +"#Set up lists:\n";
- for(int i = 0; i<v.size(); i++) {
+ for(int i = 0; i<(int)v.size(); i++) { //TODO: mismatch signed/unsigned
std::vector<std::string> lst = ip.getValues(v[i]);
dump += shift +"# fill list "+v[i]+"\n";
- for(int j = 0; j < lst.size(); j++)
+ for(int j = 0; j < (int)lst.size(); j++) //TODO: mismatch signed/unsigned
dump += shift +"ipar.append(\""+v[i]+"\", \""+lst[j]+"\")\n";
}
}
v = ip.getEntries();
if(v.size() > 0) {
dump += shift + "#Set up entries:\n";
- for(int i = 0; i<v.size(); i++) {
+ for(int i = 0; i<(int)v.size(); i++) { //TODO: mismatch signed/unsigned
std::vector<std::string> names = ip.getAllParameterNames(v[i]);
std::vector<std::string> values = ip.getAllParameterValues(v[i]);
std::string decodedEntry = ip.decodeEntry(v[i]);
dump += shift + "objId = " + values[idIndex] + "\n";
}
- for(int j = 0; j < names.size() && j < values.size(); j++) {
+ for(int j = 0; j < (int)names.size() && j < (int)values.size(); j++) { //TODO: mismtach siged/unsigned
if(names[j] == _PT_ID_) continue;
if(hasId)
dump += shift + "ipar.setParameter(" + "objId" + ", \"" + names[j] + "\", \"" + values[j] + "\")\n";
aStudy->SetStudyLock("SRN");
std::cout << "Is study locked = " << aStudy->IsStudyLocked() << std::endl;
std::vector<std::string> ids = aStudy->GetLockerID();
- for(int i = 0; i<ids.size(); i++)
+ for(size_t i = 0; i<ids.size(); i++)
std::cout << "Get study locker : " << ids[i] << std::endl;
aStudy->UnLockStudy("SRN");
std::cout << "Is study locked = " << aStudy->IsStudyLocked() << std::endl;
std::cout << "Check the attributes on SObject" << std::endl;
std::vector<DF_Attribute*> aSeq = aSO.GetAllAttributes();
- for(int i = 0; i < aSeq.size(); i++)
+ for(size_t i = 0; i < aSeq.size(); i++)
std::cout << "Found: " << dynamic_cast<SALOMEDSImpl_GenericAttribute*>(aSeq[i])->Type() << std::endl;
std::vector<double> v2 = AP->GetRealArray("1");
std::cout.precision(10);
std::cout << " values : ";
- for(int i = 0; i<v2.size(); i++) std::cout << v2[i] << " ";
+ for(size_t i = 0; i<v2.size(); i++) std::cout << v2[i] << " ";
std::cout << std::endl;
v[0] = 211.111;
v2 = AP->GetRealArray("2");
std::cout << "Restored real array with id = 2 is: ";
- for(int i = 0; i<v2.size(); i++) std::cout << v2[i] << " ";
+ for(size_t i = 0; i<v2.size(); i++) std::cout << v2[i] << " ";
std::cout << std::endl;
vi = AP->GetIntArray("2");
std::cout << "Restored int array with id = 2 is: ";
- for(int i = 0; i<vi.size(); i++) std::cout << vi[i] << " ";
+ for(size_t i = 0; i<vi.size(); i++) std::cout << vi[i] << " ";
std::cout << std::endl;
vs = AP->GetStrArray("3");
std::cout << "Restored string array with id = 2 is: ";
- for(int i = 0; i<vs.size(); i++) std::cout << vs[i] << " ";
+ for(size_t i = 0; i<vs.size(); i++) std::cout << vs[i] << " ";
std::cout << std::endl;
std::cout << "Check RemoveID 1 with type PT_INTEGER" << std::endl;
