diff options
| author | Mark Spruiell <mes@zeroc.com> | 2005-04-07 17:38:28 +0000 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2005-04-07 17:38:28 +0000 |
| commit | 115f3b6f3b6217f907f18e568fffedeb8ef1c470 (patch) | |
| tree | 7a18d0e4f0bb5c05b05c5608799b0919e6e02810 /cpp | |
| parent | Ice.ACM.Client, Ice.ACM.Server (diff) | |
| download | ice-115f3b6f3b6217f907f18e568fffedeb8ef1c470.tar.bz2 ice-115f3b6f3b6217f907f18e568fffedeb8ef1c470.tar.xz ice-115f3b6f3b6217f907f18e568fffedeb8ef1c470.zip | |
win32 fixes
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/src/Ice/ConnectionI.cpp | 1 | ||||
| -rw-r--r-- | cpp/src/Ice/Instance.cpp | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/cpp/src/Ice/ConnectionI.cpp b/cpp/src/Ice/ConnectionI.cpp index b6b775e0d96..e285345d632 100644 --- a/cpp/src/Ice/ConnectionI.cpp +++ b/cpp/src/Ice/ConnectionI.cpp @@ -1378,6 +1378,7 @@ Ice::ConnectionI::ConnectionI(const InstancePtr& instance, _traceLevels(_instance->traceLevels()), // Cached for better performance. _registeredWithPool(false), _warn(_instance->properties()->getPropertyAsInt("Ice.Warn.Connections") > 0), + _acmTimeout(0), _requestHdr(headerSize + sizeof(Int), 0), _requestBatchHdr(headerSize + sizeof(Int), 0), _replyHdr(headerSize, 0), 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) { |