summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/Proxy.cpp
diff options
context:
space:
mode:
authorMarc Laukien <marc@zeroc.com>2001-10-01 02:28:14 +0000
committerMarc Laukien <marc@zeroc.com>2001-10-01 02:28:14 +0000
commitaf6ee090545af2480f22c91d84bb4f8aba43d052 (patch)
treec9f8af9f44a14df699f9999b4933cd556f8bc951 /cpp/src/Ice/Proxy.cpp
parentsome doc fixes (diff)
downloadice-af6ee090545af2480f22c91d84bb4f8aba43d052.tar.bz2
ice-af6ee090545af2480f22c91d84bb4f8aba43d052.tar.xz
ice-af6ee090545af2480f22c91d84bb4f8aba43d052.zip
servant factory/locator management changes
Diffstat (limited to 'cpp/src/Ice/Proxy.cpp')
-rw-r--r--cpp/src/Ice/Proxy.cpp10
1 files changed, 4 insertions, 6 deletions
diff --git a/cpp/src/Ice/Proxy.cpp b/cpp/src/Ice/Proxy.cpp
index 2ef08373d0f..d0b87ebcfc9 100644
--- a/cpp/src/Ice/Proxy.cpp
+++ b/cpp/src/Ice/Proxy.cpp
@@ -517,7 +517,7 @@ IceDelegateM::Ice::Object::setup(const ReferencePtr& ref)
case Reference::ModeBatchOneway:
{
remove_copy_if(__reference->endpoints.begin(), __reference->endpoints.end(), back_inserter(endpoints),
- ::IceInternal::constMemFun(&Endpoint::datagram));
+ ::Ice::constMemFun(&Endpoint::datagram));
break;
}
@@ -525,21 +525,19 @@ IceDelegateM::Ice::Object::setup(const ReferencePtr& ref)
case Reference::ModeBatchDatagram:
{
remove_copy_if(__reference->endpoints.begin(), __reference->endpoints.end(), back_inserter(endpoints),
- not1(::IceInternal::constMemFun(&Endpoint::datagram)));
+ not1(::Ice::constMemFun(&Endpoint::datagram)));
break;
}
}
if (__reference->secure)
{
- endpoints.erase(remove_if(endpoints.begin(), endpoints.end(),
- not1(::IceInternal::constMemFun(&Endpoint::secure))),
+ endpoints.erase(remove_if(endpoints.begin(), endpoints.end(), not1(::Ice::constMemFun(&Endpoint::secure))),
endpoints.end());
}
else
{
- endpoints.erase(remove_if(endpoints.begin(), endpoints.end(),
- ::IceInternal::constMemFun(&Endpoint::secure)),
+ endpoints.erase(remove_if(endpoints.begin(), endpoints.end(), ::Ice::constMemFun(&Endpoint::secure)),
endpoints.end());
}