summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/Instance.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/src/Ice/Instance.cpp')
-rw-r--r--cpp/src/Ice/Instance.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/cpp/src/Ice/Instance.cpp b/cpp/src/Ice/Instance.cpp
index 9e3d2b8501c..dec825794a8 100644
--- a/cpp/src/Ice/Instance.cpp
+++ b/cpp/src/Ice/Instance.cpp
@@ -394,6 +394,8 @@ IceInternal::Instance::Instance(const CommunicatorPtr& communicator, const Prope
_destroyed(false),
_properties(properties),
_messageSizeMax(0),
+ _clientACM(0),
+ _serverACM(0),
_threadPerConnection(false),
_threadPerConnectionStackSize(0)
{
@@ -725,7 +727,7 @@ IceInternal::Instance::finishSetup(int& argc, char* argv[])
Int interval = 0;
if(_clientACM > 0 && _serverACM > 0)
{
- interval = std::min(_clientACM, _serverACM);
+ interval = min(_clientACM, _serverACM);
}
else if(_clientACM > 0)
{