ChangeLogTag: Tue Nov 30 11:15:29 2004 Dale Wilson <wilson_d@ociweb.com>

17 files changed, 61 insertions, 23 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 0f49f5b7fa1..78cdb3e9226 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,33 @@
+Tue Nov 30 11:15:29 2004  Dale Wilson  <wilson_d@ociweb.com>
+
+        * orbsvcs/orbsvcs/Notify/ProxyConsumer.h:
+        * orbsvcs/orbsvcs/Notify/ProxyConsumer.cpp:
+          Missing namespace qualifier on argument.
+
+        * orbsvcs/orbsvcs/Notify/EventTypeSeq.h:
+        * orbsvcs/orbsvcs/Notify/EventTypeSeq.cpp:
+        * orbsvcs/orbsvcs/Notify/ProxyConsumer_T.cpp:
+        * orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp:
+        * orbsvcs/orbsvcs/Notify/ProxySupplier_T.cpp:
+        * orbsvcs/orbsvcs/Notify/Admin.cpp:
+          Replace another overloading of the init method name
+          with a unique and more descriptive name.
+
+        * orbsvcs/orbsvcs/Notify/Consumer.cpp:
+        * orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.cpp:
+        * orbsvcs/orbsvcs/Notify/Reconnection_Registry.cpp:
+        * orbsvcs/orbsvcs/Notify/Routing_Slip.cpp:
+        * orbsvcs/orbsvcs/Notify/XML_Loader.cpp:
+        * orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp:
+          BCB6 builds complaining about undefined "ex" in ACE_TRY_NEW_ENV{ ... }ACE_CATCHANY
+          s/ACE_TRY_NEW_ENV/ACE_DECLARE_NEW_ENV;ACE_TRY/
+
+        * orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.cpp:
+          Unused ENV argument
+
+        * orbsvcs/orbsvcs/Notify/Topology_Object.h:
+          Remove unnecessary virtual inheritence
+
 Tue Nov 30 09:53:57 2004  Chad Elliott  <elliott_c@ociweb.com>
 
         * orbsvcs/orbsvcs/Notify/Admin.cpp:
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp b/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp
index 15c94f7a6c0..623f7686e82 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp
@@ -77,7 +77,7 @@ TAO_Notify_Admin::subscribed_types (TAO_Notify_EventTypeSeq& subscribed_types AC
   // Adopt the Admin's subscription.
   TAO_Notify_EventTypeSeq added (this->subscribed_types_), removed;
 
-  added.init (subscribed_types, removed);
+  added.add_and_remove (subscribed_types, removed);
 
   subscribed_types = added;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.cpp
index 3ca6610b3f5..4fab1a82903 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.cpp
@@ -122,7 +122,7 @@ TAO_Notify_ProxyPushConsumer::load_attrs (const TAO_Notify::NVPList& attrs)
       ACE_TRY_CHECK;
       this->updates_off_ = save_updates;
     }
-    ACE_CATCHANY
+    ACE_CATCHALL
     {
       ACE_ASSERT(0);
     }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Consumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Consumer.cpp
index 3a885ff9d8e..26d30e1b5b5 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Consumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Consumer.cpp
@@ -202,7 +202,8 @@ TAO_Notify_Consumer::deliver (TAO_Notify_Method_Request_Event * request ACE_ENV_
             request->sequence ()
             ));
           request->complete ();
