diff options
author | Joe George <joe@zeroc.com> | 2021-02-02 11:31:50 -0500 |
---|---|---|
committer | Joe George <joe@zeroc.com> | 2021-02-02 11:31:50 -0500 |
commit | 8c8d242f6c31a2bcec1eddb2f39c2ca411079d9c (patch) | |
tree | 81865e431a54de6fc9807a7a6f74197e26b29bdc /cpp/src/IceGrid/Util.cpp | |
parent | Update Glacier2 tests to use C++11 mapping (diff) | |
download | ice-8c8d242f6c31a2bcec1eddb2f39c2ca411079d9c.tar.bz2 ice-8c8d242f6c31a2bcec1eddb2f39c2ca411079d9c.tar.xz ice-8c8d242f6c31a2bcec1eddb2f39c2ca411079d9c.zip |
IceGrid and IceStorm fixes
Diffstat (limited to 'cpp/src/IceGrid/Util.cpp')
-rw-r--r-- | cpp/src/IceGrid/Util.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/cpp/src/IceGrid/Util.cpp b/cpp/src/IceGrid/Util.cpp index d7778805171..4cf9082d39c 100644 --- a/cpp/src/IceGrid/Util.cpp +++ b/cpp/src/IceGrid/Util.cpp @@ -265,7 +265,7 @@ IceGrid::toObjectInfo(const shared_ptr<Ice::Communicator>& communicator, const O } void -IceGrid::setupThreadPool(const shared_ptr<Properties>& properties, const string& name, int size, int maxSize, bool serialize) +IceGrid::setupThreadPool(const shared_ptr<Properties>& properties, const string& name, int size, int sizeMax, bool serialize) { if(properties->getPropertyAsIntWithDefault(name + ".Size", 0) < size) { @@ -278,16 +278,16 @@ IceGrid::setupThreadPool(const shared_ptr<Properties>& properties, const string& size = properties->getPropertyAsInt(name + ".Size"); } - if(maxSize > 0 && properties->getPropertyAsIntWithDefault(name + ".MaxSize", 0) < maxSize) + if(sizeMax > 0 && properties->getPropertyAsIntWithDefault(name + ".SizeMax", 0) < sizeMax) { - if(size >= maxSize) + if(size >= sizeMax) { - maxSize = size * 10; + sizeMax = size * 10; } ostringstream os; - os << maxSize; - properties->setProperty(name + ".MaxSize", os.str()); + os << sizeMax; + properties->setProperty(name + ".SizeMax", os.str()); } if(serialize) |