removed singleton. removed friends.

1 files changed, 3 insertions, 9 deletions

diff --git a/cpp/demo/Ice/session/SessionI.h b/cpp/demo/Ice/session/SessionI.h
index c3de1a1b540..f502c96ac86 100755
--- a/cpp/demo/Ice/session/SessionI.h
+++ b/cpp/demo/Ice/session/SessionI.h
@@ -18,29 +18,23 @@ class SessionI : public Demo::Session, public IceUtil::Mutex
 {
 public:
 
+    SessionI(const std::string&);
+
     virtual Demo::HelloPrx createHello(const Ice::Current&);
     virtual void refresh(const Ice::Current&);
     virtual std::string getName(const Ice::Current&) const;
     virtual void destroy(const Ice::Current&);
 
-private:
-
-    // Only the ReapThread is interested in the timestamp.
-    friend class ReapThread;
     IceUtil::Time timestamp() const;
 
-    // Only the session factory can create sessions.
-    friend class SessionFactoryI;
-    SessionI(const std::string&);
+private:
 
     const std::string _name;
     IceUtil::Time _timestamp; // The last time the session was refreshed.
-
     int _nextId; // The per-session id of the next hello object. This is used for tracing purposes.
     std::list<Demo::HelloPrx> _objs; // List of per-session allocated hello objects.
     bool _destroy;
 };
-
 typedef IceUtil::Handle<SessionI> SessionIPtr;
 
 #endif