diff options
author | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-10-10 21:29:02 -0500 |
---|---|---|
committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-10-10 21:29:02 -0500 |
commit | f81e36d56ed79d1d4d06d928dbf095966261dbca (patch) | |
tree | 572ea460fc5ab28e46c6017e3d8ba197fdda94bf /automation/inc | |
parent | 53f428d9bf8f9648e21bf89cfbb406747536ed09 (diff) |
merge vosremoval-thread patch
Diffstat (limited to 'automation/inc')
-rw-r--r-- | automation/inc/automation/communi.hxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/automation/inc/automation/communi.hxx b/automation/inc/automation/communi.hxx index 36a6660f1a6d..5e42fa71d15d 100644 --- a/automation/inc/automation/communi.hxx +++ b/automation/inc/automation/communi.hxx @@ -29,7 +29,7 @@ #define _COMMUNI_HXX #include <svl/svarray.hxx> -#include <vos/thread.hxx> +#include <osl/thread.hxx> #include <vos/mutex.hxx> #include <vcl/timer.hxx> #include <automation/simplecm.hxx> @@ -76,7 +76,7 @@ public: CommunicationManagerClient( BOOL bUseMultiChannel = FALSE ); }; -class CommunicationLinkViaSocket : public SimpleCommunicationLinkViaSocket, public NAMESPACE_VOS(OThread) +class CommunicationLinkViaSocket : public SimpleCommunicationLinkViaSocket, public osl::Thread { public: CommunicationLinkViaSocket( CommunicationManager *pMan, NAMESPACE_VOS(OStreamSocket) *pSocket ); @@ -133,7 +133,7 @@ private: void AddConnection( CommunicationLink *pNewConnection ); }; -class CommunicationManagerServerAcceptThread: public NAMESPACE_VOS(OThread) +class CommunicationManagerServerAcceptThread: public osl::Thread { public: CommunicationManagerServerAcceptThread( CommunicationManagerServerViaSocket* pServer, ULONG nPort, USHORT nMaxCon = CM_UNLIMITED_CONNECTIONS ); |