summaryrefslogtreecommitdiff
path: root/cpp/src/IceGrid/ServerI.cpp
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2014-10-30 16:03:47 +0100
committerJose <jose@zeroc.com>2014-10-30 16:03:47 +0100
commitda8c267316512436ba19f28fa42510be305093f6 (patch)
tree935f3eefd77e909c847a44883fef38fce4bda48d /cpp/src/IceGrid/ServerI.cpp
parentMerge branch 'master' of ssh://git/home/git/ice (diff)
downloadice-da8c267316512436ba19f28fa42510be305093f6.tar.bz2
ice-da8c267316512436ba19f28fa42510be305093f6.tar.xz
ice-da8c267316512436ba19f28fa42510be305093f6.zip
ICE-5804 - Warnings when building with GCC (Eliminate C style casts)
Diffstat (limited to 'cpp/src/IceGrid/ServerI.cpp')
-rw-r--r--cpp/src/IceGrid/ServerI.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/cpp/src/IceGrid/ServerI.cpp b/cpp/src/IceGrid/ServerI.cpp
index d75277ebb85..cbd97b94b0b 100644
--- a/cpp/src/IceGrid/ServerI.cpp
+++ b/cpp/src/IceGrid/ServerI.cpp
@@ -55,7 +55,8 @@ chownRecursive(const string& path, uid_t uid, gid_t gid)
int n = 0;
while((entry = readdir(d)) != 0)
{
- namelist = (struct dirent**)realloc((void*)namelist, (size_t)((n + 1) * sizeof(struct dirent*)));
+ namelist = static_cast<struct dirent**>(
+ realloc(namelist, static_cast<size_t>((n + 1) * sizeof(struct dirent*))));
if(namelist == 0)
{
closedir(d);
@@ -63,7 +64,7 @@ chownRecursive(const string& path, uid_t uid, gid_t gid)
}
size_t entrysize = sizeof(struct dirent) - sizeof(entry->d_name) + strlen(entry->d_name) + 1;
- namelist[n] = (struct dirent*)malloc(entrysize);
+ namelist[n] = static_cast<struct dirent*>(malloc(entrysize));
if(namelist[n] == 0)
{
closedir(d);