ChangelogTag: Tue Sep 6 16:12:04 2005 Arvind S. Krishna <arvindk@dre.vanderbilt.edu>

9 files changed, 37 insertions, 24 deletions

diff --git a/TAO/tao/Connection_Handler.cpp b/TAO/tao/Connection_Handler.cpp
index 3c51dd89e20..19cb476981a 100644
--- a/TAO/tao/Connection_Handler.cpp
+++ b/TAO/tao/Connection_Handler.cpp
@@ -49,6 +49,8 @@ TAO_Connection_Handler::~TAO_Connection_Handler (void)
 
   // @@ TODO Use auto_ptr<>
   delete this->lock_;
+
+  //@@ CONNECTION_HANDLER_DESTRUCTOR_ADD_HOOK
 }
 
 
diff --git a/TAO/tao/IIOP_Acceptor.cpp b/TAO/tao/IIOP_Acceptor.cpp
index 35b3f7348de..1cdf68d0d8b 100644
--- a/TAO/tao/IIOP_Acceptor.cpp
+++ b/TAO/tao/IIOP_Acceptor.cpp
@@ -44,9 +44,6 @@ TAO_IIOP_Acceptor::TAO_IIOP_Acceptor (CORBA::Boolean flag)
 {
 }
 
-
-//@@ TAO_ACCEPTOR_SPL_COPY_HOOK_START
-
 TAO_IIOP_Acceptor::~TAO_IIOP_Acceptor (void)
 {
   // Make sure we are closed before we start destroying the
@@ -65,6 +62,8 @@ TAO_IIOP_Acceptor::~TAO_IIOP_Acceptor (void)
   delete [] this->hosts_;
 }
 
+//@@ TAO_ACCEPTOR_SPL_COPY_HOOK_START
+
 // TODO =
 //    2) For V1.[1,2] there are tagged components
 int