-          ACE_TRY_NEW_ENV
+          ACE_DECLARE_NEW_ENV;
+          ACE_TRY
           {
             this->proxy_supplier ()->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
             ACE_TRY_CHECK;
@@ -223,7 +224,8 @@ TAO_Notify_Consumer::DispatchStatus
 TAO_Notify_Consumer::dispatch_request (TAO_Notify_Method_Request_Event * request)
 {
   DispatchStatus result = DISPATCH_SUCCESS;
-  ACE_TRY_NEW_ENV
+  ACE_DECLARE_NEW_ENV;
+  ACE_TRY
   {
     request->event ()->push (this ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
@@ -324,7 +326,8 @@ TAO_Notify_Consumer::dispatch_request (TAO_Notify_Method_Request_Event * request
 TAO_Notify_Consumer::DispatchStatus
 TAO_Notify_Consumer::dispatch_batch (const CosNotification::EventBatch& batch)
 {
-  ACE_TRY_NEW_ENV
+  ACE_DECLARE_NEW_ENV;
+  ACE_TRY
   {
     this->push (batch ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
@@ -446,7 +449,8 @@ TAO_Notify_Consumer::dispatch_from_queue (Request_Queue & requests, ACE_Guard <T
           ace_mon.acquire ();
         }
         ace_mon.release ();
-        ACE_TRY_NEW_ENV
+        ACE_DECLARE_NEW_ENV;
+        ACE_TRY
         {
           this->proxy_supplier ()->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
@@ -533,7 +537,8 @@ TAO_Notify_Consumer::handle_timeout (const ACE_Time_Value&, const void*)
 {
   TAO_Notify_Refcountable_Guard_T<TAO_Notify_Consumer> grd (this);
   this->timer_id_ = -1;  // This must come first, because dispatch_pending may try to resched
-  ACE_TRY_NEW_ENV
+  ACE_DECLARE_NEW_ENV;
+  ACE_TRY
     {
       this->dispatch_pending (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp
index 09a89927501..92fa42c92be 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp
@@ -318,7 +318,7 @@ TAO_Notify_ConsumerAdmin::subscription_change (const CosNotification::EventTypeS
                         CORBA::INTERNAL ());
     ACE_CHECK;
 
-    this->subscribed_types_.init (seq_added, seq_removed);
+    this->subscribed_types_.add_and_remove (seq_added, seq_removed);
 
     TAO_Notify_Subscription_Change_Worker worker (added, removed);
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.cpp b/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.cpp
index 91137c3532a..16876142c0f 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.cpp
@@ -124,7 +124,7 @@ TAO_Notify_EventTypeSeq::remove_seq (const TAO_Notify_EventTypeSeq& event_type_s
 }
 
 void
-TAO_Notify_EventTypeSeq::init (TAO_Notify_EventTypeSeq& seq_added, TAO_Notify_EventTypeSeq& seq_remove)
+TAO_Notify_EventTypeSeq::add_and_remove (TAO_Notify_EventTypeSeq& seq_added, TAO_Notify_EventTypeSeq& seq_remove)
 {
   const TAO_Notify_EventType& special = TAO_Notify_EventType::special ();
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.h b/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.h
index fb6966a939a..bf80a8c384c 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.h
@@ -42,7 +42,7 @@ public:
   TAO_Notify_EventTypeSeq & operator = (const TAO_Notify_EventTypeSeq & rhs);
 
   /// Preprocess the types added and removed.
-  void init (TAO_Notify_EventTypeSeq& added, TAO_Notify_EventTypeSeq& removed);
+  void add_and_remove (TAO_Notify_EventTypeSeq& added, TAO_Notify_EventTypeSeq& removed);
 
   /// Populate this sequence with the intersection of rhs and lhs.
   void intersection (const TAO_Notify_EventTypeSeq& rhs, const TAO_Notify_EventTypeSeq& lhs);
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.cpp
index e7a0b3ff34d..3c0457cf5f6 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.cpp
@@ -44,12 +44,12 @@ TAO_Notify_ProxyConsumer::peer (void)
 }
 
 void
-TAO_Notify_ProxyConsumer::init (Topology_Parent * topology_parent ACE_ENV_ARG_DECL)
+TAO_Notify_ProxyConsumer::init (TAO_Notify::Topology_Parent * topology_parent ACE_ENV_ARG_DECL)
 {
   TAO_Notify_Proxy::initialize (topology_parent ACE_ENV_ARG_PARAMETER);
 
   this->supplier_admin_ = dynamic_cast<TAO_Notify_SupplierAdmin *>(topology_parent);
-  ACE_ASSERT(supplier_admin_ != 0);
+  ACE_ASSERT(this->supplier_admin_ != 0);
 
   this->supplier_admin_->_incr_refcnt ();
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.h
index b4a71a30400..862ffcddedd 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.h
@@ -48,7 +48,7 @@ public:
   ~TAO_Notify_ProxyConsumer ();
 
   /// init: overrides Topology_Object method
-  virtual void init (Topology_Parent * topology_parent ACE_ENV_ARG_DECL);
+  virtual void init (TAO_Notify::Topology_Parent * topology_parent ACE_ENV_ARG_DECL);
 
   /// Connect
   void connect (TAO_Notify_Supplier* supplier ACE_ENV_ARG_DECL)
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.cpp
index d9e90b412cd..08b7bc76dfe 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.cpp
@@ -63,7 +63,7 @@ TAO_Notify_ProxyConsumer_T<SERVANT_TYPE>::offer_change (const CosNotification::E
                         CORBA::INTERNAL ());
     ACE_CHECK;
 
-    this->subscribed_types_.init (seq_added, seq_removed);
+    this->subscribed_types_.add_and_remove (seq_added, seq_removed);
   }
 
   this->event_manager_->offer_change (this, seq_added, seq_removed ACE_ENV_ARG_PARAMETER);
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.cpp
index 33c3ed70b8c..67a74da448e 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.cpp
@@ -115,7 +115,7 @@ TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::subscription_change (const CosNotifica
                         CORBA::INTERNAL ());
     ACE_CHECK;
 
-    this->subscribed_types_.init (seq_added, seq_removed);
+    this->subscribed_types_.add_and_remove (seq_added, seq_removed);
   }
 
   this->event_manager_->subscription_change (this, seq_added, seq_removed ACE_ENV_ARG_PARAMETER);
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Reconnection_Registry.cpp b/TAO/orbsvcs/orbsvcs/Notify/Reconnection_Registry.cpp
index 520da0dfa89..965292a3b67 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Reconnection_Registry.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Reconnection_Registry.cpp
@@ -191,7 +191,8 @@ namespace TAO_Notify
       iter.next (entry);
       iter.advance ())
     {
-      ACE_TRY_NEW_ENV
+      ACE_DECLARE_NEW_ENV;
+      ACE_TRY
       {
         if (DEBUG_LEVEL > 0)
         {
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.cpp b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.cpp
index 1f86e0699d9..102e4090dc4 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.cpp
@@ -111,7 +111,8 @@ Routing_Slip::create (
   Routing_Slip_Ptr result;
   ACE_Message_Block * event_mb = 0;
   ACE_Message_Block * rs_mb = 0;
-  ACE_TRY_NEW_ENV
+  ACE_DECLARE_NEW_ENV;
+  ACE_TRY
     {
       if (rspm->reload (event_mb, rs_mb))
       {
@@ -843,7 +844,8 @@ Routing_Slip::unmarshal (TAO_Notify_EventChannelFactory &ecf, TAO_InputCDR & cdr
     ACE_CDR::Octet code = 0;
     while (cdr.read_octet(code))
     {
-      ACE_TRY_NEW_ENV
+      ACE_DECLARE_NEW_ENV;
+      ACE_TRY
       {
         if (code == TAO_Notify_Method_Request_Dispatch::persistence_code)
         {
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.cpp
index e7f047c80a4..2b083e0e98d 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.cpp
@@ -37,7 +37,7 @@ TAO_Notify_RT_StructuredProxyPushSupplier::activate (PortableServer::Servant ser
 
 CORBA::Object_ptr
 TAO_Notify_RT_StructuredProxyPushSupplier::activate (PortableServer::Servant ,
-                                                     CORBA::Long ACE_ENV_ARG_DECL)
+                                                     CORBA::Long ACE_ENV_ARG_DECL_NOT_USED)
 {
    return CORBA::Object::_nil ();
 }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp
index c5923eda2d4..5f77dc25f77 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp
@@ -304,7 +304,7 @@ TAO_Notify_SupplierAdmin::offer_change (const CosNotification::EventTypeSeq & ad
                         CORBA::INTERNAL ());
     ACE_CHECK;
 
-    this->subscribed_types_.init (seq_added, seq_removed);
+    this->subscribed_types_.add_and_remove (seq_added, seq_removed);
 
     TAO_Notify_Subscription_Change_Worker worker (added, removed);
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.h b/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.h
index 2459a164653..c2c6de5eb76 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.h
@@ -86,14 +86,13 @@ namespace TAO_Notify
     /// call the reconnect() method on all of our children to give them
     /// the chance to do the same.
     virtual void reconnect (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
-
   };
 
   /// \brief Base class for Persistent Topology Objects.
   ///
   /// Topology objects must be derived from this class to allow themselves
   /// to be persisted.
-  class TAO_Notify_Serv_Export Topology_Object : public virtual TAO_Notify_Object, public virtual Topology_Savable
+  class TAO_Notify_Serv_Export Topology_Object : public virtual TAO_Notify_Object, public Topology_Savable
   {
   public:
     /// The constructor.
diff --git a/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.cpp b/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.cpp
index 17e3b3ea3ac..a5ab16f1b72 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.cpp
@@ -172,7 +172,8 @@ namespace TAO_Notify
       Topology_Object* cur;
       if (object_stack_.top (cur) == 0)
       {
-        ACE_TRY_NEW_ENV
+        ACE_DECLARE_NEW_ENV;
+        ACE_TRY
         {
           NVPList attrs;
           CORBA::Long id = makeNVPList (attrs, xml_attrs);