diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-10-11 21:03:18 -0500 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-10-25 19:55:32 -0500 |
| commit | ef07ecf985e308fc4915cfbe8c2a15d583238f5b (patch) | |
| tree | 3b6e49771cc1d21c378f8c61fad0fe56b89e8e83 /connectivity | |
| parent | a76829b305fec288bf4f1b0b885f16caa3f3c62a (diff) | |
merge vosremoval-timer.diff
Diffstat (limited to 'connectivity')
| -rw-r--r-- | connectivity/inc/pch/precompiled_connectivity.hxx | 3 | ||||
| -rw-r--r-- | connectivity/source/cpool/ZConnectionPool.cxx | 2 | ||||
| -rw-r--r-- | connectivity/source/cpool/ZConnectionPool.hxx | 8 | ||||
| -rw-r--r-- | connectivity/source/cpool/makefile.mk | 3 |
4 files changed, 9 insertions, 7 deletions
diff --git a/connectivity/inc/pch/precompiled_connectivity.hxx b/connectivity/inc/pch/precompiled_connectivity.hxx index 41571202327a..56edc0bc409d 100644 --- a/connectivity/inc/pch/precompiled_connectivity.hxx +++ b/connectivity/inc/pch/precompiled_connectivity.hxx @@ -308,6 +308,8 @@ #include "rtl/ustrbuf.hxx" #include "rtl/ustring.hxx" +#include "salhelper/timer.hxx" + #include "sys/types.h" #include "tools/diagnose_ex.h" @@ -328,7 +330,6 @@ #include "vos/ref.hxx" #include "vos/ref.hxx" #include "vos/refernce.hxx" -#include "vos/timer.hxx" //---MARKER--- #endif diff --git a/connectivity/source/cpool/ZConnectionPool.cxx b/connectivity/source/cpool/ZConnectionPool.cxx index f35d404d2179..a65c7c1c99b8 100644 --- a/connectivity/source/cpool/ZConnectionPool.cxx +++ b/connectivity/source/cpool/ZConnectionPool.cxx @@ -95,7 +95,7 @@ OConnectionPool::OConnectionPool(const Reference< XDriver >& _xDriver, OPoolCollection::getNodeValue(getTimeoutNodeName(),m_xDriverNode) >>= m_nALiveCount; calculateTimeOuts(); - m_xInvalidator = new OPoolTimer(this,::vos::TTimeValue(m_nTimeOut,0)); + m_xInvalidator = new OPoolTimer(this,::salhelper::TTimeValue(m_nTimeOut,0)); m_xInvalidator->start(); } // ----------------------------------------------------------------------------- diff --git a/connectivity/source/cpool/ZConnectionPool.hxx b/connectivity/source/cpool/ZConnectionPool.hxx index 1e521829f412..02f46d68ed17 100644 --- a/connectivity/source/cpool/ZConnectionPool.hxx +++ b/connectivity/source/cpool/ZConnectionPool.hxx @@ -37,7 +37,7 @@ #include <cppuhelper/implbase1.hxx> #include <comphelper/stl_types.hxx> #include <osl/mutex.hxx> -#include <vos/timer.hxx> +#include <salhelper/timer.hxx> #include <vos/ref.hxx> #include <rtl/digest.h> @@ -47,12 +47,12 @@ namespace connectivity //========================================================================== /// OPoolTimer - Invalidates the connection pool //========================================================================== - class OPoolTimer : public ::vos::OTimer + class OPoolTimer : public ::salhelper::Timer { OConnectionPool* m_pPool; public: - OPoolTimer(OConnectionPool* _pPool,const ::vos::TTimeValue& _Time) - : ::vos::OTimer(_Time) + OPoolTimer(OConnectionPool* _pPool,const ::salhelper::TTimeValue& _Time) + : ::salhelper::Timer(_Time) ,m_pPool(_pPool) {} protected: diff --git a/connectivity/source/cpool/makefile.mk b/connectivity/source/cpool/makefile.mk index 1f6e49c6cbd7..5ed3341d28a9 100644 --- a/connectivity/source/cpool/makefile.mk +++ b/connectivity/source/cpool/makefile.mk @@ -63,7 +63,8 @@ SHL1STDLIBS=\ $(CPPUHELPERLIB) \ $(VOSLIB) \ $(DBTOOLSLIB) \ - $(SALLIB) + $(SALLIB) \ + $(SALHELPERLIB) SHL1DEPN= SHL1IMPLIB= i$(SHL1TARGET) |