ChangeLogTag:Wed Aug 1 8:38:06 2001 Balachandran Natarajan <bala@cs.wustl.edu>

13 files changed, 22 insertions, 52 deletions

diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index 9d8e62446a9..4b56ece5e72 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,24 @@
+Wed Aug 1 8:38:06 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
+
+	* tao/orbconf.h: Removed the #define TAO_DOESNT_YADA_YADA as there
+	  is no use for it.
+
+	* tao/Connection_Handler.h: Removed the fetch_handle () as there
+	  is no use for it.
+
+	* tao/IIOP_Connection_Handler.h:
+	* tao/IIOP_Connection_Handler.cpp:
+	* tao/Strategies/DIOP_Connection_Handler.cpp:
+	* tao/Strategies/DIOP_Connection_Handler.h:
+	* tao/Strategies/SHMIOP_Connection_Handler.h:
+	* tao/Strategies/SHMIOP_Connection_Handler.cpp:
+	* tao/Strategies/UIOP_Connection_Handler.h:
+	* tao/Strategies/UIOP_Connection_Handler.cpp:
+	* orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.h:
+	* orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp: Removed
+	  the implementation of fetch_handle (). Thanks to Carlos, the
+	  foot-print police!!, for motivating this change.
+
 Wed Aug 1 8:02:06 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
 
 	* tao/IIOP_Connection_Handler.h:
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp
index 4ee9cef3eef..2c3ace91b9f 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp
@@ -245,13 +245,6 @@ TAO_SSLIOP_Connection_Handler::handle_close (ACE_HANDLE handle,
 }
 
 
