ChangeLogTag: Fri Jun 1 17:22:29 2001 Balachandran Natarajan <bala@cs.wustl.edu>

6 files changed, 21 insertions, 12 deletions

diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index 13152774342..f68a37ff99a 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,11 @@
+Fri Jun  1 17:22:29 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
+
+	* tao/GIOP_Message_State.cpp (parse_message_header_i): 
+	* tao/Connection_Handler.cpp:
+	* tao/GIOP_Message_Base.cpp:
+	* tao/Makefile:
+	* tao/Transport.cpp: Fixed warnings and errors in Linux g++.
+
 Thu Jun 01 13:39:02 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
 
 	* tao/Transport.cpp:
diff --git a/TAO/tao/Connection_Handler.cpp b/TAO/tao/Connection_Handler.cpp
index f7af754b2fd..3eec9573528 100644
--- a/TAO/tao/Connection_Handler.cpp
+++ b/TAO/tao/Connection_Handler.cpp
@@ -93,7 +93,8 @@ TAO_Connection_Handler::svc_i (void)
          && result >= 0)
     {
       result =
-        this->transport_->handle_input_i (max_wait_time);
+        this->transport_->handle_input_i (ACE_INVALID_HANDLE,
+                                          max_wait_time);
 
       if (result == -1 && errno == ETIME)
         {
diff --git a/TAO/tao/GIOP_Message_Base.cpp b/TAO/tao/GIOP_Message_Base.cpp
index 36674f019f9..c7c515d2340 100644
--- a/TAO/tao/GIOP_Message_Base.cpp
+++ b/TAO/tao/GIOP_Message_Base.cpp
@@ -18,7 +18,7 @@
 ACE_RCSID (tao, GIOP_Message_Base, "$Id$")
 
 TAO_GIOP_Message_Base::TAO_GIOP_Message_Base (TAO_ORB_Core *orb_core,
-                                              size_t input_cdr_size)
+                                              size_t /*input_cdr_size*/)
   : message_state_ (orb_core,
                     this),
     output_ (0),
@@ -59,7 +59,7 @@ TAO_GIOP_Message_Base::init (CORBA::Octet major,
 
 
 void
-TAO_GIOP_Message_Base::reset (int reset_flag)
+TAO_GIOP_Message_Base::reset (int /*reset_flag*/)
 {
   // Reset the message state
   //  this->message_handler_.reset (reset_flag);
@@ -181,7 +181,7 @@ TAO_GIOP_Message_Base::generate_reply_header (
 
 
 int
-TAO_GIOP_Message_Base::read_message (TAO_Transport *transport,
+TAO_GIOP_Message_Base::read_message (TAO_Transport * /*transport*/,
                                      int /*block */,
                                      ACE_Time_Value * /*max_wait_time*/)
 {
@@ -436,7 +436,7 @@ TAO_GIOP_Message_Base::process_reply_message (
   char *ptr = incoming.rd_ptr ();
 
   this->dump_msg ("recv",
-                  ACE_reinterpret_cast (u_char *, data),
+                  ACE_reinterpret_cast (u_char *, ptr),
                   incoming.length ());
   // Create a input CDR stream.
   // NOTE: We use the same data block in which we read the message and
diff --git a/TAO/tao/GIOP_Message_State.cpp b/TAO/tao/GIOP_Message_State.cpp
index 55c3287fb17..1ed31854cf5 100644
--- a/TAO/tao/GIOP_Message_State.cpp
+++ b/TAO/tao/GIOP_Message_State.cpp
@@ -80,8 +80,9 @@ TAO_GIOP_Message_State::parse_message_header_i (ACE_Message_Block &incoming)
   if (this->more_fragments_)
     {
       // Parse the
-      int retval = this->parse_fragment_header (buf,
-                                                incoming.length ());
+      /*int retval = */
+      this->parse_fragment_header (buf,
+                                   incoming.length ());
     }
 
   // The GIOP header has been parsed. Set the status to wait for
diff --git a/TAO/tao/Makefile b/TAO/tao/Makefile
index 836e4558cf4..c620f7887d7 100644
--- a/TAO/tao/Makefile
+++ b/TAO/tao/Makefile
@@ -104,8 +104,6 @@ PLUGGABLE_MESSAGING_FILES = \
   Pluggable_Messaging \
   Pluggable_Messaging_Utils \
   GIOP_Message_Base \
-  GIOP_Message_Lite \
-  GIOP_Message_Reactive_Handler \
   GIOP_Message_Generator_Parser \
   GIOP_Message_Generator_Parser_10 \
   GIOP_Message_Generator_Parser_11 \
diff --git a/TAO/tao/Transport.cpp b/TAO/tao/Transport.cpp
index d988290408a..00d70c8151c 100644
--- a/TAO/tao/Transport.cpp
+++ b/TAO/tao/Transport.cpp
@@ -782,8 +782,8 @@ TAO_Transport::generate_request_header (
 
 int
 TAO_Transport::handle_input_i (ACE_HANDLE h,
-                               ACE_Time_Value *max_wait_time,
-                               int block)
+                               ACE_Time_Value * max_wait_time,
+                               int /*block*/)
 {
   // The buffer on the stack which will be used to hold the input
   // messages
@@ -806,7 +806,8 @@ TAO_Transport::handle_input_i (ACE_HANDLE h,
   // the stack.
   ssize_t n =
     this->recv (message_block.rd_ptr (),
-                message_block.space ());
+                message_block.space (),
+                max_wait_time);
 
   // Now the message has been read
   if (n == -1 && TAO_debug_level > 0)