From 0e327a88a4640b291ee096fb31396ed4d203f636 Mon Sep 17 00:00:00 2001 From: Bernard Normier Date: Wed, 28 Jun 2006 22:52:03 +0000 Subject: Port to Solaris 10 + fix for numerous warnings on Sun --- cpp/src/IceGrid/AdapterCache.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'cpp/src/IceGrid/AdapterCache.cpp') diff --git a/cpp/src/IceGrid/AdapterCache.cpp b/cpp/src/IceGrid/AdapterCache.cpp index 952a58d7686..7a43d8c7d54 100644 --- a/cpp/src/IceGrid/AdapterCache.cpp +++ b/cpp/src/IceGrid/AdapterCache.cpp @@ -16,11 +16,11 @@ #include #include +#include + using namespace std; using namespace IceGrid; -pointer_to_unary_function ReplicaGroupEntry::_rand(IceUtil::random); - namespace IceGrid { @@ -365,14 +365,14 @@ ReplicaGroupEntry::getProxies(int& nReplicas, bool& replicaGroup) else if(AdaptiveLoadBalancingPolicyPtr::dynamicCast(_loadBalancing)) { replicas = _replicas; - random_shuffle(replicas.begin(), replicas.end(), _rand); + random_shuffle(replicas.begin(), replicas.end(), RandomNumberGenerator()); adaptive = true; loadSample = _loadSample; } else// if(RandomLoadBalancingPolicyPtr::dynamicCast(_loadBalancing)) { replicas = _replicas; - random_shuffle(replicas.begin(), replicas.end(), _rand); + random_shuffle(replicas.begin(), replicas.end(), RandomNumberGenerator()); } } @@ -439,7 +439,7 @@ ReplicaGroupEntry::getLeastLoadedNodeLoad(LoadSample loadSample) const // This must be done outside the synchronization block since // min_element() will call and lock each server entry. // - random_shuffle(replicas.begin(), replicas.end(), _rand); + random_shuffle(replicas.begin(), replicas.end(), RandomNumberGenerator()); vector rl; transform(replicas.begin(), replicas.end(), back_inserter(rl), ToReplicaLoad(loadSample)); AdapterEntryPtr adpt = min_element(rl.begin(), rl.end(), ReplicaLoadComp())->second.second; -- cgit v1.2.3