Moved UniquePtr to IceInternal

Removed ctor and assignment operator from UniquePtr

1 files changed, 13 insertions, 13 deletions

diff --git a/cpp/src/Ice/SHA1.cpp b/cpp/src/Ice/SHA1.cpp
index 141ffda9a6a..e8a7d986d42 100644
--- a/cpp/src/Ice/SHA1.cpp
+++ b/cpp/src/Ice/SHA1.cpp
@@ -7,7 +7,7 @@
 //
 // **********************************************************************
 
-#include <IceUtil/SHA1.h>
+#include <Ice/SHA1.h>
 
 #ifndef ICE_OS_UWP
 #   if defined(_WIN32)
@@ -25,7 +25,7 @@ using namespace IceUtil;
 
 #ifndef ICE_OS_UWP
 
-namespace IceUtilInternal
+namespace IceInternal
 {
 
 class SHA1::Hasher
@@ -65,7 +65,7 @@ namespace
 const int SHA_DIGEST_LENGTH = 20;
 }
 
-IceUtilInternal::SHA1::Hasher::Hasher() :
+IceInternal::SHA1::Hasher::Hasher() :
     _ctx(0),
     _hash(0)
 {
@@ -80,7 +80,7 @@ IceUtilInternal::SHA1::Hasher::Hasher() :
     }
 }
 
-IceUtilInternal::SHA1::Hasher::~Hasher()
+IceInternal::SHA1::Hasher::~Hasher()
 {
     if(_hash)
     {
@@ -93,19 +93,19 @@ IceUtilInternal::SHA1::Hasher::~Hasher()
     }
 }
 #   elif defined(__APPLE__)
-IceUtilInternal::SHA1::Hasher::Hasher()
+IceInternal::SHA1::Hasher::Hasher()
 {
     CC_SHA1_Init(&_ctx);
 }
 #   else
-IceUtilInternal::SHA1::Hasher::Hasher()
+IceInternal::SHA1::Hasher::Hasher()
 {
     SHA1_Init(&_ctx);
 }
 #   endif
 
 void
-IceUtilInternal::SHA1::Hasher::update(const unsigned char* data, size_t length)
+IceInternal::SHA1::Hasher::update(const unsigned char* data, size_t length)
 {
 #   if defined(_WIN32)
     if(!CryptHashData(_hash, data, static_cast<DWORD>(length), 0))
@@ -120,7 +120,7 @@ IceUtilInternal::SHA1::Hasher::update(const unsigned char* data, size_t length)
 }
 
 void
-IceUtilInternal::SHA1::Hasher::finalize(vector<unsigned char>& md)
+IceInternal::SHA1::Hasher::finalize(vector<unsigned char>& md)
 {
 #   if defined(_WIN32)
     md.resize(SHA_DIGEST_LENGTH);
@@ -138,30 +138,30 @@ IceUtilInternal::SHA1::Hasher::finalize(vector<unsigned char>& md)
 #   endif
 }
 
-IceUtilInternal::SHA1::SHA1() :
+IceInternal::SHA1::SHA1() :
     _hasher(new Hasher())
 {
 }
 
-IceUtilInternal::SHA1::~SHA1()
+IceInternal::SHA1::~SHA1()
 {
 }
 
 void
-IceUtilInternal::SHA1::update(const unsigned char* data, std::size_t length)
+IceInternal::SHA1::update(const unsigned char* data, std::size_t length)
 {
     _hasher->update(data, length);
 }
 
 void
-IceUtilInternal::SHA1::finalize(std::vector<unsigned char>& md)
+IceInternal::SHA1::finalize(std::vector<unsigned char>& md)
 {
     _hasher->finalize(md);
 }
 #endif
 
 void
-IceUtilInternal::sha1(const unsigned char* data, size_t length, vector<unsigned char>& md)
+IceInternal::sha1(const unsigned char* data, size_t length, vector<unsigned char>& md)
 {
 #if defined(ICE_OS_UWP)
     auto dataA =