diff options
| author | Jose <jose@zeroc.com> | 2019-06-22 00:29:53 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2019-06-22 00:29:53 +0200 |
| commit | c5959fd09de61604bedd75354401df6a57395d65 (patch) | |
| tree | 3b0227f631c8b20fb1a1a274b92f63f52f34af2c /cpp/src/IceSSL/Util.cpp | |
| parent | Small fix (diff) | |
| parent | Enable -Wconversion with clang - Close #363 (diff) | |
| download | ice-c5959fd09de61604bedd75354401df6a57395d65.tar.bz2 ice-c5959fd09de61604bedd75354401df6a57395d65.tar.xz ice-c5959fd09de61604bedd75354401df6a57395d65.zip | |
Merge remote-tracking branch 'origin/3.7' into swift
Diffstat (limited to 'cpp/src/IceSSL/Util.cpp')
| -rwxr-xr-x | cpp/src/IceSSL/Util.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cpp/src/IceSSL/Util.cpp b/cpp/src/IceSSL/Util.cpp index 29a265814fa..294640565a5 100755 --- a/cpp/src/IceSSL/Util.cpp +++ b/cpp/src/IceSSL/Util.cpp @@ -36,8 +36,8 @@ IceSSL::fromCFString(CFStringRef v) { CFIndex size = CFStringGetMaximumSizeForEncoding(CFStringGetLength(v), kCFStringEncodingUTF8); vector<char> buffer; - buffer.resize(size + 1); - CFStringGetCString(v, &buffer[0], buffer.size(), kCFStringEncodingUTF8); + buffer.resize(static_cast<size_t>(size + 1)); + CFStringGetCString(v, &buffer[0], static_cast<CFIndex>(buffer.size()), kCFStringEncodingUTF8); s.assign(&buffer[0]); } return s; @@ -118,12 +118,12 @@ IceSSL::readFile(const string& file, vector<char>& buffer) } is.seekg(0, is.end); - buffer.resize(static_cast<int>(is.tellg())); + buffer.resize(static_cast<size_t>(is.tellg())); is.seekg(0, is.beg); if(!buffer.empty()) { - is.read(&buffer[0], buffer.size()); + is.read(&buffer[0], static_cast<streamsize>(buffer.size())); if(!is.good()) { throw CertificateReadException(__FILE__, __LINE__, "error reading file " + file); |