X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=src%2Fsession.hpp;h=52c2d3efe6326025074ed9508565756d7fd00ff2;hb=a27375762602ee41a01282b59aae617c0764b38b;hp=08301a7358b9e945eee3c2d4ac4ca56bc81e32e0;hpb=073a9efb12b18f9bbd2bceaf778eb66124a0db65;p=metaproxy-moved-to-github.git

diff --git a/src/session.hpp b/src/session.hpp
index 08301a7..52c2d3e 100644
--- a/src/session.hpp
+++ b/src/session.hpp
@@ -7,24 +7,31 @@
 #include <boost/thread/mutex.hpp>
 
 namespace yp2 {
-
+    
     class Session
     {
         //typedef unsigned long type;
     public:
-
-       /// create new session with new unique id
-       Session() {
+        
+        /// create new session with new unique id
+        Session() {
             boost::mutex::scoped_lock scoped_lock(m_mutex);
             ++m_global_id;
             m_id =  m_global_id;
             m_close = false;
         };
-
-      /// copy session including old id
-      Session(const Session &s) : m_id(s.m_id), m_close(s.m_close) {};
-
-        //Session& operator=(const Session &);
+        
+        /// copy session including old id
+        Session(const Session &s) : m_id(s.m_id), m_close(s.m_close) {};
+        
+        Session& operator=(const Session &s) {
+            if (this != &s)
+            {
+                m_id = s.m_id;
+                m_close = s.m_close;
+            }
+            return *this;
+        }
         
         unsigned long id() const {
             return m_id;
@@ -33,17 +40,17 @@ namespace yp2 {
         bool is_closed() const {
             return m_close;
         };
-
+        
         /// mark session closed, can not be unset
         void close() {
             m_close = true;
         };
-
-     private:
-
+        
+    private:
+        
         unsigned long int m_id;
         bool m_close;
-
+        
         /// static mutex to lock static m_id
         static boost::mutex m_mutex;
         
@@ -54,11 +61,6 @@ namespace yp2 {
     
 }
 
-// defining and initializing static members
-boost::mutex yp2::Session::m_mutex;
-unsigned long int yp2::Session::m_global_id = 0;
-
-
 #endif
 /*
  * Local variables: