strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge vosremoval-timer.diff

Browse source
This commit is contained in:
Norbert Thiebaud 2010-10-11 21:03:18 -05:00
parent a76829b305
commit ef07ecf985
8 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
connectivity/inc/pch/precompiled_connectivity.hxx
View file

@ -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

2
connectivity/source/cpool/ZConnectionPool.cxx
View file

@ -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();
}
// -----------------------------------------------------------------------------

8
connectivity/source/cpool/ZConnectionPool.hxx
View file

@ -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:

3
connectivity/source/cpool/makefile.mk
View file

@ -63,7 +63,8 @@ SHL1STDLIBS=\
$(CPPUHELPERLIB) \
$(VOSLIB) \
$(DBTOOLSLIB) \
$(SALLIB)
$(SALLIB) \
$(SALHELPERLIB)
SHL1DEPN=
SHL1IMPLIB= i$(SHL1TARGET)

2
framework/inc/helper/timerhelper.hxx
View file

@ -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>
//........................................................................

2
framework/inc/pch/precompiled_framework.hxx
View file

@ -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

1
framework/util/makefile.mk
View file

@ -354,6 +354,7 @@ SHL4STDLIBS= \
$(CPPULIB) \
$(SALLIB) \
$(UCBHELPERLIB) \
$(SALHELPERLIB) \
$(I18NISOLANGLIB)
SHL4DEF= $(MISC)$/$(SHL4TARGET).def

2
svx/source/fmcomp/trace.cxx
View file

@ -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;
//------------------------------------------------------------------------------