removed singleton. removed friends.

1 files changed, 2 insertions, 12 deletions

diff --git a/cpp/demo/Ice/session/ReapThread.h b/cpp/demo/Ice/session/ReapThread.h
index 33fdc7333d9..1c4e410ee13 100755
--- a/cpp/demo/Ice/session/ReapThread.h
+++ b/cpp/demo/Ice/session/ReapThread.h
@@ -11,30 +11,22 @@
 #define REAP_THREAD_H
 
 #include <IceUtil/Thread.h>
-#include <IceUtil/StaticMutex.h>
 #include <SessionI.h>
 
 #include <list>
 
-class ReapThread;
-typedef IceUtil::Handle<ReapThread> ReapThreadPtr;
-
 class ReapThread : public IceUtil::Thread, public IceUtil::Monitor<IceUtil::Mutex>
 {
 public:
 
-    static ReapThreadPtr& instance();
+    ReapThread();
 
     virtual void run();
-
     void terminate();
-
     void add(const Demo::SessionPrx&, const SessionIPtr&);
 
 private:
 
-    ReapThread();
-
     const IceUtil::Time _timeout;
     bool _terminated;
     struct SessionProxyPair
@@ -45,9 +37,7 @@ private:
 	const SessionIPtr session;
     };
     std::list<SessionProxyPair> _sessions;
-
-    static ReapThreadPtr _instance;
-    static IceUtil::StaticMutex _instanceMutex;
 };
+typedef IceUtil::Handle<ReapThread> ReapThreadPtr;
 
 #endif