diff options
author | Dwayne Boone <dwayne@zeroc.com> | 2008-03-04 09:39:13 -0330 |
---|---|---|
committer | Dwayne Boone <dwayne@zeroc.com> | 2008-03-04 09:39:13 -0330 |
commit | e6c3b3c89a3eda587e1cf7a7710a99ceeafd25ab (patch) | |
tree | cfb77d999b23f73c645db92ce722bfc362501bad /cpp/src/IceStorm/Service.cpp | |
parent | Merge branch 'master' of ssh://cvs.zeroc.com/home/git/ice (diff) | |
parent | Fixed IceStorm Win32 x64 compilation error (diff) | |
download | ice-e6c3b3c89a3eda587e1cf7a7710a99ceeafd25ab.tar.bz2 ice-e6c3b3c89a3eda587e1cf7a7710a99ceeafd25ab.tar.xz ice-e6c3b3c89a3eda587e1cf7a7710a99ceeafd25ab.zip |
Merge branch 'master' of ssh://cvs.zeroc.com/home/git/ice
Diffstat (limited to 'cpp/src/IceStorm/Service.cpp')
-rw-r--r-- | cpp/src/IceStorm/Service.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cpp/src/IceStorm/Service.cpp b/cpp/src/IceStorm/Service.cpp index 265e0d58fd4..d0cea4c8027 100644 --- a/cpp/src/IceStorm/Service.cpp +++ b/cpp/src/IceStorm/Service.cpp @@ -282,7 +282,7 @@ IceStorm::ServiceI::start( _instance = new Instance(instanceName, name, communicator, publishAdapter, topicAdapter, iceGridDeployment, nodeAdapter, nodes[id]); - _instance->observers()->setMajority(nodes.size()/2); + _instance->observers()->setMajority(static_cast<unsigned int>(nodes.size())/2); // Trace replication information. TraceLevelsPtr traceLevels = _instance->traceLevels(); |