Mercurial > hg > orthanc
diff OrthancServer/DicomProtocol/DicomServer.h @ 1682:6414043df7d8 db-changes
integration mainline->db-changes
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Tue, 06 Oct 2015 14:09:30 +0200 |
parents | ee4367497d0d |
children | 164d78911382 |
line wrap: on
line diff
--- a/OrthancServer/DicomProtocol/DicomServer.h Tue Oct 06 11:12:13 2015 +0200 +++ b/OrthancServer/DicomProtocol/DicomServer.h Tue Oct 06 14:09:30 2015 +0200 @@ -36,12 +36,10 @@ #include "IMoveRequestHandlerFactory.h" #include "IStoreRequestHandlerFactory.h" #include "IApplicationEntityFilter.h" -#include "../../Core/MultiThreading/BagOfRunnablesBySteps.h" #include <boost/shared_ptr.hpp> #include <boost/noncopyable.hpp> -struct T_ASC_Network; namespace Orthanc { @@ -57,16 +55,12 @@ bool continue_; bool started_; uint32_t clientTimeout_; - bool isThreaded_; IFindRequestHandlerFactory* findRequestHandlerFactory_; IMoveRequestHandlerFactory* moveRequestHandlerFactory_; IStoreRequestHandlerFactory* storeRequestHandlerFactory_; IApplicationEntityFilter* applicationEntityFilter_; - BagOfRunnablesBySteps bagOfDispatchers_; // This is used iff the server is threaded - - static void ServerThread(DicomServer* server, - T_ASC_Network *net); + static void ServerThread(DicomServer* server); public: DicomServer(); @@ -76,9 +70,6 @@ void SetPortNumber(uint16_t port); uint16_t GetPortNumber() const; - void SetThreaded(bool isThreaded); - bool IsThreaded() const; - void SetClientTimeout(uint32_t timeout); uint32_t GetClientTimeout() const;