diff options
| -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 | ||||
| -rw-r--r-- | framework/inc/helper/timerhelper.hxx | 2 | ||||
| -rw-r--r-- | framework/inc/pch/precompiled_framework.hxx | 2 | ||||
| -rw-r--r-- | framework/util/makefile.mk | 1 | ||||
| -rw-r--r-- | svx/source/fmcomp/trace.cxx | 2 |
8 files changed, 13 insertions, 10 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) diff --git a/framework/inc/helper/timerhelper.hxx b/framework/inc/helper/timerhelper.hxx index a37bd5b2ce05..7c45b0e2dcaf 100644 --- a/framework/inc/helper/timerhelper.hxx +++ b/framework/inc/helper/timerhelper.hxx @@ -29,7 +29,7 @@ #define __FRAMEWORK_HELPER_TIMERHELPER_HXX_ #include <threadhelp/threadhelpbase.hxx> -#include <vos/timer.hxx> +#include <salhelper/timer.hxx> #include <osl/mutex.hxx> //........................................................................ diff --git a/framework/inc/pch/precompiled_framework.hxx b/framework/inc/pch/precompiled_framework.hxx index 45919a31047b..c6cc1b95f7b7 100644 --- a/framework/inc/pch/precompiled_framework.hxx +++ b/framework/inc/pch/precompiled_framework.hxx @@ -371,6 +371,7 @@ #include "sal/main.h" #include "salhelper/singletonref.hxx" +#include "salhelper/timer.hxx" #include "sot/exchange.hxx" #include "sot/filelist.hxx" @@ -488,7 +489,6 @@ #include "vos/process.hxx" #include "vos/ref.hxx" #include "vos/thread.hxx" -#include "vos/timer.hxx" //---MARKER--- #endif diff --git a/framework/util/makefile.mk b/framework/util/makefile.mk index 544c543254be..85dff0aab67e 100644 --- a/framework/util/makefile.mk +++ b/framework/util/makefile.mk @@ -354,6 +354,7 @@ SHL4STDLIBS= \ $(CPPULIB) \ $(SALLIB) \ $(UCBHELPERLIB) \ + $(SALHELPERLIB) \ $(I18NISOLANGLIB) SHL4DEF= $(MISC)$/$(SHL4TARGET).def diff --git a/svx/source/fmcomp/trace.cxx b/svx/source/fmcomp/trace.cxx index 07f7a81e91f1..7db917607631 100644 --- a/svx/source/fmcomp/trace.cxx +++ b/svx/source/fmcomp/trace.cxx @@ -37,7 +37,7 @@ //------------------------------------------------------------------------------ ::vos::OMutex Tracer::s_aMapSafety; -::std::map< ::oslThreadIdentifier, INT32, ::std::less< ::vos::OThread::TThreadIdentifier > > +::std::map< ::oslThreadIdentifier, INT32, ::std::less< ::osl::ThreadIdentifier > > Tracer::s_aThreadIndents; //------------------------------------------------------------------------------ |