summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/Instance.cpp
diff options
context:
space:
mode:
authorBernard Normier <bernard@zeroc.com>2016-08-01 20:44:44 -0400
committerBernard Normier <bernard@zeroc.com>2016-08-01 20:44:44 -0400
commit85fbacffa1956979bbca07d47104fd710825d045 (patch)
tree7b8e4700f34fe884cc8ad418cfd3e11ac5a22bf7 /cpp/src/Ice/Instance.cpp
parentFixed typo (diff)
downloadice-85fbacffa1956979bbca07d47104fd710825d045.tar.bz2
ice-85fbacffa1956979bbca07d47104fd710825d045.tar.xz
ice-85fbacffa1956979bbca07d47104fd710825d045.zip
Move generateUUID to Ice
Diffstat (limited to 'cpp/src/Ice/Instance.cpp')
-rw-r--r--cpp/src/Ice/Instance.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/cpp/src/Ice/Instance.cpp b/cpp/src/Ice/Instance.cpp
index a5062c4e20b..d1d5634b2ca 100644
--- a/cpp/src/Ice/Instance.cpp
+++ b/cpp/src/Ice/Instance.cpp
@@ -47,7 +47,7 @@
#include <IceUtil/DisableWarnings.h>
#include <IceUtil/FileUtil.h>
#include <IceUtil/StringUtil.h>
-#include <IceUtil/UUID.h>
+#include <Ice/UUID.h>
#include <IceUtil/Mutex.h>
#include <IceUtil/MutexPtrLock.h>
#include <IceUtil/Atomic.h>
@@ -664,7 +664,7 @@ IceInternal::Instance::getAdmin()
adminIdentity.category = _initData.properties->getProperty("Ice.Admin.InstanceName");
if(adminIdentity.category.empty())
{
- adminIdentity.category = IceUtil::generateUUID();
+ adminIdentity.category = Ice::generateUUID();
}
_adminIdentity = adminIdentity;