diff options
| author | Jose <jose@zeroc.com> | 2015-12-01 17:36:19 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2015-12-01 17:36:19 +0100 |
| commit | 2029ff368e49fae489b8ec8fc12f7d126b182dfb (patch) | |
| tree | 6075d652b7851831c39e6f22004d8720864f1a60 /cpp/src/Ice/ProxyFactory.cpp | |
| parent | The default LMDB map size for IceGrid and IceStorm is now 10MB (Windows) (diff) | |
| download | ice-2029ff368e49fae489b8ec8fc12f7d126b182dfb.tar.bz2 ice-2029ff368e49fae489b8ec8fc12f7d126b182dfb.tar.xz ice-2029ff368e49fae489b8ec8fc12f7d126b182dfb.zip | |
C++11 mapping initial commit
Diffstat (limited to 'cpp/src/Ice/ProxyFactory.cpp')
| -rw-r--r-- | cpp/src/Ice/ProxyFactory.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/cpp/src/Ice/ProxyFactory.cpp b/cpp/src/Ice/ProxyFactory.cpp index c5ab91e336c..018cac70602 100644 --- a/cpp/src/Ice/ProxyFactory.cpp +++ b/cpp/src/Ice/ProxyFactory.cpp @@ -28,7 +28,7 @@ using namespace IceInternal; IceUtil::Shared* IceInternal::upCast(ProxyFactory* p) { return p; } -ObjectPrx +ObjectPrxPtr IceInternal::ProxyFactory::stringToProxy(const string& str) const { ReferencePtr ref = _instance->referenceFactory()->create(str, ""); @@ -36,7 +36,7 @@ IceInternal::ProxyFactory::stringToProxy(const string& str) const } string -IceInternal::ProxyFactory::proxyToString(const ObjectPrx& proxy) const +IceInternal::ProxyFactory::proxyToString(const ObjectPrxPtr& proxy) const { if(proxy) { @@ -48,7 +48,7 @@ IceInternal::ProxyFactory::proxyToString(const ObjectPrx& proxy) const } } -ObjectPrx +ObjectPrxPtr IceInternal::ProxyFactory::propertyToProxy(const string& prefix) const { string proxy = _instance->initializationData().properties->getProperty(prefix); @@ -57,7 +57,7 @@ IceInternal::ProxyFactory::propertyToProxy(const string& prefix) const } PropertyDict -IceInternal::ProxyFactory::proxyToProperty(const ObjectPrx& proxy, const string& prefix) const +IceInternal::ProxyFactory::proxyToProperty(const ObjectPrxPtr& proxy, const string& prefix) const { if(proxy) { @@ -69,7 +69,7 @@ IceInternal::ProxyFactory::proxyToProperty(const ObjectPrx& proxy, const string& } } -ObjectPrx +ObjectPrxPtr IceInternal::ProxyFactory::streamToProxy(BasicStream* s) const { Identity ident; @@ -80,7 +80,7 @@ IceInternal::ProxyFactory::streamToProxy(BasicStream* s) const } void -IceInternal::ProxyFactory::proxyToStream(const ObjectPrx& proxy, BasicStream* s) const +IceInternal::ProxyFactory::proxyToStream(const ObjectPrxPtr& proxy, BasicStream* s) const { if(proxy) { @@ -94,18 +94,18 @@ IceInternal::ProxyFactory::proxyToStream(const ObjectPrx& proxy, BasicStream* s) } } -ObjectPrx +ObjectPrxPtr IceInternal::ProxyFactory::referenceToProxy(const ReferencePtr& ref) const { if(ref) { - ObjectPrx proxy = new ::IceProxy::Ice::Object; + ObjectPrxPtr proxy = ICE_MAKE_SHARED(::IceProxy::Ice::Object); proxy->setup(ref); return proxy; } else { - return 0; + return ICE_NULLPTR; } } |