diff options
| author | Jose <jose@zeroc.com> | 2011-12-07 01:04:07 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2011-12-07 01:04:07 +0100 |
| commit | 7cc80031493a7f892b8d55ae503c1aef39465e3c (patch) | |
| tree | bd7d342927e78dfa852d51964f5eafbb5ef539c8 /cpp | |
| parent | minor fixes to slice2confluence (diff) | |
| download | ice-7cc80031493a7f892b8d55ae503c1aef39465e3c.tar.bz2 ice-7cc80031493a7f892b8d55ae503c1aef39465e3c.tar.xz ice-7cc80031493a7f892b8d55ae503c1aef39465e3c.zip | |
Glacier2 C++ SessionHelper VC100 fix
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/include/Glacier2/SessionHelper.h | 4 | ||||
| -rw-r--r-- | cpp/src/Glacier2Lib/SessionHelper.cpp | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/cpp/include/Glacier2/SessionHelper.h b/cpp/include/Glacier2/SessionHelper.h index d1b04c91f24..3dbe95faddf 100644 --- a/cpp/include/Glacier2/SessionHelper.h +++ b/cpp/include/Glacier2/SessionHelper.h @@ -50,7 +50,7 @@ class SessionRefreshThread : public IceUtil::Thread public: - SessionRefreshThread(const SessionHelperPtr&, const Glacier2::RouterPrx&, long period); + SessionRefreshThread(const SessionHelperPtr&, const Glacier2::RouterPrx&, Ice::Long); virtual void run(); void done(); void success(); @@ -61,7 +61,7 @@ private: const Glacier2::Callback_Router_refreshSessionPtr _cb; const SessionHelperPtr _session; const Glacier2::RouterPrx _router; - long _period; + Ice::Long _period; bool _done; IceUtil::Monitor<IceUtil::Mutex> _monitor; }; diff --git a/cpp/src/Glacier2Lib/SessionHelper.cpp b/cpp/src/Glacier2Lib/SessionHelper.cpp index 3ed352453ec..04ad5fcd775 100644 --- a/cpp/src/Glacier2Lib/SessionHelper.cpp +++ b/cpp/src/Glacier2Lib/SessionHelper.cpp @@ -50,7 +50,7 @@ private: } Glacier2::SessionRefreshThread::SessionRefreshThread(const Glacier2::SessionHelperPtr& session, - const Glacier2::RouterPrx& router, long period) : + const Glacier2::RouterPrx& router, Ice::Long period) : _cb(Glacier2::newCallback_Router_refreshSession(this, &SessionRefreshThread::success, &SessionRefreshThread::failure)), _session(session), @@ -80,7 +80,7 @@ Glacier2::SessionRefreshThread::run() if(!_done) { - _monitor.timedWait(IceUtil::Time::seconds((int)_period)); + _monitor.timedWait(IceUtil::Time::seconds(_period)); } if(_done) @@ -566,7 +566,7 @@ Glacier2::SessionHelper::connected(const Glacier2::RouterPrx& router, const Glac assert(router); Ice::ConnectionPtr conn = router->ice_getCachedConnection(); string category = router->getCategoryForClient(); - long timeout = router->getSessionTimeout(); + Ice::Long timeout = router->getSessionTimeout(); { IceUtil::Mutex::Lock sync(_mutex); |