ChangeLogTag: Tue Nov 30 09:53:57 2004 Chad Elliott <elliott_c@ociweb.com>

8 files changed, 30 insertions, 13 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 7b294e50d83..0f49f5b7fa1 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,20 @@
+Tue Nov 30 09:53:57 2004  Chad Elliott  <elliott_c@ociweb.com>
+
+        * orbsvcs/orbsvcs/Notify/Admin.cpp:
+        * orbsvcs/orbsvcs/Notify/EventChannel.cpp:
+        * orbsvcs/orbsvcs/Notify/ProxyConsumer.cpp:
+        * orbsvcs/orbsvcs/Notify/ProxySupplier.cpp:
+        * orbsvcs/orbsvcs/Notify/Topology_Object.h:
+        * orbsvcs/orbsvcs/Notify/Topology_Object.cpp:
+
+          Renamed the init method in Topology_Object to initialize to avoid
+          ambiguity with the TAO_NotifyProxyConsumer init method.
+
+        * orbsvcs/orbsvcs/Notify/XML_Saver.cpp:
+
+          Changed the fprintf format from %d to %ld for the long int
+          parameter.
+
 Tue Nov 30 08:38:12 UTC 2004  Martin Corino  <mcorino@remedy.nl>
 
         * orbsvcs/tests/FT_App/FT_Client.cpp:
@@ -44,7 +61,7 @@ Mon Nov 29 13:23:14 2004  Dale Wilson  <wilson_d@ociweb.com>
 
 Mon Nov 29 17:45:55 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
 
- 	* tao/IIOP_Endpoint.cpp:
+        * tao/IIOP_Endpoint.cpp:
         * tao/IIOP_Endpoint.h:
 
           Added a bool which holds the  details of when the endpoint is
@@ -94,7 +111,7 @@ Mon Nov 29 13:10:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
 
 Mon Nov 29 12:39:13 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
 
- 	* tao/IIOP_Endpoint.cpp:
+        * tao/IIOP_Endpoint.cpp:
         * tao/Strategies/SCIOP_Endpoint.cpp:
 
           Fixed a stupid typo which resulted in some tests failing in the
@@ -124,7 +141,7 @@ Sun Nov 28 18:16:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
 
 Sun Nov 28 18:00:30 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
 
- 	* tao/IORInterceptor/IORInterceptor.pidl:
+        * tao/IORInterceptor/IORInterceptor.pidl:
 
           Added some documentation for applying diffs.
 
@@ -156,7 +173,7 @@ Sun Nov 28 17:41:37 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
 
           Reduced inter-header dependancies.
 
- 	* orbsvcs/examples/ORT/Server_IORInterceptor.h:
+        * orbsvcs/examples/ORT/Server_IORInterceptor.h:
         * orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h:
         * tests/ORT/ORT_test_IORInterceptor.h:
         * tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.h:
@@ -220,7 +237,7 @@ Sat Nov 27 23:44:56 2004  Ciju John  <john_c@ociweb.com>
 
 Sun Nov 28 05:14:24 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
 
- 	* tao/Connector_Registry.cpp:
+        * tao/Connector_Registry.cpp:
 
           Used an auto_ptr <> instead of using delete's in the error
           paths.
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp b/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp
index 1ffee04b663..15c94f7a6c0 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp
@@ -48,7 +48,7 @@ TAO_Notify_Admin::init (TAO_Notify::Topology_Parent * parent ACE_ENV_ARG_DECL)
   this->ec_->_incr_refcnt ();
 
   // this-> on the following line confuses VC6