-ACE_HANDLE
-TAO_SSLIOP_Connection_Handler::fetch_handle (void)
-{
-  return this->get_handle ();
-}
-
-
 int
 TAO_SSLIOP_Connection_Handler::resume_handler (void)
 {
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.h
index e2c4d41286f..d1916142484 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.h
@@ -94,9 +94,6 @@ public:
   virtual int handle_close (ACE_HANDLE = ACE_INVALID_HANDLE,
                             ACE_Reactor_Mask = ACE_Event_Handler::NULL_MASK);
 
-  /// Return the underlying handle
-  virtual ACE_HANDLE fetch_handle (void);
-
   /// Documented in ACE_Event_Handler
   virtual int handle_output (ACE_HANDLE);
 
diff --git a/TAO/tao/Connection_Handler.h b/TAO/tao/Connection_Handler.h
index f18c6c54ed1..1401c616902 100644
--- a/TAO/tao/Connection_Handler.h
+++ b/TAO/tao/Connection_Handler.h
@@ -81,9 +81,6 @@ public:
   /// Set the underlying transport object
   void transport (TAO_Transport* transport);
 
-  /// Get the underlying handle
-  virtual ACE_HANDLE fetch_handle (void) = 0;
-
 protected:
 
   /// Return our TAO_ORB_Core pointer
diff --git a/TAO/tao/IIOP_Connection_Handler.cpp b/TAO/tao/IIOP_Connection_Handler.cpp
index affd6ccc164..2c8a7fcd09d 100644
--- a/TAO/tao/IIOP_Connection_Handler.cpp
+++ b/TAO/tao/IIOP_Connection_Handler.cpp
@@ -237,11 +237,6 @@ TAO_IIOP_Connection_Handler::handle_close (ACE_HANDLE handle,
   return 0;
 }
 
-ACE_HANDLE
-TAO_IIOP_Connection_Handler::fetch_handle (void)
-{
-  return this->get_handle ();
-}
 
 int
 TAO_IIOP_Connection_Handler::resume_handler (void)
diff --git a/TAO/tao/IIOP_Connection_Handler.h b/TAO/tao/IIOP_Connection_Handler.h
index d3dfa5ea79c..4bd0981c01f 100644
--- a/TAO/tao/IIOP_Connection_Handler.h
+++ b/TAO/tao/IIOP_Connection_Handler.h
@@ -108,9 +108,6 @@ public:
   virtual int handle_close (ACE_HANDLE = ACE_INVALID_HANDLE,
                             ACE_Reactor_Mask = ACE_Event_Handler::NULL_MASK);
 
-  /// Return the underlying handle
-  virtual ACE_HANDLE fetch_handle (void);
-
   /// Send a TRUE value to the reactor, so that the reactor does not
   /// resume the handler
   virtual int resume_handler (void);
diff --git a/TAO/tao/Strategies/DIOP_Connection_Handler.cpp b/TAO/tao/Strategies/DIOP_Connection_Handler.cpp
index 136f683e03c..b6d49bbf200 100644
--- a/TAO/tao/Strategies/DIOP_Connection_Handler.cpp
+++ b/TAO/tao/Strategies/DIOP_Connection_Handler.cpp
@@ -263,12 +263,6 @@ TAO_DIOP_Connection_Handler::handle_close (ACE_HANDLE handle,
   return 0;
 }
 
-ACE_HANDLE
-TAO_DIOP_Connection_Handler::fetch_handle (void)
-{
-  return this->get_handle ();
-}
-
 int
 TAO_DIOP_Connection_Handler::resume_handler (void)
 {
@@ -344,7 +338,7 @@ TAO_DIOP_Connection_Handler::handle_input (ACE_HANDLE)
   this->incr_pending_upcalls ();
 
   TAO_Resume_Handle  resume_handle (this->orb_core (),
-                                    this->fetch_handle ());
+                                    this->get_handle ());
 
   int retval = this->transport ()->handle_input_i (resume_handle);
 
diff --git a/TAO/tao/Strategies/DIOP_Connection_Handler.h b/TAO/tao/Strategies/DIOP_Connection_Handler.h
index da0dbaec9a8..4b50a940275 100644
--- a/TAO/tao/Strategies/DIOP_Connection_Handler.h
+++ b/TAO/tao/Strategies/DIOP_Connection_Handler.h
@@ -114,9 +114,6 @@ public:
   virtual int handle_close (ACE_HANDLE = ACE_INVALID_HANDLE,
                             ACE_Reactor_Mask = ACE_Event_Handler::NULL_MASK);
 
-  /// Return the underlying handle
-  virtual ACE_HANDLE fetch_handle (void);
-
   /// Event handler overload..
   virtual int resume_handler (void);
 
diff --git a/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp b/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp
index 0b9ea1f921f..f2d225bc7ba 100644
--- a/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp
+++ b/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp
@@ -212,12 +212,6 @@ TAO_SHMIOP_Connection_Handler::handle_close (ACE_HANDLE handle,
   return 0;
 }
 
-ACE_HANDLE
-TAO_SHMIOP_Connection_Handler::fetch_handle (void)
-{
-  return this->get_handle ();
-}
-
 int
 TAO_SHMIOP_Connection_Handler::resume_handler (void)
 {
diff --git a/TAO/tao/Strategies/SHMIOP_Connection_Handler.h b/TAO/tao/Strategies/SHMIOP_Connection_Handler.h
index 7b1bc6d569c..88f1accf53e 100644
--- a/TAO/tao/Strategies/SHMIOP_Connection_Handler.h
+++ b/TAO/tao/Strategies/SHMIOP_Connection_Handler.h
@@ -84,9 +84,6 @@ public:
   virtual int handle_close (ACE_HANDLE = ACE_INVALID_HANDLE,
                             ACE_Reactor_Mask = ACE_Event_Handler::NULL_MASK);
 
-  /// Return the underlying handle
-  virtual ACE_HANDLE fetch_handle (void);
-
   /// Documented in ACE_Event_Handler
   virtual int handle_output (ACE_HANDLE);
 
diff --git a/TAO/tao/Strategies/UIOP_Connection_Handler.cpp b/TAO/tao/Strategies/UIOP_Connection_Handler.cpp
index 99489fd7504..0c3ed127d6c 100644
--- a/TAO/tao/Strategies/UIOP_Connection_Handler.cpp
+++ b/TAO/tao/Strategies/UIOP_Connection_Handler.cpp
@@ -195,11 +195,6 @@ TAO_UIOP_Connection_Handler::handle_close (ACE_HANDLE handle,
   return 0;
 }
 
-ACE_HANDLE
-TAO_UIOP_Connection_Handler::fetch_handle (void)
-{
-  return this->get_handle ();
-}
 
 int
 TAO_UIOP_Connection_Handler::resume_handler (void)
diff --git a/TAO/tao/Strategies/UIOP_Connection_Handler.h b/TAO/tao/Strategies/UIOP_Connection_Handler.h
index f7049e8f38a..9e4baaccb06 100644
--- a/TAO/tao/Strategies/UIOP_Connection_Handler.h
+++ b/TAO/tao/Strategies/UIOP_Connection_Handler.h
@@ -103,9 +103,6 @@ public:
   virtual int handle_close (ACE_HANDLE = ACE_INVALID_HANDLE,
                             ACE_Reactor_Mask = ACE_Event_Handler::NULL_MASK);
 
-  /// Return the underlying handle
-  virtual ACE_HANDLE fetch_handle (void);
-
   /// Overload for resuming handlers..
   virtual int resume_handler (void);
 
diff --git a/TAO/tao/orbconf.h b/TAO/tao/orbconf.h
index 52d26fc85f9..15b1386d5d6 100644
--- a/TAO/tao/orbconf.h
+++ b/TAO/tao/orbconf.h
@@ -978,9 +978,5 @@ enum TAO_Policy_Scope
 #   define TAO_RESUMES_CONNECTION_HANDLER 1
 #endif /*TAO_RESUMES_CONNECTION_HANDLER*/
 
-#if !defined (TAO_DOESNT_RESUME_CONNECTION_HANDLER)
-#   define TAO_DOESNT_RESUME_CONNECTION_HANDLER 0
-#endif /*TAO_DOESNT_RESUMES_CONNECTION_HANDLER*/
-
 #include "ace/post.h"
 #endif  /* TAO_ORB_CONFIG_H */