ChangeLogTag: Tue Jul 10 15:56:13 2001 Krishnakumar B <kitty@cs.wustl.edu>

6 files changed, 18 insertions, 6 deletions

diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index 2036c97b123..f83d7623369 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,13 @@
+Tue Jul 10 15:56:13 2001  Krishnakumar B  <kitty@cs.wustl.edu>
+
+	* tao/GIOP_Message_Lite.h:
+	* tao/GIOP_Message_Lite.cpp:
+	* tao/Pluggable_Messaging.h:
+	* tao/Pluggable_Messaging.cpp:
+
+	  Fixed warning about virtual function override. Was caught by the
+	  Tru64 compiler.
+
 Tue Jul 10 11:51:05 2001  Jeff Parsons <parsons@cs.wustl.edu>
 
         * TAO_IDL/be/be_visitor_interface/interface_ch.cpp:
@@ -6,7 +16,7 @@ Tue Jul 10 11:51:05 2001  Jeff Parsons <parsons@cs.wustl.edu>
           Changed code so that the inheritance list of a class
           declaration consists of fully scoped names. The stub
           generation was using ACE_NESTED_CLASS, and the skeleton
-          generation was using a computed relative name. Both 
+          generation was using a computed relative name. Both
           generated uncompilable code in some cases. Thanks to
           Richard L. Johnson <rich@huey.jpl.nasa.gov> for reporting
           this bug and for sending in the example IDL file.
diff --git a/TAO/tao/GIOP_Message_Base.cpp b/TAO/tao/GIOP_Message_Base.cpp
index 37879e9f507..28b43bec158 100644
--- a/TAO/tao/GIOP_Message_Base.cpp
+++ b/TAO/tao/GIOP_Message_Base.cpp
@@ -46,7 +46,7 @@ TAO_GIOP_Message_Base::init (CORBA::Octet major,
 
 
 void
-TAO_GIOP_Message_Base::reset (void)
+TAO_GIOP_Message_Base::reset (int /* reset_flag */)
 {
   // no-op
 }
diff --git a/TAO/tao/GIOP_Message_Base.h b/TAO/tao/GIOP_Message_Base.h
index c30113ec963..028deebdb5f 100644
--- a/TAO/tao/GIOP_Message_Base.h
+++ b/TAO/tao/GIOP_Message_Base.h
@@ -58,7 +58,7 @@ public:
                      CORBA::Octet minor);
 
   /// Reset the messaging the object
-  virtual void reset (void);
+  virtual void reset (int reset_flag = 1);
 
   /// Write the RequestHeader in to the <cdr> stream. The underlying
   /// implementation of the mesaging should do the right thing.
diff --git a/TAO/tao/GIOP_Message_Lite.cpp b/TAO/tao/GIOP_Message_Lite.cpp
index eff9e97cd7e..d89da3c9653 100644
--- a/TAO/tao/GIOP_Message_Lite.cpp
+++ b/TAO/tao/GIOP_Message_Lite.cpp
@@ -480,7 +480,8 @@ TAO_GIOP_Message_Lite::process_request_message (TAO_Transport *transport,
 
 int
 TAO_GIOP_Message_Lite::process_reply_message (
-    TAO_Pluggable_Reply_Params &params
+     TAO_Pluggable_Reply_Params &params,
+     TAO_Queued_Data * /* qd */
   )
 {
   // We know we have some reply message. Check whether it is a
diff --git a/TAO/tao/GIOP_Message_Lite.h b/TAO/tao/GIOP_Message_Lite.h
index 8287007ce80..6086a4b11f3 100644
--- a/TAO/tao/GIOP_Message_Lite.h
+++ b/TAO/tao/GIOP_Message_Lite.h
@@ -109,7 +109,8 @@ public:
   /// Parse the reply message that we received and return the reply
   /// information though <reply_info>
   virtual int process_reply_message (
-      TAO_Pluggable_Reply_Params &reply_info);
+      TAO_Pluggable_Reply_Params &reply_info,
+      TAO_Queued_Data *qd);
 
   /// Generate a reply message with the exception <ex>.
   virtual int generate_exception_reply (
diff --git a/TAO/tao/Pluggable_Messaging.h b/TAO/tao/Pluggable_Messaging.h
index 15be5628acf..db21cc55df8 100644
--- a/TAO/tao/Pluggable_Messaging.h
+++ b/TAO/tao/Pluggable_Messaging.h
@@ -158,7 +158,7 @@ public:
   virtual int is_ready_for_bidirectional (void) = 0;
 
   /// Reset the messaging the object
-  virtual void reset (void) = 0;
+  virtual void reset (int reset_flag = 1) = 0;
 };
 
 #if defined (__ACE_INLINE__)