-  TAO_Notify::Topology_Parent::init (parent ACE_ENV_ARG_PARAMETER);
+  TAO_Notify::Topology_Parent::initialize (parent ACE_ENV_ARG_PARAMETER);
 
   ACE_NEW_THROW_EX (this->proxy_container_,
                     TAO_Notify_Proxy_Container (),
diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventChannel.cpp b/TAO/orbsvcs/orbsvcs/Notify/EventChannel.cpp
index 892de5ecc70..a9004349ef9 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/EventChannel.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/EventChannel.cpp
@@ -64,7 +64,7 @@ TAO_Notify_EventChannel::init (TAO_Notify_EventChannelFactory* ecf
                            ACE_ENV_ARG_DECL)
 {
   // this-> on the following line confuses VC6
-  TAO_Notify::Topology_Object::init (ecf ACE_ENV_ARG_PARAMETER);
+  TAO_Notify::Topology_Object::initialize (ecf ACE_ENV_ARG_PARAMETER);
 
   this->ecf_ = ecf;
 
@@ -131,7 +131,7 @@ TAO_Notify_EventChannel::init (TAO_Notify::Topology_Parent * parent
                            ACE_ENV_ARG_DECL)
 {
   // this-> on the following line confuses VC6
-  TAO_Notify::Topology_Parent::init (parent ACE_ENV_ARG_PARAMETER);
+  TAO_Notify::Topology_Parent::initialize (parent ACE_ENV_ARG_PARAMETER);
 
   this->ecf_ = dynamic_cast <TAO_Notify_EventChannelFactory*>(parent);
   ACE_ASSERT (this->ecf_ != 0);
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.cpp
index e55181405b9..e7a0b3ff34d 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.cpp
@@ -46,7 +46,7 @@ TAO_Notify_ProxyConsumer::peer (void)
 void
 TAO_Notify_ProxyConsumer::init (Topology_Parent * topology_parent ACE_ENV_ARG_DECL)
 {
-  TAO_Notify_Proxy::init (topology_parent ACE_ENV_ARG_PARAMETER);
+  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);
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.cpp
index 13920fb2472..2b87323ca46 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.cpp
@@ -31,7 +31,7 @@ TAO_Notify_ProxySupplier::~TAO_Notify_ProxySupplier ()
 void
 TAO_Notify_ProxySupplier::init (TAO_Notify_ConsumerAdmin* consumer_admin ACE_ENV_ARG_DECL)
 {
-  TAO_Notify_Proxy::init (consumer_admin ACE_ENV_ARG_PARAMETER);
+  TAO_Notify_Proxy::initialize (consumer_admin ACE_ENV_ARG_PARAMETER);
 
   this->consumer_admin_ = consumer_admin;
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.cpp b/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.cpp
index 256274a88b0..46afcb3bc62 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.cpp
@@ -33,7 +33,7 @@ namespace TAO_Notify
   }
 
   void
-  Topology_Object::init (Topology_Parent * topology_parent ACE_ENV_ARG_DECL_NOT_USED)
+  Topology_Object::initialize (Topology_Parent * topology_parent ACE_ENV_ARG_DECL_NOT_USED)
   {
     this->topology_parent_ = topology_parent;
     TAO_Notify_Object::initialize (topology_parent);
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.h b/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.h
index 41be5834884..2459a164653 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.h
@@ -103,7 +103,7 @@ namespace TAO_Notify
     virtual ~Topology_Object ();
 
     /// Init this object with data from <rhs>.
-    virtual void init (Topology_Parent * topology_parent ACE_ENV_ARG_DECL);
+    virtual void initialize (Topology_Parent * topology_parent ACE_ENV_ARG_DECL);
 
     /// \brief Create a child of the appropriate type and return it.
     ///
diff --git a/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.cpp b/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.cpp
index ff54c6072bc..84fa7ce30ca 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.cpp
@@ -163,7 +163,7 @@ namespace TAO_Notify
     {
       // not all ostreams know what to do with a CORBA::Long
       long lid = id;
-      ACE_OS::fprintf (out, "%s%s%d%s", TOPOLOGY_ID_NAME, "=\"", lid, "\"");
+      ACE_OS::fprintf (out, "%s%s%ld%s", TOPOLOGY_ID_NAME, "=\"", lid, "\"");
     }
 
     char * buffer = 0;