Wed Aug 1 09:02:12 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>

16 files changed, 43 insertions, 45 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 0e9a1872c84..dbf8222d2da 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,25 +1,45 @@
+Wed Aug  1 09:02:12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp:
+        * orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.h:
+        * orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Transport.cpp:
+        * orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Transport.h:
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp:
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.h:
+        * tao/Strategies/COIOP_Transport.cpp:
+        * tao/Strategies/COIOP_Transport.h:
+        * tao/Strategies/DIOP_Transport.cpp:
+        * tao/Strategies/DIOP_Transport.h:
+        * tao/Strategies/SHMIOP_Transport.cpp:
+        * tao/Strategies/SHMIOP_Transport.h:
+        * tao/Transport.cpp:
+        * tao/Transport.h:
+        * tao/Wait_On_Read.cpp:
+          Removed deprecated block argument from handle_input method.
+          Fixes bugzilla bug 2253
+
 Wed Aug  1 08:25:33 UTC 2007  Jeff Parsons <j.parsons@vanderbilt.edu>
 
         * tao/AnyTypeCode.mpc:
-        
+
           Added inheritance of gen_ostream feature, similar to tao.mpc
           and valuetype.mpc, so the ostream operator overloads in the
           library can be conditionally compiled, if the feature is
           toggled on in default.features.
-          
+
         * TAO_IDL/be/be_codegen.cpp:
-        
+
           Added generation of preprocessor definition of GEN_OSTREAM_OPS,
           if the -Gos option is used, so the ostream operators can be
           seen in included ORB headers.
-          
+
         * TAO_IDL/be/be_string.cpp:
-        
+
           Fixed incorrect ostream code generation for wstring members
           in IDL types that have member acceessors (union and valuetype),
           since these accessors return CORBA::WChar *, whereas the
           corresponding member type in an IDL struct is TAO_WString_Manager.
