more adjustments for gcc-3.4 (now using optimization, go figure...)

eo/src/eoFunctorStore.cpp

@@ -9,8 +9,7 @@
 /// clears the memory
 eoFunctorStore::~eoFunctorStore()
 {
-    for (size_t i = 0; i < vec.size(); ++i)
-    {
+    for(size_t i = 0; i < vec.size(); ++i) {
         delete vec[i];
     }
 }

eo/src/eoFunctorStore.h

@@ -38,13 +38,13 @@ dynamically created functors.
 */
 class eoFunctorStore
 {
-    public :
+public:
 
-  /// Default Ctor
-        eoFunctorStore() {}
+    /// Default Ctor
+    eoFunctorStore() {}
 
-  // virtual destructor so we don't need to define it in derived classes
-        virtual ~eoFunctorStore();
+    // virtual destructor so we don't need to define it in derived classes
+    virtual ~eoFunctorStore();
 
         /// Add an eoFunctorBase to the store
         template <class Functor>

eo/src/eoStochasticUniversalSelect.h

@@ -85,7 +85,7 @@ public:
       // shuffle
       for (int i = indices.size() - 1; i > 0; --i) {
 	  int j = rng.random(i+1);
-	  swap(indices[i], indices[j]);
+	  std::swap(indices[i], indices[j]);
       }
   }
 

eo/src/ga/eoPBILOrg.h

@@ -65,8 +65,8 @@ public:
 	// else nothing
 
 	// stay away from 0 and 1
-	p[g] = min(maxBound, p[g]);
-	p[g] = max(minBound, p[g]);
+	p[g] = std::min(maxBound, p[g]);
+	p[g] = std::max(minBound, p[g]);
       }
   }