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

This commit is contained in:
kuepper 2004-12-23 17:22:52 +00:00
commit 7b9e6d3e1f
4 changed files with 30 additions and 31 deletions

View file

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

View file

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

View file

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

View file

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