Changeset 9369 in orxonox.OLD for branches/proxy/src/lib/util/sigslot

Timestamp:

Jul 20, 2006, 9:16:39 PM (18 years ago)

Author:

bensch

Message:

orxonox/proxy switched to sigslot library, and it seems to work, but i am not entirely sure…

Location:

branches/proxy/src/lib/util/sigslot

Files:

• signal.h (modified) (9 diffs)
• slot.h (modified) (5 diffs)

branches/proxy/src/lib/util/sigslot/signal.h

@@ -1238 +1238 @@
     virtual _connection_base0<mt_policy>* duplicate(has_slots<mt_policy>* pnewdest)
     {
-      return new _connection0<dest_type, mt_policy>((dest_type *)pnewdest, m_pmemfun);
+      return new _connection0<dest_type, mt_policy>(dynamic_cast<dest_type*>(pnewdest), m_pmemfun);
     }
 
@@ -1279 +1279 @@
     virtual _connection_base1<arg1_type, mt_policy>* duplicate(has_slots<mt_policy>* pnewdest)
     {
-      return new _connection1<dest_type, arg1_type, mt_policy>((dest_type *)pnewdest, m_pmemfun);
+      return new _connection1<dest_type, arg1_type, mt_policy>(dynamic_cast<dest_type*>(pnewdest), m_pmemfun);
     }
 
@@ -1321 +1321 @@
     virtual _connection_base2<arg1_type, arg2_type, mt_policy>* duplicate(has_slots<mt_policy>* pnewdest)
     {
-      return new _connection2<dest_type, arg1_type, arg2_type, mt_policy>((dest_type *)pnewdest, m_pmemfun);
+      return new _connection2<dest_type, arg1_type, arg2_type, mt_policy>(dynamic_cast<dest_type*>(pnewdest), m_pmemfun);
     }
 
@@ -1363 +1363 @@
     virtual _connection_base3<arg1_type, arg2_type, arg3_type, mt_policy>* duplicate(has_slots<mt_policy>* pnewdest)
     {
-      return new _connection3<dest_type, arg1_type, arg2_type, arg3_type, mt_policy>((dest_type *)pnewdest, m_pmemfun);
+      return new _connection3<dest_type, arg1_type, arg2_type, arg3_type, mt_policy>(dynamic_cast<dest_type*>(pnewdest), m_pmemfun);
     }
 
@@ -1407 +1407 @@
     virtual _connection_base4<arg1_type, arg2_type, arg3_type, arg4_type, mt_policy>* duplicate(has_slots<mt_policy>* pnewdest)
     {
-      return new _connection4<dest_type, arg1_type, arg2_type, arg3_type, arg4_type, mt_policy>((dest_type *)pnewdest, m_pmemfun);
+      return new _connection4<dest_type, arg1_type, arg2_type, arg3_type, arg4_type, mt_policy>(dynamic_cast<dest_type*>(pnewdest), m_pmemfun);
     }
 
@@ -1457 +1457 @@
     {
       return new _connection5<dest_type, arg1_type, arg2_type, arg3_type, arg4_type,
-             arg5_type, mt_policy>((dest_type *)pnewdest, m_pmemfun);
+      arg5_type, mt_policy>(dynamic_cast<dest_type*>(pnewdest), m_pmemfun);
     }
 
@@ -1507 +1507 @@
     {
       return new _connection6<dest_type, arg1_type, arg2_type, arg3_type, arg4_type,
-             arg5_type, arg6_type, mt_policy>((dest_type *)pnewdest, m_pmemfun);
+      arg5_type, arg6_type, mt_policy>(dynamic_cast<dest_type*>(pnewdest), m_pmemfun);
     }
 
@@ -1557 +1557 @@
     {
       return new _connection7<dest_type, arg1_type, arg2_type, arg3_type, arg4_type,
-             arg5_type, arg6_type, arg7_type, mt_policy>((dest_type *)pnewdest, m_pmemfun);
+      arg5_type, arg6_type, arg7_type, mt_policy>(dynamic_cast<dest_type*>(pnewdest), m_pmemfun);
     }
 
@@ -1609 +1609 @@
     {
       return new _connection8<dest_type, arg1_type, arg2_type, arg3_type, arg4_type,
-             arg5_type, arg6_type, arg7_type, arg8_type, mt_policy>((dest_type *)pnewdest, m_pmemfun);
+      arg5_type, arg6_type, arg7_type, arg8_type, mt_policy>(dynamic_cast<dest_type*>(pnewdest), m_pmemfun);
     }
 

branches/proxy/src/lib/util/sigslot/slot.h

@@ -240 +240 @@
 
   template<class mt_policy = SIGSLOT_DEFAULT_MT_POLICY>
-  class has_slots : public mt_policy
+  class has_slots //: public mt_policy
   {
     private:
@@ -253 +253 @@
 
       has_slots(const has_slots& hs)
-          : mt_policy(hs)
-      {
-        lock_block<mt_policy> lock(this);
+//          : mt_policy(hs)
+      {
+        //lock_block<mt_policy> lock(this);
         const_iterator it = hs.m_senders.begin();
         const_iterator itEnd = hs.m_senders.end();
@@ -269 +269 @@
       void signal_connect(_signal_base<mt_policy>* sender)
       {
-        lock_block<mt_policy> lock(this);
+        //lock_block<mt_policy> lock(this);
         m_senders.insert(sender);
       }
@@ -275 +275 @@
       void signal_disconnect(_signal_base<mt_policy>* sender)
       {
-        lock_block<mt_policy> lock(this);
+        //lock_block<mt_policy> lock(this);
         m_senders.erase(sender);
       }
@@ -286 +286 @@
       void disconnect_all()
       {
-        lock_block<mt_policy> lock(this);
+        //lock_block<mt_policy> lock(this);
         const_iterator it = m_senders.begin();
         const_iterator itEnd = m_senders.end();