diff --git a/TAO/tao/IIOP_Connection_Handler.cpp b/TAO/tao/IIOP_Connection_Handler.cpp
index 7ce92592394..3145e0eb1de 100644
--- a/TAO/tao/IIOP_Connection_Handler.cpp
+++ b/TAO/tao/IIOP_Connection_Handler.cpp
@@ -52,16 +52,17 @@ TAO_IIOP_Connection_Handler::TAO_IIOP_Connection_Handler (TAO_ORB_Core *orb_core
 {
 }
 
+TAO_IIOP_Connection_Handler::~TAO_IIOP_Connection_Handler (void)
+{
+  delete this->transport ();
+}
+
 /* Copy hook that copies over the concrete methods from this class
  * to the base Connection_Handler class as a part of the specialization
  * process. Add all concrete and virtual
  * methods implemented in this class within this hook.
  */
 //@@ CONNECTION_HANDLER_SPL_COPY_HOOK_START
-TAO_IIOP_Connection_Handler::~TAO_IIOP_Connection_Handler (void)
-{
-  delete this->transport ();
-}
 
 int
 TAO_IIOP_Connection_Handler::open_handler (void *v)
diff --git a/TAO/tao/IIOP_Connector.h b/TAO/tao/IIOP_Connector.h
index 1dc05e5d7fa..ef42a8bb4ac 100644
--- a/TAO/tao/IIOP_Connector.h
+++ b/TAO/tao/IIOP_Connector.h
@@ -55,6 +55,8 @@ public:
   /// Destructor.
   ~TAO_IIOP_Connector (void);
 
+  //@@ TAO_CONNECTOR_SPL_PUBLIC_METHODS_COPY_HOOK_START
+
   // = The TAO_Connector methods, please check the documentation on
   // Transport_Connector.h
   int open (TAO_ORB_Core *orb_core);
@@ -67,7 +69,6 @@ public:
 
 public:
 
-  //@@ TAO_CONNECTOR_SPL_PUBLIC_METHODS_COPY_HOOK_START
   typedef TAO_Connect_Concurrency_Strategy<TAO_IIOP_Connection_Handler>
           TAO_IIOP_CONNECT_CONCURRENCY_STRATEGY;
 
diff --git a/TAO/tao/IIOP_Endpoint.cpp b/TAO/tao/IIOP_Endpoint.cpp
index 13d9de050ae..27db968d3f8 100644
--- a/TAO/tao/IIOP_Endpoint.cpp
+++ b/TAO/tao/IIOP_Endpoint.cpp
@@ -54,8 +54,7 @@ TAO_IIOP_Endpoint::TAO_IIOP_Endpoint (const char *host,
                                       CORBA::UShort port,
                                       const ACE_INET_Addr &addr,
                                       CORBA::Short priority)
-  : TAO_Endpoint (IOP::TAG_INTERNET_IOP,
-                  priority)
+  : TAO_Endpoint (IOP::TAG_INTERNET_IOP, priority)
   , host_ ()
   , port_ (port)
 #if defined (ACE_HAS_IPV6)
@@ -102,11 +101,15 @@ TAO_IIOP_Endpoint::TAO_IIOP_Endpoint (const char *host,
 {
   this->host(host); // With IPv6 performs check for decimal address
 }
+//@@ TAO_ENDPOINT_SPL_COPY_HOOK_END
+
 
 TAO_IIOP_Endpoint::~TAO_IIOP_Endpoint (void)
 {
 }
 
+//@@ TAO_ENDPOINT_SPL_COPY_HOOK_START
+
 TAO_IIOP_Endpoint::TAO_IIOP_Endpoint (const TAO_IIOP_Endpoint &rhs)
   : TAO_Endpoint (rhs.tag_, rhs.priority_)
   , host_ (rhs.host_)
diff --git a/TAO/tao/IIOP_Endpoint.h b/TAO/tao/IIOP_Endpoint.h
index ffa6d77ad0c..0ce97db063b 100644
--- a/TAO/tao/IIOP_Endpoint.h
+++ b/TAO/tao/IIOP_Endpoint.h
@@ -72,7 +72,6 @@ public:
   /// Destructor.
   ~TAO_IIOP_Endpoint (void);
 
-  //@@ TAO_ENDPOINT_SPL_PUBLIC_METHODS_COPY_HOOK_START
 
   // = Implementation of abstract TAO_Endpoint methods.  See
   // Endpoint.h for their documentation.
@@ -93,6 +92,12 @@ public:
 
   // = IIOP_Endpoint-specific methods.
 
+  /*
+   * Hook to copy only the non virtual concrete methods implemented
+   * in this class to the derived class in the specialization.
+   */
+  //@@ TAO_ENDPOINT_SPL_PUBLIC_METHODS_COPY_HOOK_START
+
   /// Return a reference to the <object_addr>.
   const ACE_INET_Addr &object_addr (void) const;
 
diff --git a/TAO/tao/IIOP_Profile.h b/TAO/tao/IIOP_Profile.h
index 2d2946982f4..b48f9e96063 100644
--- a/TAO/tao/IIOP_Profile.h
+++ b/TAO/tao/IIOP_Profile.h
@@ -41,8 +41,6 @@
 class TAO_Export TAO_IIOP_Profile : public TAO_Profile
 {
 public:
-  /// The object key delimiter that IIOP uses or expects.
-  virtual char object_key_delimiter (void) const;
 
   //@@ TAO_PROFILE_SPL_PUBLIC_METHODS_COPY_HOOK_START
   static const char object_key_delimiter_;
@@ -69,6 +67,18 @@ public:
   /// Profile constructor, default.
   TAO_IIOP_Profile (TAO_ORB_Core *orb_core);
 
+  /**
+   * Add @a endp to this profile's list of endpoints (it is inserted
+   * next to the head of the list).  This profiles takes ownership of
+   * @a endp.
+   */
+  void add_endpoint (TAO_IIOP_Endpoint *endp);
+
+  //@@ TAO_PROFILE_SPL_PUBLIC_METHODS_COPY_HOOK_END
+
+  /// The object key delimiter that IIOP uses or expects.
+  virtual char object_key_delimiter (void) const;
+
   /// Template methods. Please see Profile.h for documentation.
   virtual char * to_string (ACE_ENV_SINGLE_ARG_DECL);
 
@@ -83,14 +93,6 @@ public:
   virtual CORBA::ULong endpoint_count (void) const;
   virtual CORBA::ULong hash (CORBA::ULong max
                              ACE_ENV_ARG_DECL);
-  /**
-   * Add @a endp to this profile's list of endpoints (it is inserted
-   * next to the head of the list).  This profiles takes ownership of
-   * @a endp.
-   */
-  void add_endpoint (TAO_IIOP_Endpoint *endp);
-
-  //@@ TAO_PROFILE_SPL_PUBLIC_METHODS_COPY_HOOK_END
 
 protected:
   /// Destructor is to be called only through <_decr_refcnt>.
diff --git a/TAO/tao/Transport.h b/TAO/tao/Transport.h
index bc01cb55655..0150555fd6f 100644
--- a/TAO/tao/Transport.h
+++ b/TAO/tao/Transport.h
@@ -915,7 +915,7 @@ private:
    * TAO's protocol implementation onto the base Transport class
    */
 
-  //@@ TAO_TRANSPORT_PRIVATE_METHODS_ADD_HOOK
+  //@@ TAO_TRANSPORT_SPL_PRIVATE_METHODS_ADD_HOOK
 
 protected:
 
@@ -1056,7 +1056,7 @@ private:
  * TAO's transport implementation.
  */
 
-//@@ TAO_TRANSPORT_EXTERN_ADD_HOOK
+//@@ TAO_TRANSPORT_SPL_EXTERN_ADD_HOOK
 
 #if defined (__ACE_INLINE__)
 # include "Transport.inl"
diff --git a/TAO/tao/Transport_Acceptor.h b/TAO/tao/Transport_Acceptor.h
index afd8c78376a..ea5df9baf97 100644
--- a/TAO/tao/Transport_Acceptor.h
+++ b/TAO/tao/Transport_Acceptor.h
@@ -148,7 +148,7 @@ private:
   //@@ TAO_ACCEPTOR_SPL_DATA_MEMBERS_ADD_HOOK
 };
 
-//@@ TAO_ACCEPTOR_EXTERN_ADD_HOOK
+//@@ TAO_ACCEPTOR_SPL_EXTERN_ADD_HOOK
 
 #if defined (__ACE_INLINE__)
 # include "Transport_Acceptor.inl"