diff options
Diffstat (limited to 'cpp/src/IceStorm/NodeI.cpp')
| -rw-r--r-- | cpp/src/IceStorm/NodeI.cpp | 4 |
1 files changed, 2 insertions, 2 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) |