From f6a5299766fe3db2273afd78f145486b091513ed Mon Sep 17 00:00:00 2001
From: Bernard Normier <bernard@zeroc.com>
Date: Wed, 11 Jan 2017 16:15:49 -0500
Subject: Moved UniquePtr to IceInternal Removed ctor and assignment operator
 from UniquePtr

---
 cpp/src/IceGrid/ServerCache.h | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'cpp/src/IceGrid/ServerCache.h')

diff --git a/cpp/src/IceGrid/ServerCache.h b/cpp/src/IceGrid/ServerCache.h
index 224d2c0e341..d604439caa8 100644
--- a/cpp/src/IceGrid/ServerCache.h
+++ b/cpp/src/IceGrid/ServerCache.h
@@ -12,6 +12,7 @@
 
 #include <IceUtil/Mutex.h>
 #include <IceUtil/Shared.h>
+#include <Ice/UniquePtr.h>
 #include <IceGrid/Descriptor.h>
 #include <IceGrid/Internal.h>
 #include <IceGrid/Registry.h>
@@ -110,9 +111,9 @@ private:
 
     ServerCache& _cache;
     const std::string _id;
-    IceUtil::UniquePtr<ServerInfo> _loaded;
-    IceUtil::UniquePtr<ServerInfo> _load;
-    IceUtil::UniquePtr<ServerInfo> _destroy;
+    IceInternal::UniquePtr<ServerInfo> _loaded;
+    IceInternal::UniquePtr<ServerInfo> _load;
+    IceInternal::UniquePtr<ServerInfo> _destroy;
 
     ServerPrx _proxy;
     AdapterPrxDict _adapters;
@@ -121,7 +122,7 @@ private:
 
     bool _synchronizing;
     bool _updated;
-    IceUtil::UniquePtr<Ice::Exception> _exception;
+    IceInternal::UniquePtr<Ice::Exception> _exception;
     bool _noRestart;
     std::vector<SynchronizationCallbackPtr> _callbacks;
 
-- 
cgit v1.2.3