diff options
Diffstat (limited to 'cpp/src/Ice/BasicStream.cpp')
| -rw-r--r-- | cpp/src/Ice/BasicStream.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/cpp/src/Ice/BasicStream.cpp b/cpp/src/Ice/BasicStream.cpp index 4e3de10edc8..ed6f5402460 100644 --- a/cpp/src/Ice/BasicStream.cpp +++ b/cpp/src/Ice/BasicStream.cpp @@ -1580,26 +1580,26 @@ IceInternal::BasicStream::read(vector<wstring>& v) } void -#ifndef ICE_CPP11_MAPPING -IceInternal::BasicStream::write(const ObjectPrxPtr& v) +#ifdef ICE_CPP11_MAPPING +IceInternal::BasicStream::writeProxy(const shared_ptr<ObjectPrx>& v) #else -IceInternal::BasicStream::writeProxy(const ObjectPrxPtr& v) +IceInternal::BasicStream::write(const ObjectPrx& v) #endif { _instance->proxyFactory()->proxyToStream(v, this); } -#ifndef ICE_CPP11_MAPPING -void -IceInternal::BasicStream::read(ObjectPrxPtr& v) +#ifdef ICE_CPP11_MAPPING +shared_ptr<ObjectPrx> +IceInternal::BasicStream::readProxy() { - v = _instance->proxyFactory()->streamToProxy(this); + return _instance->proxyFactory()->streamToProxy(this); } #else -ObjectPrxPtr -IceInternal::BasicStream::readProxy() +void +IceInternal::BasicStream::read(ObjectPrx& v) { - return _instance->proxyFactory()->streamToProxy(this); + v = _instance->proxyFactory()->streamToProxy(this); } #endif |