diff options
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/Ice/PropertiesI.cpp | 14 | ||||
| -rw-r--r-- | cpp/src/IceGrid/ServerI.cpp | 2 |
2 files changed, 9 insertions, 7 deletions
diff --git a/cpp/src/Ice/PropertiesI.cpp b/cpp/src/Ice/PropertiesI.cpp index 1973b5ffef4..35b063607bb 100644 --- a/cpp/src/Ice/PropertiesI.cpp +++ b/cpp/src/Ice/PropertiesI.cpp @@ -318,8 +318,8 @@ Ice::PropertiesI::load(const std::string& file) vector<wchar_t> nameBuf(maxNameSize + 1); vector<BYTE> dataBuf(maxDataSize); DWORD keyType; - DWORD nameBufSize = nameBuf.size(); - DWORD dataBufSize = dataBuf.size(); + DWORD nameBufSize = static_cast<DWORD>(nameBuf.size()); + DWORD dataBufSize = static_cast<DWORD>(dataBuf.size()); err = RegEnumValueW(iceKey, i, &nameBuf[0], &nameBufSize, NULL, &keyType, &dataBuf[0], &dataBufSize); if(err != ERROR_SUCCESS || nameBufSize == 0) { @@ -355,11 +355,13 @@ Ice::PropertiesI::load(const std::string& file) else // keyType == REG_EXPAND_SZ { vector<wchar_t> expandedValue(1024); - DWORD sz = ExpandEnvironmentStringsW(valueW.c_str(), &expandedValue[0], expandedValue.size()); + DWORD sz = ExpandEnvironmentStringsW(valueW.c_str(), &expandedValue[0], + static_cast<DWORD>(expandedValue.size())); if(sz >= expandedValue.size()) { expandedValue.resize(sz + 1); - if(ExpandEnvironmentStringsW(valueW.c_str(), &expandedValue[0], expandedValue.size()) == 0) + if(ExpandEnvironmentStringsW(valueW.c_str(), &expandedValue[0], + static_cast<DWORD>(expandedValue.size())) == 0) { ostringstream os; os << "could not expand variable in property `" << name << "', key: `" + file + "':\n"; @@ -686,11 +688,11 @@ Ice::PropertiesI::loadConfig() { #ifdef _WIN32 vector<wchar_t> v(256); - DWORD ret = GetEnvironmentVariableW(L"ICE_CONFIG", &v[0], v.size()); + DWORD ret = GetEnvironmentVariableW(L"ICE_CONFIG", &v[0], static_cast<DWORD>(v.size())); if(ret >= v.size()) { v.resize(ret + 1); - ret = GetEnvironmentVariableW(L"ICE_CONFIG", &v[0], v.size()); + ret = GetEnvironmentVariableW(L"ICE_CONFIG", &v[0], static_cast<DWORD>(v.size())); } if(ret > 0) { diff --git a/cpp/src/IceGrid/ServerI.cpp b/cpp/src/IceGrid/ServerI.cpp index a42ed7c5ac8..e514229323a 100644 --- a/cpp/src/IceGrid/ServerI.cpp +++ b/cpp/src/IceGrid/ServerI.cpp @@ -299,7 +299,7 @@ struct EnvironmentEval : std::unary_function<string, string> break; } string variable = v.substr(beg + 1, end - beg - 1); - DWORD ret = GetEnvironmentVariableW(IceUtil::stringToWstring(variable).c_str(), &buf[0], buf.size()); + DWORD ret = GetEnvironmentVariableW(IceUtil::stringToWstring(variable).c_str(), &buf[0], static_cast<DWORD>(buf.size())); string valstr = (ret > 0 && ret < sizeof(buf.size())) ? IceUtil::wstringToString(&buf[0]) : string(""); v.replace(beg, end - beg + 1, valstr); beg += valstr.size(); |