projects
/
fms.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
version 0.3.0
[fms.git]
/
include
/
freenet
/
freenetmasterthread.h
diff --git
a/include/freenet/freenetmasterthread.h
b/include/freenet/freenetmasterthread.h
index
e1f2453
..
6b2fc0b
100644
(file)
--- a/
include/freenet/freenetmasterthread.h
+++ b/
include/freenet/freenetmasterthread.h
@@
-7,13
+7,12
@@
#include "ifcpconnected.h"
\r
#include "iperiodicprocessor.h"
\r
\r
#include "ifcpconnected.h"
\r
#include "iperiodicprocessor.h"
\r
\r
-//#include <zthread/Runnable.h>
\r
-#include "../pthreadwrapper/runnable.h"
\r
+#include "../threadwrapper/cancelablerunnable.h"
\r
\r
// forward declaration
\r
class IFreenetRegistrable;
\r
\r
\r
// forward declaration
\r
class IFreenetRegistrable;
\r
\r
-class FreenetMasterThread:public
PThread::
Runnable,public ILogger, public IFCPMessageHandler
\r
+class FreenetMasterThread:public
Cancelable
Runnable,public ILogger, public IFCPMessageHandler
\r
{
\r
public:
\r
FreenetMasterThread();
\r
{
\r
public:
\r
FreenetMasterThread();
\r
@@
-21,7
+20,7
@@
public:
\r
const bool HandleMessage(FCPMessage &message);
\r
\r
\r
const bool HandleMessage(FCPMessage &message);
\r
\r
- void
R
un();
\r
+ void
r
un();
\r
\r
// registration methods for children objects
\r
void RegisterPeriodicProcessor(IPeriodicProcessor *obj);
\r
\r
// registration methods for children objects
\r
void RegisterPeriodicProcessor(IPeriodicProcessor *obj);
\r