summaryrefslogtreecommitdiff
path: root/cpp/src/IcePack/ActivatorI.cpp
diff options
context:
space:
mode:
authorBernard Normier <bernard@zeroc.com>2003-04-29 19:51:33 +0000
committerBernard Normier <bernard@zeroc.com>2003-04-29 19:51:33 +0000
commitd6b805efcf63a16a759f0a104db74c5e9c009f7d (patch)
tree2a73b6a3e15c2cf711a0c4f1ab12dd52687e003e /cpp/src/IcePack/ActivatorI.cpp
parentfile UserExceptionFactory.h was initially added on branch slicing. (diff)
downloadice-d6b805efcf63a16a759f0a104db74c5e9c009f7d.tar.bz2
ice-d6b805efcf63a16a759f0a104db74c5e9c009f7d.tar.xz
ice-d6b805efcf63a16a759f0a104db74c5e9c009f7d.zip
Sun: 64 bit + CC 5.3 support
Diffstat (limited to 'cpp/src/IcePack/ActivatorI.cpp')
-rw-r--r--cpp/src/IcePack/ActivatorI.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/cpp/src/IcePack/ActivatorI.cpp b/cpp/src/IcePack/ActivatorI.cpp
index 2a123f1e7e0..807dd2e5c10 100644
--- a/cpp/src/IcePack/ActivatorI.cpp
+++ b/cpp/src/IcePack/ActivatorI.cpp
@@ -168,7 +168,7 @@ IcePack::ActivatorI::activate(const ServerPtr& server)
//
// Compute arguments.
//
- int argc = server->description.args.size() + _propertiesOverride.size() + 3;
+ int argc = static_cast<int>(server->description.args.size() + _propertiesOverride.size() + 3);
char** argv = static_cast<char**>(malloc(argc * sizeof(char*)));
argv[0] = strdup(path.c_str());
@@ -609,7 +609,7 @@ IcePack::ActivatorI::terminationListener()
}
char s[16];
- int rs;
+ ssize_t rs;
string message;
//