-pedantic -Wall compilation

diff --git a/src/MEDCoupling/MEDCouplingUMesh.cxx b/src/MEDCoupling/MEDCouplingUMesh.cxx
index cdccb397f325f595ce150f670ca7671541bfd528..84178f580c4ad2163a3aad17193e18263f70d6f0 100644 (file)
--- a/src/MEDCoupling/MEDCouplingUMesh.cxx
+++ b/src/MEDCoupling/MEDCouplingUMesh.cxx
@@ -71,7 +71,7 @@ void MEDCouplingUMesh::checkCoherency() const throw(INTERP_KERNEL::Exception)
     throw INTERP_KERNEL::Exception("No mesh dimension specified !");
   for(std::set<INTERP_KERNEL::NormalizedCellType>::const_iterator iter=_types.begin();iter!=_types.end();iter++)
     {
-      if(INTERP_KERNEL::CellModel::getCellModel(*iter).getDimension()!=_mesh_dim)
+      if((int)INTERP_KERNEL::CellModel::getCellModel(*iter).getDimension()!=_mesh_dim)
         {
           std::ostringstream message;
           message << "Mesh invalid because dimension is " << _mesh_dim << " and there is presence of cell(s) with type " << (*iter);
@@ -350,7 +350,7 @@ void MEDCouplingUMesh::convertToPolyTypes(const std::vector<int>& cellIdsToConve
           unsigned nbOfFaces=cm.getNumberOfSons2(&connNew[pos+1],lgthOld);
           int *tmp=new int[nbOfFaces*lgthOld];
           int *work=tmp;
-          for(int j=0;j<nbOfFaces;j++)
+          for(int j=0;j<(int)nbOfFaces;j++)
             {
               INTERP_KERNEL::NormalizedCellType type;
               unsigned offset=cm.fillSonCellNodalConnectivity2(j,&connNew[pos+1],lgthOld,work,type);
@@ -441,7 +441,7 @@ MEDCouplingPointSet *MEDCouplingUMesh::buildPartOfMySelfNode(const int *start, c
       std::set<int> locMerge;
       std::insert_iterator< std::set<int> > it(locMerge,locMerge.begin());
       std::set_intersection(connOfCell.begin(),connOfCell.end(),fastFinder.begin(),fastFinder.end(),it);
-      if(locMerge.size()==refLgth && fullyIn || locMerge.size()!=0 && !fullyIn)
+      if((int)locMerge.size()==refLgth && fullyIn || locMerge.size()!=0 && !fullyIn)
         cellIdsKept.push_back(i);
     }
   return buildPartOfMySelf(&cellIdsKept[0],&cellIdsKept[0]+cellIdsKept.size(),true);

diff --git a/src/ParaMEDMEM/BlockTopology.cxx b/src/ParaMEDMEM/BlockTopology.cxx
index 90d0cb012dbc6a0f1067a35619ea24e7257e3d51..62d683bbf33ad35e3716daaf69c3ea7b45ea430d 100644 (file)
--- a/src/ParaMEDMEM/BlockTopology.cxx
+++ b/src/ParaMEDMEM/BlockTopology.cxx
@@ -124,7 +124,7 @@ namespace ParaMEDMEM
    * values of the different axes. 
    */
   BlockTopology::BlockTopology(const ProcessorGroup& group, MEDCouplingCMesh *grid):
-    _proc_group(&group), _dimension(grid->getSpaceDimension()), _owns_processor_group(false)
+    _dimension(grid->getSpaceDimension()), _proc_group(&group), _owns_processor_group(false)
   {
     vector <int> axis_length(_dimension);
     _nb_elems=1;
@@ -209,7 +209,7 @@ namespace ParaMEDMEM
    * to \a group will cause an MPI error, while calling from a subset
    * of \a group will result in a deadlock. 
    */
-  BlockTopology::BlockTopology(const ProcessorGroup& group, int nb_elem):_proc_group(&group),_dimension(1),_owns_processor_group(false)
+  BlockTopology::BlockTopology(const ProcessorGroup& group, int nb_elem):_dimension(1),_proc_group(&group),_owns_processor_group(false)
   {
     int* nbelems_per_proc = new int[group.size()];
     const MPIProcessorGroup* mpi_group=dynamic_cast<const MPIProcessorGroup*>(_proc_group);
@@ -279,7 +279,7 @@ namespace ParaMEDMEM
         buffer.push_back(_nb_procs_per_dim[i]);
         buffer.push_back(_cycle_type[i]);
         buffer.push_back(_local_array_indices[i].size());
-        for (int j=0; j<_local_array_indices[i].size(); j++)
+        for (int j=0; j<(int)_local_array_indices[i].size(); j++)
           buffer.push_back(_local_array_indices[i][j]);
       }
   
@@ -320,7 +320,7 @@ namespace ParaMEDMEM
         _nb_procs_per_dim[i]=*(ptr_serializer++);
         _cycle_type[i]=(CYCLE_TYPE)*(ptr_serializer++);
         _local_array_indices[i].resize(*(ptr_serializer++));
-        for (int j=0; j<_local_array_indices[i].size(); j++)
+        for (int j=0; j<(int)_local_array_indices[i].size(); j++)
           _local_array_indices[i][j]=*(ptr_serializer++);
       }
     set<int> procs;

diff --git a/src/ParaMEDMEM/ElementLocator.cxx b/src/ParaMEDMEM/ElementLocator.cxx
index 7a7237fb9b774f5c9094902f5d23614e83ae59c4..a41ccdcbed2fc7e07db3d77955190f5ea89b1759 100644 (file)
--- a/src/ParaMEDMEM/ElementLocator.cxx
+++ b/src/ParaMEDMEM/ElementLocator.cxx
@@ -41,8 +41,8 @@ namespace ParaMEDMEM
     : _local_para_field(sourceField),
       _local_cell_mesh(sourceField.getSupport()->getCellMesh()),
       _local_face_mesh(sourceField.getSupport()->getFaceMesh()),
-      _local_group(local_group),
-      _distant_group(distant_group)
+      _distant_group(distant_group),
+      _local_group(local_group)
   { 
     _union_group = _local_group.fuse(distant_group);
     _computeBoundingBoxes();

diff --git a/src/ParaMEDMEM/ExplicitMapping.hxx b/src/ParaMEDMEM/ExplicitMapping.hxx
index 2cf70a2ae6a55d19d52a24f2444efa846d4cacf8..a79c4429c322f1263df4dcdf3e53824e81b7875d 100644 (file)
--- a/src/ParaMEDMEM/ExplicitMapping.hxx
+++ b/src/ParaMEDMEM/ExplicitMapping.hxx
@@ -85,10 +85,10 @@ namespace ParaMEDMEM
       _comm_buffer=new int[_mapping.size()*2];
       std::vector<int> offsets(_distant_domains.size());
       offsets[0]=0;
-      for (int i=1; i<_distant_domains.size();i++)
+      for (int i=1; i<(int)_distant_domains.size();i++)
         offsets[i]=offsets[i-1]+_numbers[i-1];
       
-      for (int i=0; i< _mapping.size(); i++)
+      for (int i=0; i<(int)_mapping.size(); i++)
         {
           int offset= offsets[_mapping[i].first];
           _comm_buffer[offset*2]=idproc;
@@ -151,7 +151,7 @@ namespace ParaMEDMEM
         {
           _numbers=new int[nbDistantDomains()];
           _domains=new int[nbDistantDomains()];
-          for (int i=0; i< _mapping.size(); i++)
+          for (int i=0; i<(int)_mapping.size(); i++)
             {
               if ( counts.find(_mapping[i].first) == counts.end())
                 counts.insert(std::make_pair(_mapping[i].first,1));

diff --git a/src/ParaMEDMEM/ICoCoMEDField.cxx b/src/ParaMEDMEM/ICoCoMEDField.cxx
index 05b0d862bd7912371a96d8eb56c9da776f276d69..b82eef08e69e2f1eb1e48e88ef71aa02e5c42e72 100644 (file)
--- a/src/ParaMEDMEM/ICoCoMEDField.cxx
+++ b/src/ParaMEDMEM/ICoCoMEDField.cxx
@@ -147,4 +147,4 @@ namespace ICoCo
       }
   }
 
-};
+}

diff --git a/src/ParaMEDMEM/ICoCoMEDField.hxx b/src/ParaMEDMEM/ICoCoMEDField.hxx
index 8ace471494b5bd766744d8d824176e9f566ccac2..c46620df9a71bf1565ef1c9e06e18eb721801181 100644 (file)
--- a/src/ParaMEDMEM/ICoCoMEDField.hxx
+++ b/src/ParaMEDMEM/ICoCoMEDField.hxx
@@ -55,6 +55,6 @@ namespace ICoCo
     ParaMEDMEM::ParaMESH* _support;
     ParaMEDMEM::ComponentTopology* _comp_topology;
   };
-};
+}
 
 #endif

diff --git a/src/ParaMEDMEM/InterpolationMatrix.cxx b/src/ParaMEDMEM/InterpolationMatrix.cxx
index 42b6e8d635176638c32d9a6dc72401bcf75f96e0..353f715cf28fc1dcd5116d3480b817976364e687 100644 (file)
--- a/src/ParaMEDMEM/InterpolationMatrix.cxx
+++ b/src/ParaMEDMEM/InterpolationMatrix.cxx
@@ -60,13 +60,13 @@ namespace ParaMEDMEM
                                            const ProcessorGroup& target_group,
                                            const DECOptions& dec_options,
                                            const INTERP_KERNEL::InterpolationOptions& interp_options):
