diff options
| author | Bernard Normier <bernard@zeroc.com> | 2006-10-27 20:04:28 +0000 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2006-10-27 20:04:28 +0000 |
| commit | be08cc3f416e6e8f4cd8c44c53f538d17ca1bef8 (patch) | |
| tree | 19572844043f86a25c4278220731de16873557a4 /cpp/src/Ice/ImplicitContextI.cpp | |
| parent | Updated depends (diff) | |
| download | ice-be08cc3f416e6e8f4cd8c44c53f538d17ca1bef8.tar.bz2 ice-be08cc3f416e6e8f4cd8c44c53f538d17ca1bef8.tar.xz ice-be08cc3f416e6e8f4cd8c44c53f538d17ca1bef8.zip | |
Implicit context java changes
Diffstat (limited to 'cpp/src/Ice/ImplicitContextI.cpp')
| -rw-r--r-- | cpp/src/Ice/ImplicitContextI.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/cpp/src/Ice/ImplicitContextI.cpp b/cpp/src/Ice/ImplicitContextI.cpp index 7e29f61102b..8ac03fdba2a 100644 --- a/cpp/src/Ice/ImplicitContextI.cpp +++ b/cpp/src/Ice/ImplicitContextI.cpp @@ -29,7 +29,7 @@ public: virtual void remove(const string&); virtual void write(const Context&, ::IceInternal::BasicStream*) const; - virtual void write(const Context&, Context&) const; + virtual void combine(const Context&, Context&) const; protected: @@ -49,7 +49,7 @@ public: virtual void remove(const string&); virtual void write(const Context&, ::IceInternal::BasicStream*) const; - virtual void write(const Context&, Context&) const; + virtual void combine(const Context&, Context&) const; private: @@ -73,7 +73,7 @@ public: virtual void remove(const string&); virtual void write(const Context&, ::IceInternal::BasicStream*) const; - virtual void write(const Context&, Context&) const; + virtual void combine(const Context&, Context&) const; static void threadDestructor(void*); @@ -236,7 +236,7 @@ SharedImplicitContextWithoutLocking::write(const Context& proxyCtx, ::IceInterna } void -SharedImplicitContextWithoutLocking::write(const Context& proxyCtx, Context& ctx) const +SharedImplicitContextWithoutLocking::combine(const Context& proxyCtx, Context& ctx) const { if(proxyCtx.size() == 0) { @@ -323,10 +323,10 @@ SharedImplicitContext::write(const Context& proxyCtx, ::IceInternal::BasicStream } void -SharedImplicitContext::write(const Context& proxyCtx, Context& ctx) const +SharedImplicitContext::combine(const Context& proxyCtx, Context& ctx) const { IceUtil::Mutex::Lock lock(_mutex); - SharedImplicitContextWithoutLocking::write(proxyCtx, ctx); + SharedImplicitContextWithoutLocking::combine(proxyCtx, ctx); } // @@ -640,7 +640,7 @@ PerThreadImplicitContext::write(const Context& proxyCtx, ::IceInternal::BasicStr } void -PerThreadImplicitContext::write(const Context& proxyCtx, Context& ctx) const +PerThreadImplicitContext::combine(const Context& proxyCtx, Context& ctx) const { Context* threadCtx = getThreadContext(false); |