ChangeLogTag:Sat Jul 10 18:54:50 1999 Carlos O'Ryan <coryan@cs.wustl.edu>

4 files changed, 36 insertions, 14 deletions

diff --git a/TAO/ChangeLog-99c b/TAO/ChangeLog-99c
index 3408e195578..8e1c0cf2b4c 100644
--- a/TAO/ChangeLog-99c
+++ b/TAO/ChangeLog-99c
@@ -1,3 +1,11 @@
+Sat Jul 10 18:54:50 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
+
+	* orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp: 
+	* orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp:
+	* orbsvcs/orbsvcs/Event/Event_Channel.cpp:
+	  Fixed warnings on HP-UX/aCC, thanks to Eric Mitchell for
+	  facilitating the resources to find these problems.
+
 Sat Jul 10 17:35:45 1999  Jeff Parsons  <parsons@cs.wustl.edu>
 
 	* TAO_IDL/be/be_visitor_sequence/gen_unbounded_sequence_cs.cpp:
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp
index 62375c387f7..7dee4cee165 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp
@@ -39,7 +39,8 @@ TAO_EC_ProxyPushConsumer::connected (TAO_EC_ProxyPushSupplier* supplier,
   {
     ACE_GUARD_THROW_EX (
         ACE_Lock, ace_mon, *this->lock_,
-        RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
+        CORBA::INTERNAL ());
+    // @@ RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
     ACE_CHECK;
 
     if (this->is_connected_i () == 0)
@@ -54,7 +55,8 @@ TAO_EC_ProxyPushConsumer::connected (TAO_EC_ProxyPushSupplier* supplier,
   {
     ACE_GUARD_THROW_EX (
         ACE_Lock, ace_mon, *this->lock_,
-        RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
+        CORBA::INTERNAL ());
+    // @@  RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
     ACE_CHECK;
     filter->_decr_refcnt ();
   }
@@ -186,7 +188,8 @@ TAO_EC_ProxyPushConsumer::connect_push_supplier (
   {
     ACE_GUARD_THROW_EX (
         ACE_Lock, ace_mon, *this->lock_,
-        RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
+        CORBA::INTERNAL ());
+    // @@ RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
     ACE_CHECK;
 
     if (this->is_connected_i ())
@@ -205,7 +208,8 @@ TAO_EC_ProxyPushConsumer::connect_push_supplier (
         {
           ACE_GUARD_THROW_EX (
               TAO_EC_Unlock, ace_mon, reverse_lock,
-              RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
+              CORBA::INTERNAL ());
+          // @@ RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
           ACE_CHECK;
 
           this->event_channel_->disconnected (this, ACE_TRY_ENV);
@@ -238,7 +242,8 @@ TAO_EC_ProxyPushConsumer::push (const RtecEventComm::EventSet& event,
   {
     ACE_GUARD_THROW_EX (
         ACE_Lock, ace_mon, *this->lock_,
-        RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
+        CORBA::INTERNAL ());
+    // @@ RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
     ACE_CHECK;
 
     if (this->is_connected_i () == 0)
@@ -257,7 +262,8 @@ TAO_EC_ProxyPushConsumer::push (const RtecEventComm::EventSet& event,
   {
     ACE_GUARD_THROW_EX (
         ACE_Lock, ace_mon, *this->lock_,
-        RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
+        CORBA::INTERNAL ());
+    // @@ RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
     ACE_CHECK;
     filter->_decr_refcnt ();
     this->refcount_--;
@@ -275,7 +281,8 @@ TAO_EC_ProxyPushConsumer::disconnect_push_consumer (
   {
     ACE_GUARD_THROW_EX (
         ACE_Lock, ace_mon, *this->lock_,
-        RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
+        CORBA::INTERNAL ());
+    // @@ RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
     ACE_CHECK;
 
     if (this->is_connected_i () == 0)
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp
index f6df18233df..eba09ed9766 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp
@@ -142,7 +142,8 @@ TAO_EC_ProxyPushSupplier::connect_push_consumer (
   {
     ACE_GUARD_THROW_EX (
         ACE_Lock, ace_mon, *this->lock_,
-        RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
+        CORBA::INTERNAL ());
+    // @@ RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
     ACE_CHECK;
 
     if (this->is_connected_i ())
@@ -173,7 +174,8 @@ TAO_EC_ProxyPushSupplier::connect_push_consumer (
         {
           ACE_GUARD_THROW_EX (
               TAO_EC_Unlock, ace_mon, reverse_lock,
-              RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
+              CORBA::INTERNAL ());
+          // @@ RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
           ACE_CHECK;
 
           this->event_channel_->disconnected (this, ACE_TRY_ENV);
@@ -210,7 +212,8 @@ TAO_EC_ProxyPushSupplier::disconnect_push_supplier (
   {
     ACE_GUARD_THROW_EX (
         ACE_Lock, ace_mon, *this->lock_,
-        RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
+        CORBA::INTERNAL ());
+    // @@ RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
     ACE_CHECK;
 
     if (this->is_connected_i () == 0)
@@ -234,7 +237,8 @@ TAO_EC_ProxyPushSupplier::suspend_connection (CORBA::Environment &ACE_TRY_ENV)
 {
   ACE_GUARD_THROW_EX (
             ACE_Lock, ace_mon, *this->lock_,
-            RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
+            CORBA::INTERNAL ());
+  // @@ RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
   ACE_CHECK;
 
   this->suspended_ = 1;
@@ -246,7 +250,8 @@ TAO_EC_ProxyPushSupplier::resume_connection (CORBA::Environment &ACE_TRY_ENV)
 {
   ACE_GUARD_THROW_EX (
             ACE_Lock, ace_mon, *this->lock_,
-            RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
+            CORBA::INTERNAL ());
+  // @@ RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
   ACE_CHECK;
 
   this->suspended_ = 0;
diff --git a/TAO/orbsvcs/orbsvcs/Event/Event_Channel.cpp b/TAO/orbsvcs/orbsvcs/Event/Event_Channel.cpp
index 5c81c125452..01aa455a3ff 100644
--- a/TAO/orbsvcs/orbsvcs/Event/Event_Channel.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/Event_Channel.cpp
@@ -1444,7 +1444,8 @@ ACE_ES_Consumer_Module::obtain_push_supplier (
   {
     ACE_GUARD_THROW_EX (
         ACE_ES_MUTEX, ace_mon, this->lock_,
-        RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR());
+        CORBA::INTERNAL ());
+    // @@ RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR());
     ACE_CHECK_RETURN (proxy);
 
     if (all_consumers_.insert (new_consumer.get ()) == -1)
@@ -3351,7 +3352,8 @@ ACE_ES_Supplier_Module::obtain_push_consumer (CORBA::Environment &ACE_TRY_ENV)
   {
     ACE_GUARD_THROW_EX (
          ACE_ES_MUTEX, ace_mon, this->lock_,
-         RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR());
+         CORBA::INTERNAL ());
+    // @@ RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR());
     ACE_CHECK_RETURN (proxy);
 
     if (all_suppliers_.insert (new_supplier.get ()) == -1)