From 6600f1db51388626e52dc73fd37a18adc083ecf5 Mon Sep 17 00:00:00 2001
From: Benjamin Bouvier <bnjbouv@gmail.com>
Date: Tue, 10 Jul 2012 16:08:35 +0200
Subject: [PATCH] Suppressed some warnings at compilation.

---
 eo/src/eoPopEvalFunc.h |  4 ++--
 eo/src/mpi/eoMpi.h     | 38 +++++++++++++++++++++-----------------
 2 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/eo/src/eoPopEvalFunc.h b/eo/src/eoPopEvalFunc.h
index a728baa8..d37eebaf 100644
--- a/eo/src/eoPopEvalFunc.h
+++ b/eo/src/eoPopEvalFunc.h
@@ -107,8 +107,8 @@ class eoParallelPopLoopEval : public eoPopEvalFunc<EOT>
                 ) :
             assignAlgo( _assignAlgo ),
             masterRank( _masterRank ),
-            needToDeleteStore( false ),
-            store( _store )
+            store( _store ),
+            needToDeleteStore( false )
         {
             // empty
         }
diff --git a/eo/src/mpi/eoMpi.h b/eo/src/mpi/eoMpi.h
index 0281c9d5..0ef80c12 100644
--- a/eo/src/mpi/eoMpi.h
+++ b/eo/src/mpi/eoMpi.h
@@ -197,10 +197,13 @@ namespace eo
         class Job
         {
             public:
-                Job( AssignmentAlgorithm& _algo, int _masterRank, JobStore<JobData> & store ) :
+                Job( AssignmentAlgorithm& _algo,
+                     int _masterRank,
+                     JobStore<JobData> & store
+                    ) :
                     assignmentAlgo( _algo ),
-                    comm( Node::comm() ),
                     masterRank( _masterRank ),
+                    comm( Node::comm() ),
                     // Functors
                     sendTask( store.sendTask() ),
                     handleResponse( store.handleResponse() ),
@@ -217,11 +220,6 @@ namespace eo
 
             protected:
 
-                SendTaskFunction<JobData> & sendTask;
-                HandleResponseFunction<JobData> & handleResponse;
-                ProcessTaskFunction<JobData> & processTask;
-                IsFinishedFunction<JobData> & isFinished;
-
                 struct FinallyBlock
                 {
                     FinallyBlock(
@@ -231,8 +229,9 @@ namespace eo
                             ) :
                         totalWorkers( _totalWorkers ),
                         assignmentAlgo( _algo ),
-                        comm( Node::comm() ),
-                        that( _that )
+                        that( _that ),
+                        // global field
+                        comm( Node::comm() )
                     {
                         // empty
                     }
@@ -274,9 +273,10 @@ namespace eo
                     protected:
 
                     int totalWorkers;
-                    bmpi::communicator & comm;
-                    Job< JobData > & that;
                     AssignmentAlgorithm& assignmentAlgo;
+                    Job< JobData > & that;
+
+                    bmpi::communicator & comm;
                 };
 
                 void master( )
@@ -372,13 +372,17 @@ namespace eo
                 }
 
             protected:
-                AssignmentAlgorithm& assignmentAlgo;
-                bmpi::communicator& comm;
-                int masterRank;
-                bool _isMaster;
 
-                struct rusage _usage;
-                long _current;
+                AssignmentAlgorithm& assignmentAlgo;
+                int masterRank;
+                bmpi::communicator& comm;
+
+                SendTaskFunction<JobData> & sendTask;
+                HandleResponseFunction<JobData> & handleResponse;
+                ProcessTaskFunction<JobData> & processTask;
+                IsFinishedFunction<JobData> & isFinished;
+
+                bool _isMaster;
         };
     }
 }