diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2006-03-29 08:42:35 +0000 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2006-03-29 08:42:35 +0000 |
| commit | f2b162b67c2382a2da555e7a960beaa3ab6b3997 (patch) | |
| tree | 5ba1d3a23c1f6ea4e1792f77b762d2fb17bb7bde /cpp/src/Ice/Reference.cpp | |
| parent | Fixed invalid implicit conversion (diff) | |
| download | ice-f2b162b67c2382a2da555e7a960beaa3ab6b3997.tar.bz2 ice-f2b162b67c2382a2da555e7a960beaa3ab6b3997.tar.xz ice-f2b162b67c2382a2da555e7a960beaa3ab6b3997.zip | |
Random fixes.
Diffstat (limited to 'cpp/src/Ice/Reference.cpp')
| -rw-r--r-- | cpp/src/Ice/Reference.cpp | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/cpp/src/Ice/Reference.cpp b/cpp/src/Ice/Reference.cpp index 77275bd8648..29280b2e5b3 100644 --- a/cpp/src/Ice/Reference.cpp +++ b/cpp/src/Ice/Reference.cpp @@ -34,6 +34,8 @@ using namespace IceInternal; void IceInternal::incRef(IceInternal::Reference* p) { p->__incRef(); } void IceInternal::decRef(IceInternal::Reference* p) { p->__decRef(); } +pointer_to_unary_function<int, int> Reference::_rand(IceUtil::random); + CommunicatorPtr IceInternal::Reference::getCommunicator() const { @@ -636,11 +638,7 @@ IceInternal::FixedReference::filterConnections(const vector<ConnectionIPtr>& all // // Randomize the order of connections. // -#ifdef _MSC_VER - random_shuffle(connections.begin(), connections.end(), ptr_fun(IceUtil::random)); -#else - random_shuffle(connections.begin(), connections.end(), IceUtil::random); -#endif + random_shuffle(connections.begin(), connections.end(), _rand); // // If a secure connection is requested, remove all non-secure @@ -936,11 +934,7 @@ IceInternal::RoutableReference::createConnection(const vector<EndpointIPtr>& all { case Random: { -#ifdef _MSC_VER - random_shuffle(endpoints.begin(), endpoints.end(), ptr_fun(IceUtil::random)); -#else - random_shuffle(endpoints.begin(), endpoints.end(), IceUtil::random); -#endif + random_shuffle(endpoints.begin(), endpoints.end(), _rand); break; } case Ordered: |