ChangeLogTag: Thu Mar 24 09:14:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>

6 files changed, 29 insertions, 28 deletions

diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp
index b9fe7ee6bce..9c44cf5350e 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp
@@ -39,15 +39,14 @@ TAO_CEC_Reactive_ConsumerControl::
     adapter_ (this),
     event_channel_ (ec),
     orb_ (CORBA::ORB::_duplicate (orb))
-{
-  this->reactor_ =
-    this->orb_->orb_core ()->reactor ();
-
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
    // Initialise timer_id_ to an invalid timer id, so that in case we don't
    // schedule a timer, we don't cancel a random timer at shutdown
-   timer_id_ = -1;
+   , timer_id_ (-1)
 #endif /* TAO_HAS_CORBA_MESSAGING */
+{
+  this->reactor_ =
+    this->orb_->orb_core ()->reactor ();
 }
 
 #if defined (TAO_HAS_TYPED_EVENT_CHANNEL)
@@ -63,15 +62,14 @@ TAO_CEC_Reactive_ConsumerControl::
     adapter_ (this),
     typed_event_channel_ (ec),
     orb_ (CORBA::ORB::_duplicate (orb))
-{
-  this->reactor_ =
-    this->orb_->orb_core ()->reactor ();
-
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
    // Initialise timer_id_ to an invalid timer id, so that in case we don't
    // schedule a timer, we don't cancel a random timer at shutdown
-   timer_id_ = -1;
+   , timer_id_ (-1)
 #endif /* TAO_HAS_CORBA_MESSAGING */
+{
+  this->reactor_ =
+    this->orb_->orb_core ()->reactor ();
 }
 #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */
 
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h
index 43994062fd0..9fb02cf18ef 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h
@@ -74,7 +74,7 @@ private:
  * = LOCKING
  * = TODO
  */
-class TAO_Event_Serv_Export TAO_CEC_Reactive_ConsumerControl 
+class TAO_Event_Serv_Export TAO_CEC_Reactive_ConsumerControl
   : public TAO_CEC_ConsumerControl
 {
 public:
@@ -164,13 +164,13 @@ private:
 
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
   /// The timer id
-  int timer_id_;
+  long timer_id_;
 #endif /* TAO_HAS_CORBA_MESSAGING */
 };
 
 // ****************************************************************
 
-class TAO_CEC_Ping_Push_Consumer 
+class TAO_CEC_Ping_Push_Consumer
   : public TAO_ESF_Worker<TAO_CEC_ProxyPushSupplier>
 {
 public:
@@ -185,7 +185,7 @@ private:
 
 // ****************************************************************
 
-class TAO_CEC_Ping_Pull_Consumer 
+class TAO_CEC_Ping_Pull_Consumer
   : public TAO_ESF_Worker<TAO_CEC_ProxyPullSupplier>
 {
 public:
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp
index 4f14b03c058..f60865f0201 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp
@@ -29,6 +29,11 @@ TAO_CEC_Reactive_Pulling_Strategy::
      relative_timeout_ (relative_timeout),
      event_channel_ (event_channel),
      orb_ (CORBA::ORB::_duplicate (orb))
+#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
+   // Initialise timer_id_ to an invalid timer id, so that in case we don't
+   // schedule a timer, we don't cancel a random timer at shutdown
+   , timer_id_ (-1)
+#endif /* TAO_HAS_CORBA_MESSAGING */
 {
   this->reactor_ =
     this->orb_->orb_core ()->reactor ();
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h
index 0ee810190e2..e4fe8452768 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h
@@ -113,7 +113,7 @@ private:
 
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
   /// The timer id
-  int timer_id_;
+  long timer_id_;
 #endif /* TAO_HAS_CORBA_MESSAGING */
 };
 
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp
index 8f75b183ce0..bdc01705782 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp
@@ -40,15 +40,14 @@ TAO_CEC_Reactive_SupplierControl::
     adapter_ (this),
     event_channel_ (ec),
     orb_ (CORBA::ORB::_duplicate (orb))
-{
-  this->reactor_ =
-    this->orb_->orb_core ()->reactor ();
-
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
    // Initialise timer_id_ to an invalid timer id, so that in case we don't
    // schedule a timer, we don't cancel a random timer at shutdown
-   timer_id_ = -1;
+   , timer_id_ (-1)
 #endif /* TAO_HAS_CORBA_MESSAGING */
+{
+  this->reactor_ =
+    this->orb_->orb_core ()->reactor ();
 }
 
 #if defined (TAO_HAS_TYPED_EVENT_CHANNEL)
@@ -64,15 +63,14 @@ TAO_CEC_Reactive_SupplierControl::
     adapter_ (this),
     typed_event_channel_ (ec),
     orb_ (CORBA::ORB::_duplicate (orb))
-{
-  this->reactor_ =
-    this->orb_->orb_core ()->reactor ();
-
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
    // Initialise timer_id_ to an invalid timer id, so that in case we don't
    // schedule a timer, we don't cancel a random timer at shutdown
-   timer_id_ = -1;
+   , timer_id_ (-1)
 #endif /* TAO_HAS_CORBA_MESSAGING */
+{
+  this->reactor_ =
+    this->orb_->orb_core ()->reactor ();
 }
 #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */
 
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h
index bede8d09893..27d9ae5c2bd 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h
@@ -47,7 +47,7 @@ class TAO_CEC_TypedEventChannel;
  * periodically wakeup and verify the state of the suppliers
  * registered with the Event Channel.
  */
-class TAO_Event_Serv_Export TAO_CEC_SupplierControl_Adapter 
+class TAO_Event_Serv_Export TAO_CEC_SupplierControl_Adapter
   : public ACE_Event_Handler
 {
 public:
@@ -74,7 +74,7 @@ private:
  * = LOCKING
  * = TODO
  */
-class TAO_Event_Serv_Export TAO_CEC_Reactive_SupplierControl 
+class TAO_Event_Serv_Export TAO_CEC_Reactive_SupplierControl
   : public TAO_CEC_SupplierControl
 {
 public:
@@ -168,7 +168,7 @@ private:
 
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
   /// The timer id
-  int timer_id_;
+  long timer_id_;
 #endif /* TAO_HAS_CORBA_MESSAGING */
 };