diff options
| author | Bernard Normier <bernard@zeroc.com> | 2017-01-11 16:15:49 -0500 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2017-01-11 16:15:49 -0500 |
| commit | f6a5299766fe3db2273afd78f145486b091513ed (patch) | |
| tree | 87eead6b9fa33e43f7b863093fd410167d9cb23a /cpp/src/IcePatch2Lib | |
| parent | Fixed Glacier2/router IE browser test failure (diff) | |
| download | ice-f6a5299766fe3db2273afd78f145486b091513ed.tar.bz2 ice-f6a5299766fe3db2273afd78f145486b091513ed.tar.xz ice-f6a5299766fe3db2273afd78f145486b091513ed.zip | |
Moved UniquePtr to IceInternal
Removed ctor and assignment operator from UniquePtr
Diffstat (limited to 'cpp/src/IcePatch2Lib')
| -rw-r--r-- | cpp/src/IcePatch2Lib/Util.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/cpp/src/IcePatch2Lib/Util.cpp b/cpp/src/IcePatch2Lib/Util.cpp index 451acfc81fb..27612badf9d 100644 --- a/cpp/src/IcePatch2Lib/Util.cpp +++ b/cpp/src/IcePatch2Lib/Util.cpp @@ -18,7 +18,7 @@ #include <IceUtil/IceUtil.h> #include <IceUtil/StringUtil.h> #include <IceUtil/FileUtil.h> -#include <IceUtil/SHA1.h> +#include <Ice/SHA1.h> #include <IceUtil/Exception.h> #include <IcePatch2Lib/Util.h> #include <IcePatch2/FileServer.h> @@ -823,7 +823,7 @@ getFileInfoSeqInternal(const string& basePath, const string& relPath, int compre ByteSeq bytesSHA(20); if(!bytes.empty()) { - IceUtilInternal::sha1(reinterpret_cast<unsigned char*>(&bytes[0]), bytes.size(), bytesSHA); + IceInternal::sha1(reinterpret_cast<unsigned char*>(&bytes[0]), bytes.size(), bytesSHA); } else { @@ -892,7 +892,7 @@ getFileInfoSeqInternal(const string& basePath, const string& relPath, int compre } else { - IceUtilInternal::SHA1 hasher; + IceInternal::SHA1 hasher; if(relPath.size() != 0) { hasher.update(reinterpret_cast<const IceUtil::Byte*>(relPath.c_str()), relPath.size()); @@ -1223,7 +1223,7 @@ IcePatch2Internal::getFileTree0(const LargeFileInfoSeq& infoSeq, FileTree0& tree if(!allChecksums1.empty()) { - IceUtilInternal::sha1(reinterpret_cast<unsigned char*>(&allChecksums1[0]), allChecksums1.size(), tree1.checksum); + IceInternal::sha1(reinterpret_cast<unsigned char*>(&allChecksums1[0]), allChecksums1.size(), tree1.checksum); } else { @@ -1235,7 +1235,7 @@ IcePatch2Internal::getFileTree0(const LargeFileInfoSeq& infoSeq, FileTree0& tree if(!allChecksums0.empty()) { - IceUtilInternal::sha1(reinterpret_cast<unsigned char*>(&allChecksums0[0]), allChecksums0.size(), tree0.checksum); + IceInternal::sha1(reinterpret_cast<unsigned char*>(&allChecksums0[0]), allChecksums0.size(), tree0.checksum); } else { |