summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/ImplicitContextI.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/src/Ice/ImplicitContextI.cpp')
-rw-r--r--cpp/src/Ice/ImplicitContextI.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/cpp/src/Ice/ImplicitContextI.cpp b/cpp/src/Ice/ImplicitContextI.cpp
index a14c7cc01f3..ce5b2cb7d95 100644
--- a/cpp/src/Ice/ImplicitContextI.cpp
+++ b/cpp/src/Ice/ImplicitContextI.cpp
@@ -215,19 +215,19 @@ SharedImplicitContext::write(const Context& proxyCtx, ::IceInternal::BasicStream
IceUtil::Mutex::Lock lock(_mutex);
if(proxyCtx.size() == 0)
{
- __writeContext(s, _context);
+ s->write(_context);
}
else if(_context.size() == 0)
{
lock.release();
- __writeContext(s, proxyCtx);
+ s->write(proxyCtx);
}
else
{
Context combined = proxyCtx;
combined.insert(_context.begin(), _context.end());
lock.release();
- __writeContext(s, combined);
+ s->write(combined);
}
}
@@ -596,17 +596,17 @@ PerThreadImplicitContext::write(const Context& proxyCtx, ::IceInternal::BasicStr
if(threadCtx == 0 || threadCtx->size() == 0)
{
- __writeContext(s, proxyCtx);
+ s->write(proxyCtx);
}
else if(proxyCtx.size() == 0)
{
- __writeContext(s, *threadCtx);
+ s->write(*threadCtx);
}
else
{
Context combined = proxyCtx;
combined.insert(threadCtx->begin(), threadCtx->end());
- __writeContext(s, combined);
+ s->write(combined);
}
}