From d44a696e2168a98e4430f49bde0aa33d24113fd7 Mon Sep 17 00:00:00 2001
From: Caner Candan <candan@info.univ-angers.fr>
Date: Sat, 23 Jun 2012 13:39:17 +0200
Subject: [PATCH] * fixed regression with gcc 4.7

---
 eo/src/eoScalarFitnessAssembled.h | 2 +-
 eo/src/gp/eoParseTree.h           | 4 ++--
 eo/test/CMakeLists.txt            | 2 +-
 eo/test/t-openmp.cpp              | 2 ++
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/eo/src/eoScalarFitnessAssembled.h b/eo/src/eoScalarFitnessAssembled.h
index 95168ec6..50e9038d 100644
--- a/eo/src/eoScalarFitnessAssembled.h
+++ b/eo/src/eoScalarFitnessAssembled.h
@@ -212,7 +212,7 @@ public:
   //! Print term values and descriptions
   void printAll(std::ostream& os) const {
     for (size_type i=0; i < size(); ++i )
-      os << FitnessTraits::getDescription(i) << " = " << operator[](i) << " ";
+      os << FitnessTraits::getDescription(i) << " = " << this->operator[](i) << " ";
   }
 
   //! Comparison, using less by default
diff --git a/eo/src/gp/eoParseTree.h b/eo/src/gp/eoParseTree.h
index 11ec105e..88737d91 100644
--- a/eo/src/gp/eoParseTree.h
+++ b/eo/src/gp/eoParseTree.h
@@ -94,7 +94,7 @@ public:
 
         while (size() > _size)
         {
-            back() = operator[](size()-2);
+            back() = this->operator[](size()-2);
         }
     }
 
@@ -150,7 +150,7 @@ public:
             v[i] = node;
         }
         parse_tree<Node> tmp(v.begin(), v.end());
-        swap(tmp);
+        this->swap(tmp);
 
         /*
          * old code which caused problems for paradisEO
diff --git a/eo/test/CMakeLists.txt b/eo/test/CMakeLists.txt
index 4e68b02a..c4fcc8db 100644
--- a/eo/test/CMakeLists.txt
+++ b/eo/test/CMakeLists.txt
@@ -66,7 +66,7 @@ SET (TEST_LIST
   t-eoLogger
   t-eoIQRStat
   t-eoParallel
-  t-openmp
+  #t-openmp # does not work anymore since functions used in this test were removed from EO
   #t-eoDualFitness
   t-eoParser
   )
diff --git a/eo/test/t-openmp.cpp b/eo/test/t-openmp.cpp
index a1d68087..d2f4cf3b 100644
--- a/eo/test/t-openmp.cpp
+++ b/eo/test/t-openmp.cpp
@@ -39,6 +39,8 @@ Caner Candan <caner.candan@thalesgroup.com>
 
 #include <omp.h>
 
+#include <unistd.h>
+
 #include "real_value.h"
 
 //-----------------------------------------------------------------------------