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/Instance.h | |
| 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/Instance.h')
| -rw-r--r-- | cpp/src/Ice/Instance.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/cpp/src/Ice/Instance.h b/cpp/src/Ice/Instance.h index a6e9182b136..32685e2e9b5 100644 --- a/cpp/src/Ice/Instance.h +++ b/cpp/src/Ice/Instance.h @@ -58,7 +58,7 @@ class Timer; typedef IceUtil::Handle<Timer> TimerPtr; class MetricsAdminI; -typedef IceUtil::Handle<MetricsAdminI> MetricsAdminIPtr; +ICE_DEFINE_PTR(MetricsAdminIPtr, MetricsAdminI); class RequestHandlerFactory; typedef IceUtil::Handle<RequestHandlerFactory> RequestHandlerFactoryPtr; @@ -116,8 +116,8 @@ public: Ice::Identity stringToIdentity(const std::string&) const; std::string identityToString(const Ice::Identity&) const; - Ice::ObjectPrx createAdmin(const Ice::ObjectAdapterPtr&, const Ice::Identity&); - Ice::ObjectPrx getAdmin(); + Ice::ObjectPrxPtr createAdmin(const Ice::ObjectAdapterPtr&, const Ice::Identity&); + Ice::ObjectPrxPtr getAdmin(); void addAdminFacet(const Ice::ObjectPtr&, const std::string&); Ice::ObjectPtr removeAdminFacet(const std::string&); Ice::ObjectPtr findAdminFacet(const std::string&); @@ -128,8 +128,8 @@ public: return _implicitContext; } - void setDefaultLocator(const Ice::LocatorPrx&); - void setDefaultRouter(const Ice::RouterPrx&); + void setDefaultLocator(const Ice::LocatorPrxPtr&); + void setDefaultRouter(const Ice::RouterPrxPtr&); void setLogger(const Ice::LoggerPtr&); void setThreadHook(const Ice::ThreadNotificationPtr&); |