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/Ice/WSTransceiver.cpp | |
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/Ice/WSTransceiver.cpp')
-rw-r--r-- | cpp/src/Ice/WSTransceiver.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cpp/src/Ice/WSTransceiver.cpp b/cpp/src/Ice/WSTransceiver.cpp index 2c074c75974..413b88ed630 100644 --- a/cpp/src/Ice/WSTransceiver.cpp +++ b/cpp/src/Ice/WSTransceiver.cpp @@ -18,7 +18,7 @@ #include <Ice/LocalException.h> #include <Ice/Base64.h> #include <IceUtil/Random.h> -#include <IceUtil/SHA1.h> +#include <Ice/SHA1.h> #include <IceUtil/StringUtil.h> // Python 2.7 under Windows. @@ -1028,7 +1028,7 @@ IceInternal::WSTransceiver::handleRequest(Buffer& responseBuffer) out << "Sec-WebSocket-Accept: "; string input = key + _wsUUID; vector<unsigned char> hash; - IceUtilInternal::sha1(reinterpret_cast<const unsigned char*>(&input[0]), input.size(), hash); + sha1(reinterpret_cast<const unsigned char*>(&input[0]), input.size(), hash); out << IceInternal::Base64::encode(hash) << "\r\n" << "\r\n"; // EOM string str = out.str(); @@ -1126,7 +1126,7 @@ IceInternal::WSTransceiver::handleResponse() } string input = _key + _wsUUID; vector<unsigned char> hash; - IceUtilInternal::sha1(reinterpret_cast<const unsigned char*>(&input[0]), input.size(), hash); + sha1(reinterpret_cast<const unsigned char*>(&input[0]), input.size(), hash); if(val != IceInternal::Base64::encode(hash)) { throw WebSocketException("invalid value `" + val + "' for Sec-WebSocket-Accept"); |