Merge branch 'master' of ssh://cvs.zeroc.com/home/git/ice

2 files changed, 3 insertions, 3 deletions

diff --git a/cpp/src/IceStorm/NodeI.cpp b/cpp/src/IceStorm/NodeI.cpp
index b0ff4bb1bb5..fce38132225 100644
--- a/cpp/src/IceStorm/NodeI.cpp
+++ b/cpp/src/IceStorm/NodeI.cpp
@@ -535,7 +535,7 @@ NodeI::mergeContinue()
         // in the election. If we're running a subsequent election then we
         // need a majority of the nodes to be active in order to start
         // running.
-        unsigned int ingroup = tmpSet.size();
+        unsigned int ingroup = static_cast<unsigned int>(tmpSet.size());
         if(_max != _nodes.size() && ingroup != _nodes.size() -1 || ingroup < _nodes.size()/2)
         {
             if(_traceLevels->election > 0)
@@ -619,7 +619,7 @@ NodeI::mergeContinue()
 
     // At this point we've ensured that we have the latest database
     // state, as such we can set our _max flag.
-    unsigned int max = tmpSet.size() + 1;
+    unsigned int max = static_cast<unsigned int>(tmpSet.size()) + 1;
     {
         Lock sync(*this);
         if(max > _max)
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();