+    INTERP_KERNEL::InterpolationOptions(interp_options),
+    DECOptions(dec_options),
     _source_field(source_field),
     _source_support(source_field->getSupport()->getCellMesh()),
     _mapping(source_group, target_group, dec_options),
     _source_group(source_group),
-    _target_group(target_group),
-    DECOptions(dec_options),
-    INTERP_KERNEL::InterpolationOptions(interp_options)
+    _target_group(target_group)
   {
     int nbelems = source_field->getField()->getNumberOfTuples();
     _row_offsets.resize(nbelems+1);

diff --git a/src/ParaMEDMEM/MxN_Mapping.cxx b/src/ParaMEDMEM/MxN_Mapping.cxx
index a74d64089c3ffa30f754f3ff764b05c50da8de26..00845606bd7c11a88fe74a9fffdb23f7a930d363 100644 (file)
--- a/src/ParaMEDMEM/MxN_Mapping.cxx
+++ b/src/ParaMEDMEM/MxN_Mapping.cxx
@@ -28,8 +28,7 @@ namespace ParaMEDMEM
 {
 
   MxN_Mapping::MxN_Mapping(const ProcessorGroup& source_group, const ProcessorGroup& target_group,const DECOptions& dec_options)
-    : _union_group(source_group.fuse(target_group)),
-      DECOptions(dec_options)
+    : DECOptions(dec_options),_union_group(source_group.fuse(target_group))
   {
     _access_DEC = new MPIAccessDEC(source_group,target_group,getAsynchronous());
     _access_DEC->setTimeInterpolator(getTimeInterpolationMethod());
@@ -109,7 +108,7 @@ namespace ParaMEDMEM
         recvdispls[i]=_recv_proc_offsets[i];
       }
     vector<int> offsets = _send_proc_offsets;
-    for (int i=0; i<_sending_ids.size();i++)
+    for (int i=0; i<(int)_sending_ids.size();i++)
       {
         int iproc = _sending_ids[i].first;
         isendbuf[offsets[iproc]]=_sending_ids[i].second;
@@ -167,7 +166,7 @@ namespace ParaMEDMEM
     //building the buffer of the elements to be sent
     vector<int> offsets = _send_proc_offsets;
 
-    for (int i=0; i<_sending_ids.size();i++)
+    for (int i=0; i<(int)_sending_ids.size();i++)
       { 
         int iproc = _sending_ids[i].first;
         for (int icomp=0; icomp<nbcomp; icomp++)

diff --git a/src/ParaMEDMEM/ParaFIELD.cxx b/src/ParaMEDMEM/ParaFIELD.cxx
index 58532760adc6e7be9d0118a5d28e181a34b32a26..d9a9f7e2c1aad2ec40697507f341321331385bbd 100644 (file)
--- a/src/ParaMEDMEM/ParaFIELD.cxx
+++ b/src/ParaMEDMEM/ParaFIELD.cxx
@@ -63,9 +63,9 @@ namespace ParaMEDMEM
 
   */
   ParaFIELD::ParaFIELD(TypeOfField type, TypeOfTimeDiscretization td, ParaMESH* para_support, const ComponentTopology& component_topology)
-    :_support(para_support),
+    :_field(0),
      _component_topology(component_topology),_topology(0),
-     _field(0),
+     _support(para_support),
      _has_field_ownership(true),
      _has_support_ownership(false)
   {
@@ -109,8 +109,8 @@ namespace ParaMEDMEM
   */
   ParaFIELD::ParaFIELD(MEDCouplingFieldDouble* subdomain_field, const ProcessorGroup& proc_group):
     _field(subdomain_field),
-    _support(),
     _component_topology(ComponentTopology(_field->getNumberOfComponents())),_topology(0),
+    _support(),
     _has_field_ownership(false),
     _has_support_ownership(true)
   {

diff --git a/src/ParaMEDMEM/StructuredCoincidentDEC.cxx b/src/ParaMEDMEM/StructuredCoincidentDEC.cxx
index 2f0f03b1fe07539de07cd90c32c5520ed9ed7b12..282b6fc1eac9e325fd6d4d95c30a1be4fbe96af0 100644 (file)
--- a/src/ParaMEDMEM/StructuredCoincidentDEC.cxx
+++ b/src/ParaMEDMEM/StructuredCoincidentDEC.cxx
@@ -79,9 +79,9 @@ namespace ParaMEDMEM
 
 
   StructuredCoincidentDEC::StructuredCoincidentDEC():_topo_source(0),_topo_target(0),
-                                                     _recv_buffer(0),_send_buffer(0),
-                                                     _recv_counts(0),_send_counts(0),
-                                                     _recv_displs(0),_send_displs(0)
+                                                     _send_counts(0),_recv_counts(0),
+                                                     _send_displs(0),_recv_displs(0),
+                                                     _recv_buffer(0),_send_buffer(0)
   {  
   }
 
@@ -104,8 +104,11 @@ namespace ParaMEDMEM
     \addtogroup structuredcoincidentdec
     @{
   */
-  StructuredCoincidentDEC::StructuredCoincidentDEC(ProcessorGroup& local_group, ProcessorGroup& distant_group):DEC(local_group,distant_group),_topo_source(0),_topo_target(0),_recv_buffer(0),_send_buffer(0),
-                                                                                                               _recv_counts(0),_send_counts(0),_recv_displs(0),_send_displs(0)
+  StructuredCoincidentDEC::StructuredCoincidentDEC(ProcessorGroup& local_group, ProcessorGroup& distant_group):DEC(local_group,distant_group),
+                                                                                                               _topo_source(0),_topo_target(0),
+                                                                                                               _send_counts(0),_recv_counts(0),
+                                                                                                               _send_displs(0),_recv_displs(0),
+                                                                                                               _recv_buffer(0),_send_buffer(0)
   {
   }