-          
+
           Thanks to Lothar Werzinger <lothar at tradescape dot biz> for
           reporting the compilation problems in generated code resulting
           from the above bugs.
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp
index 6c733ea1692..037be6b6d34 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp
@@ -438,8 +438,7 @@ TAO_UIPMC_Transport<CONNECTION_HANDLER>::recv (char *buf,
 template<typename CONNECTION_HANDLER>
 int
 TAO_UIPMC_Transport<CONNECTION_HANDLER>::handle_input (TAO_Resume_Handle &rh,
-                                                       ACE_Time_Value *max_wait_time,
-                                                       int /*block*/)
+                                                       ACE_Time_Value *max_wait_time)
 {
   // If there are no messages then we can go ahead to read from the
   // handle for further reading..
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.h
index 79755613df8..af6620c139c 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.h
@@ -53,8 +53,7 @@ public:
 
   /// Look for the documentation in Transport.h.
   virtual int handle_input (TAO_Resume_Handle &rh,
-                            ACE_Time_Value *max_wait_time = 0,
-                            int block = 0);
+                            ACE_Time_Value *max_wait_time = 0);
 protected:
   /** @name Overridden Template Methods
    *
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Transport.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Transport.cpp
index a46b6a56790..716031f3707 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Transport.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Transport.cpp
@@ -29,8 +29,7 @@ TAO::IIOP_SSL_Transport::~IIOP_SSL_Transport (void)
 
 int
 TAO::IIOP_SSL_Transport::handle_input (TAO_Resume_Handle &rh,
-                                       ACE_Time_Value *max_wait_time,
-                                       int block)
+                                       ACE_Time_Value *max_wait_time)
 {
   int result = 0;
 
@@ -42,7 +41,7 @@ TAO::IIOP_SSL_Transport::handle_input (TAO_Resume_Handle &rh,
   if (result != 0)
     return -1;
 
-  return this->TAO_IIOP_Transport::handle_input (rh, max_wait_time, block);
+  return this->TAO_IIOP_Transport::handle_input (rh, max_wait_time);
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Transport.h b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Transport.h
index de3b22b5f0c..73f709f8669 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Transport.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Transport.h
@@ -70,8 +70,7 @@ namespace TAO
      * details.
      */
     virtual int handle_input (TAO_Resume_Handle &rh,
-                              ACE_Time_Value *max_wait_time = 0,
-                              int block = 0);
+                              ACE_Time_Value *max_wait_time = 0);
 
   protected:
 
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp
index 7197382521b..53d72f81243 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp
@@ -60,8 +60,7 @@ TAO::SSLIOP::Transport::messaging_object (void)
 
 int
 TAO::SSLIOP::Transport::handle_input (TAO_Resume_Handle &rh,
-                                      ACE_Time_Value *max_wait_time,
-                                      int block)
+                                      ACE_Time_Value *max_wait_time)
 {
   int result = 0;
 
@@ -72,9 +71,7 @@ TAO::SSLIOP::Transport::handle_input (TAO_Resume_Handle &rh,
   if (result == -1)
     return -1;
 
-  return TAO_Transport::handle_input (rh,
-                                      max_wait_time,
-                                      block);
+  return TAO_Transport::handle_input (rh, max_wait_time);
 }
 
 ssize_t
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.h
index e2756675674..565b7b1819d 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.h
@@ -75,8 +75,7 @@ namespace TAO
       /// thread-per-connection and wait on RW strategies call this
       /// handle_input ().
       virtual int handle_input (TAO_Resume_Handle &rh,
-                                ACE_Time_Value *max_wait_time = 0,
-                                int block = 0);
+                                ACE_Time_Value *max_wait_time = 0);
 
     protected:
       /** @name Overridden Template Methods
diff --git a/TAO/tao/Strategies/COIOP_Transport.cpp b/TAO/tao/Strategies/COIOP_Transport.cpp
index 13d932a561a..43161fddf96 100644
--- a/TAO/tao/Strategies/COIOP_Transport.cpp
+++ b/TAO/tao/Strategies/COIOP_Transport.cpp
@@ -86,8 +86,7 @@ TAO_COIOP_Transport::recv (char *, size_t , const ACE_Time_Value *)
 
 int
 TAO_COIOP_Transport::handle_input (TAO_Resume_Handle &,
-                                  ACE_Time_Value *,
-                                  int /*block*/)
+                                  ACE_Time_Value *)
 {
   return 0;
 }
