diff options
| author | Jose <jose@zeroc.com> | 2015-01-16 19:33:34 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2015-01-16 19:33:34 +0100 |
| commit | 11d86754d6f6b967ce0efaa202a3faa074b22cc2 (patch) | |
| tree | 8c8e41f81d45bd0730181a34453ea95e09ae4395 /cpp/src/IcePatch2Lib/Util.cpp | |
| parent | ICE-6259 ObjC enable collocation optimization (diff) | |
| download | ice-11d86754d6f6b967ce0efaa202a3faa074b22cc2.tar.bz2 ice-11d86754d6f6b967ce0efaa202a3faa074b22cc2.tar.xz ice-11d86754d6f6b967ce0efaa202a3faa074b22cc2.zip | |
Fixed (ICE-6209) - IceUtil/SHA1.h
Diffstat (limited to 'cpp/src/IcePatch2Lib/Util.cpp')
| -rw-r--r-- | cpp/src/IcePatch2Lib/Util.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cpp/src/IcePatch2Lib/Util.cpp b/cpp/src/IcePatch2Lib/Util.cpp index e421383213a..ab27759d87a 100644 --- a/cpp/src/IcePatch2Lib/Util.cpp +++ b/cpp/src/IcePatch2Lib/Util.cpp @@ -790,7 +790,7 @@ getFileInfoSeqInt(const string& basePath, const string& relPath, int compress, G ByteSeq bytesSHA(20); if(!bytes.empty()) { - IceUtil::sha1(reinterpret_cast<unsigned char*>(&bytes[0]), bytes.size(), bytesSHA); + IceUtilInternal::sha1(reinterpret_cast<unsigned char*>(&bytes[0]), bytes.size(), bytesSHA); } else { @@ -859,7 +859,7 @@ getFileInfoSeqInt(const string& basePath, const string& relPath, int compress, G } else { - IceUtil::SHA1 hasher; + IceUtilInternal::SHA1 hasher; if(relPath.size() != 0) { hasher.update(reinterpret_cast<const IceUtil::Byte*>(relPath.c_str()), relPath.size()); @@ -1185,7 +1185,7 @@ IcePatch2::getFileTree0(const FileInfoSeq& infoSeq, FileTree0& tree0) if(!allChecksums1.empty()) { - IceUtil::sha1(reinterpret_cast<unsigned char*>(&allChecksums1[0]), allChecksums1.size(), tree1.checksum); + IceUtilInternal::sha1(reinterpret_cast<unsigned char*>(&allChecksums1[0]), allChecksums1.size(), tree1.checksum); } else { @@ -1197,7 +1197,7 @@ IcePatch2::getFileTree0(const FileInfoSeq& infoSeq, FileTree0& tree0) if(!allChecksums0.empty()) { - IceUtil::sha1(reinterpret_cast<unsigned char*>(&allChecksums0[0]), allChecksums0.size(), tree0.checksum); + IceUtilInternal::sha1(reinterpret_cast<unsigned char*>(&allChecksums0[0]), allChecksums0.size(), tree0.checksum); } else { |