diff --git a/TAO/tao/Strategies/COIOP_Transport.h b/TAO/tao/Strategies/COIOP_Transport.h
index 126d58e8bd0..023bb6c42a9 100644
--- a/TAO/tao/Strategies/COIOP_Transport.h
+++ b/TAO/tao/Strategies/COIOP_Transport.h
@@ -60,8 +60,7 @@ public:
 
   /// Look for the documentation in Transport.h.
   virtual int handle_input (TAO_Resume_Handle &rh,
-                            ACE_Time_Value *max_wait_time = 0,
-                            int block = 0);
+                            ACE_Time_Value *max_wait_time = 0);
 protected:
   /** @name Overridden Template Methods
    *
diff --git a/TAO/tao/Strategies/DIOP_Transport.cpp b/TAO/tao/Strategies/DIOP_Transport.cpp
index 89c195b9dd8..451884b2926 100644
--- a/TAO/tao/Strategies/DIOP_Transport.cpp
+++ b/TAO/tao/Strategies/DIOP_Transport.cpp
@@ -143,8 +143,7 @@ TAO_DIOP_Transport::recv (char *buf,
 
 int
 TAO_DIOP_Transport::handle_input (TAO_Resume_Handle &rh,
-                                  ACE_Time_Value *max_wait_time,
-                                  int /*block*/)
+                                  ACE_Time_Value *max_wait_time)
 {
   // If there are no messages then we can go ahead to read from the
   // handle for further reading..
diff --git a/TAO/tao/Strategies/DIOP_Transport.h b/TAO/tao/Strategies/DIOP_Transport.h
index 6ce86699409..1e965f3f7f6 100644
--- a/TAO/tao/Strategies/DIOP_Transport.h
+++ b/TAO/tao/Strategies/DIOP_Transport.h
@@ -64,8 +64,7 @@ public:
 
   /// Look for the documentation in Transport.h.
   virtual int handle_input (TAO_Resume_Handle &rh,
-                            ACE_Time_Value *max_wait_time = 0,
-                            int block = 0);
+                            ACE_Time_Value *max_wait_time = 0);
 protected:
   /** @name Overridden Template Methods
    *
diff --git a/TAO/tao/Strategies/SHMIOP_Transport.cpp b/TAO/tao/Strategies/SHMIOP_Transport.cpp
index 4f14e900536..b9c295498fd 100644
--- a/TAO/tao/Strategies/SHMIOP_Transport.cpp
+++ b/TAO/tao/Strategies/SHMIOP_Transport.cpp
@@ -127,8 +127,7 @@ TAO_SHMIOP_Transport::recv (char *buf,
 
 int
 TAO_SHMIOP_Transport::handle_input (TAO_Resume_Handle &rh,
-                                    ACE_Time_Value *max_wait_time,
-                                    int)
+                                    ACE_Time_Value *max_wait_time)
 {
   if (TAO_debug_level > 3)
     {
diff --git a/TAO/tao/Strategies/SHMIOP_Transport.h b/TAO/tao/Strategies/SHMIOP_Transport.h
index 09203f4fe99..a79aa126173 100644
--- a/TAO/tao/Strategies/SHMIOP_Transport.h
+++ b/TAO/tao/Strategies/SHMIOP_Transport.h
@@ -84,8 +84,7 @@ protected:
                         const ACE_Time_Value *s = 0);
 
   virtual int handle_input (TAO_Resume_Handle &rh,
-                            ACE_Time_Value *max_wait_time,
-                            int block = 0);
+                            ACE_Time_Value *max_wait_time);
   //@}
 
 public:
diff --git a/TAO/tao/Transport.cpp b/TAO/tao/Transport.cpp
index 01d4fb50ca6..6e0d4ffdbcb 100644
--- a/TAO/tao/Transport.cpp
+++ b/TAO/tao/Transport.cpp
@@ -1438,8 +1438,7 @@ TAO_Transport::queue_message_i (const ACE_Message_Block *message_block,
  */
 int
 TAO_Transport::handle_input (TAO_Resume_Handle &rh,
-                             ACE_Time_Value * max_wait_time,
-                             int /* block */ /* deprecated parameter */ )
+                             ACE_Time_Value * max_wait_time)
 {
   if (TAO_debug_level > 3)
     {
diff --git a/TAO/tao/Transport.h b/TAO/tao/Transport.h
index 09701ba0556..b848018724c 100644
--- a/TAO/tao/Transport.h
+++ b/TAO/tao/Transport.h
@@ -590,13 +590,9 @@ public:
    * @param max_wait_time In some cases the I/O is synchronous, e.g. a
    * thread-per-connection server or when Wait_On_Read is enabled.  In
    * those cases a maximum read time can be specified.
-   *
-   * @param block Is deprecated and ignored.
-   *
    */
   virtual int handle_input (TAO_Resume_Handle &rh,
-                            ACE_Time_Value *max_wait_time = 0,
-                            int block = 0);
+                            ACE_Time_Value *max_wait_time = 0);
 
   enum
     {
diff --git a/TAO/tao/Wait_On_Read.cpp b/TAO/tao/Wait_On_Read.cpp
index 2de7e599ff3..b29e23aef19 100644
--- a/TAO/tao/Wait_On_Read.cpp
+++ b/TAO/tao/Wait_On_Read.cpp
@@ -52,10 +52,7 @@ TAO_Wait_On_Read::wait (ACE_Time_Value * max_wait_time,
   TAO_Resume_Handle rh;
   while (1)
     {
-      retval =
-        this->transport_->handle_input (rh,
-                                        max_wait_time,
-                                        1);
+      retval = this->transport_->handle_input (rh, max_wait_time);
 
       // If we got our reply, no need to run the loop any
       // further.