ChangeLogTag:Wed Mar 15 23:56:37 2000 Nanbor Wang <nanbor@cs.wustl.edu>

3 files changed, 43 insertions, 39 deletions

diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index 71741c603bc..826ef56d66e 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,11 +1,18 @@
+Wed Mar 15 23:56:37 2000  Nanbor Wang  <nanbor@cs.wustl.edu>
+
+	* tao/IIOP_Transport.cpp:
+	* tao/UIOP_Transport.cpp: Fixed some minor warnings on NT.  The
+	  string "*/*" confused NT.  BTW, UIOP is not compiled under NT.
+	  ;-)
+
 Wed Mar 15 22:02:22 2000  Balachandran Natarajan  <bala@cs.wustl.edu>
 
 	* performance-tests/Cubit/TAO/IDL_Cubit/iiop_lite.conf:
 	* performance-tests/Cubit/TAO/IDL_Cubit/uiop_lite.conf: Added
-	  these new service configurator files. 
-	
+	  these new service configurator files.
+
 	* performance-tests/Cubit/TAO/IDL_Cubit/run_test.pl: Changed the
-	  script for using GIOPlite. 
+	  script for using GIOPlite.
 
 Wed Mar 15 21:50:42 2000  Balachandran Natarajan  <bala@cs.wustl.edu>
 
@@ -36,7 +43,7 @@ Wed Mar 15 20:26:13 2000  Balachandran Natarajan  <bala@cs.wustl.edu>
 	* examples/POA/On_Demand_Loading/Makefile
 	* examples/POA/Reference_Counted_Servant/Makefile
 	* examples/POA/RootPOA/Makefile
-	* examples/POA/TIE/Makefile: 
+	* examples/POA/TIE/Makefile:
 
 
 Wed Mar 15 19:49:35 2000  Balachandran Natarajan  <bala@cs.wustl.edu>
@@ -121,12 +128,12 @@ Wed Mar 15 19:10:55 2000  Balachandran Natarajan  <bala@cs.wustl.edu>
 	* tao/Acceptor_Impl.h (TAO_ACCEPTOR_IMPL_H)
 	* tao/Acceptor_Impl.i:
 	* tao/Acceptor_Impl.cpp:Added an argument to the constructor of
-	  TAO_Creation_Strategy. 
+	  TAO_Creation_Strategy.
 
 Wed Mar 15 19:05:53 2000  Balachandran Natarajan  <bala@cs.wustl.edu>
 
 	* tao/Protocol_Factory.h
-       	* tao/Transport_Mux_Strategy.h: 
+       	* tao/Transport_Mux_Strategy.h:
 	* tao/ORB.cpp
        	* tao/ORB.h
 	* tao/skip.cpp
@@ -140,10 +147,10 @@ Wed Mar 15 19:05:53 2000  Balachandran Natarajan  <bala@cs.wustl.edu>
 	* tao/corba.h
 	* tao/Server_Request.h
 	* tao/Typecode_Constants.cpp: Removed the header file GIOP.h from
-	  these files. GIOP.h would be retired now. 
+	  these files. GIOP.h would be retired now.
 
 Wed Mar 15 18:22:52 2000  Balachandran Natarajan  <bala@cs.wustl.edu>
-	
+
 	* tao/GIOPC.cpp
 	* tao/GIOPC.i
 	* tao/GIOPC.h: Removed some generated code for
@@ -172,7 +179,7 @@ Wed Mar 15 18:22:52 2000  Balachandran Natarajan  <bala@cs.wustl.edu>
 	* tao/IIOP_Transport.cpp
 	* tao/IIOP_Transport.h
 	* tao/Invocation.cpp
-	* tao/Invocation.h	
+	* tao/Invocation.h
 	* tao/Invocation.i
 	* tao/Async_Invocation.cpp
 	* tao/SHMIOP_Acceptor.cpp
@@ -221,15 +228,15 @@ Wed Mar 15 18:22:52 2000  Balachandran Natarajan  <bala@cs.wustl.edu>
 	  initialised now with either IIOP or IIOP_Lite and not both. In
 	  other words, the user shouldn't try to load TCP/IP mapping of
 	  GIOP & GIOPlite for the same ORB. The same applies to the UNIX
-	  domain sockets mapping of GIOP & GIOPlite. 
+	  domain sockets mapping of GIOP & GIOPlite.
 
-	* tao/Reply_Dispatcher.h		
+	* tao/Reply_Dispatcher.h
 	* tao/Reply_Dispatcher.i
 	* tao/Reply_Dispatcher.cpp: Removed GIOP_Version info.  theyhave
 	  just been commented out. At a later stage we should be removing
 	  them. We shouldn't be doing any GIOP version specific processing
 	  in this piece of code.
-	
+
 Wed Mar 15 17:34:47 2000  Balachandran Natarajan  <bala@cs.wustl.edu>
 
 	* tao/Pluggable_Messaging.cpp
diff --git a/TAO/tao/IIOP_Transport.cpp b/TAO/tao/IIOP_Transport.cpp
index 949ae2937ac..186e1af7b5b 100644
--- a/TAO/tao/IIOP_Transport.cpp
+++ b/TAO/tao/IIOP_Transport.cpp
@@ -150,7 +150,7 @@ TAO_IIOP_Client_Transport::client_handler (void)
 }
 
 void
-TAO_IIOP_Client_Transport::start_request (TAO_ORB_Core */*orb_core*/,
+TAO_IIOP_Client_Transport::start_request (TAO_ORB_Core * /*orb_core*/,
                                           TAO_Target_Specification & /*spec */,
                                           TAO_OutputCDR &output,
                                           CORBA::Environment &ACE_TRY_ENV)
@@ -168,13 +168,13 @@ TAO_IIOP_Client_Transport::start_request (TAO_ORB_Core */*orb_core*/,
                                output,
                                orb_core) == 0)*/
   if (this->client_mesg_factory_->write_protocol_header
-      (TAO_PLUGGABLE_MESSAGE_REQUEST, 
+      (TAO_PLUGGABLE_MESSAGE_REQUEST,
        output) == 0)
     ACE_THROW (CORBA::MARSHAL ());
 }
 
 void
-TAO_IIOP_Client_Transport::start_locate (TAO_ORB_Core */*orb_core*/,
+TAO_IIOP_Client_Transport::start_locate (TAO_ORB_Core * /*orb_core*/,
                                          TAO_Target_Specification &spec,
                                          TAO_Operation_Details &opdetails,
                                          TAO_OutputCDR &output,
@@ -182,14 +182,14 @@ TAO_IIOP_Client_Transport::start_locate (TAO_ORB_Core */*orb_core*/,
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // See this is GIOP way of doing this..But anyway IIOP will be tied
-  // up with GIOP. 
+  // up with GIOP.
   if (this->client_mesg_factory_->write_protocol_header
-      (TAO_PLUGGABLE_MESSAGE_LOCATEREQUEST, 
+      (TAO_PLUGGABLE_MESSAGE_LOCATEREQUEST,
        output) == 0)
     ACE_THROW (CORBA::MARSHAL ());
-  
+
   if (this->client_mesg_factory_->write_message_header (opdetails,
-                                                        TAO_PLUGGABLE_MESSAGE_LOCATE_REQUEST_HEADER,   
+                                                        TAO_PLUGGABLE_MESSAGE_LOCATE_REQUEST_HEADER,
                                                         spec,
                                                         output) == 0)
     ACE_THROW (CORBA::MARSHAL ());
@@ -316,7 +316,7 @@ TAO_IIOP_Client_Transport::register_handler (void)
 }
 
 int
-TAO_IIOP_Client_Transport::messaging_init (CORBA::Octet major, 
+TAO_IIOP_Client_Transport::messaging_init (CORBA::Octet major,
                                            CORBA::Octet minor)
 {
   if (this->client_mesg_factory_ == 0)
@@ -357,12 +357,12 @@ TAO_IIOP_Client_Transport::messaging_init (CORBA::Octet major,
           if (TAO_debug_level > 0)
             {
               ACE_ERROR_RETURN ((LM_ERROR,
-                                 ASYS_TEXT ("(%N|%l|%p|%t) No matching major version number \n")), 
+                                 ASYS_TEXT ("(%N|%l|%p|%t) No matching major version number \n")),
                                 0);
             }
         }
     }
-  
+
   return 1;
 }
 
@@ -373,12 +373,12 @@ TAO_IIOP_Client_Transport::send_request_header (TAO_Operation_Details &opdetails
 {
   // We are going to pass on this request to the underlying messaging
   // layer. It should take care of this request
-    CORBA::Boolean retval = 
+    CORBA::Boolean retval =
       this->client_mesg_factory_->write_message_header (opdetails,
-                                                        TAO_PLUGGABLE_MESSAGE_REQUEST_HEADER,  
+                                                        TAO_PLUGGABLE_MESSAGE_REQUEST_HEADER,
                                                         spec,
                                                         msg);
-  
+
   return retval;
 }
 
@@ -454,7 +454,7 @@ TAO_IIOP_Transport::send_request (TAO_Stub *,
 }
 
 
-                                         
+
 CORBA::Boolean
 TAO_IIOP_Transport::send_request_header (TAO_Operation_Details & /**/,
                                          TAO_Target_Specification & /*spec */ ,
@@ -463,4 +463,3 @@ TAO_IIOP_Transport::send_request_header (TAO_Operation_Details & /**/,
   // We should never be here. So return an error.
   return 0;
 }
-
diff --git a/TAO/tao/UIOP_Transport.cpp b/TAO/tao/UIOP_Transport.cpp
index 8137513472f..5dd43f1a86c 100644
--- a/TAO/tao/UIOP_Transport.cpp
+++ b/TAO/tao/UIOP_Transport.cpp
@@ -152,7 +152,7 @@ TAO_UIOP_Client_Transport::client_handler (void)
 }
 
 void
-TAO_UIOP_Client_Transport::start_request (TAO_ORB_Core */*orb_core*/,
+TAO_UIOP_Client_Transport::start_request (TAO_ORB_Core * /*orb_core*/,
                                           TAO_Target_Specification & /*spec*/,
                                           TAO_OutputCDR &output,
                                           CORBA::Environment &ACE_TRY_ENV)
@@ -166,7 +166,7 @@ TAO_UIOP_Client_Transport::start_request (TAO_ORB_Core */*orb_core*/,
   // @@ This should be implemented in the transport object, which
   //    would query the profile to obtain the version...
   if (this->client_mesg_factory_->write_protocol_header
-      (TAO_PLUGGABLE_MESSAGE_REQUEST, 
+      (TAO_PLUGGABLE_MESSAGE_REQUEST,
        output) == 0)
     ACE_THROW (CORBA::MARSHAL ());
 }
@@ -188,7 +188,7 @@ TAO_UIOP_Client_Transport::start_locate (TAO_ORB_Core * /*orb_core*/,
   // @@ This should be implemented in the transport object, which
   //    would query the profile to obtain the version...
   if (this->client_mesg_factory_->write_protocol_header
-      (TAO_PLUGGABLE_MESSAGE_LOCATEREQUEST, 
+      (TAO_PLUGGABLE_MESSAGE_LOCATEREQUEST,
        output) == 0)
     ACE_THROW (CORBA::MARSHAL ());
 
@@ -323,9 +323,9 @@ TAO_UIOP_Client_Transport::register_handler (void)
 
 int
 TAO_UIOP_Client_Transport::
-  messaging_init (CORBA::Octet major, 
-                  CORBA::Octet minor) 
-{  
+  messaging_init (CORBA::Octet major,
+                  CORBA::Octet minor)
+{
   if (this->client_mesg_factory_ == 0)
     {
       if (this->lite_flag_)
@@ -364,15 +364,15 @@ TAO_UIOP_Client_Transport::
           if (TAO_debug_level > 0)
             {
               ACE_ERROR_RETURN ((LM_ERROR,
-                                 ASYS_TEXT ("(%N|%l|%p|%t) No matching major version number \n")), 
+                                 ASYS_TEXT ("(%N|%l|%p|%t) No matching major version number \n")),
                                 0);
             }
         }
     }
-  
+
   return 1;
 }
- 
+
 
 CORBA::Boolean
 TAO_UIOP_Client_Transport::send_request_header (TAO_Operation_Details &opdetails,
@@ -381,7 +381,7 @@ TAO_UIOP_Client_Transport::send_request_header (TAO_Operation_Details &opdetails
 {
   // We are going to pass on this request to the underlying messaging
   // layer. It should take care of this request
-  CORBA::Boolean retval = 
+  CORBA::Boolean retval =
     this->client_mesg_factory_->write_message_header (opdetails,
                                                       TAO_PLUGGABLE_MESSAGE_REQUEST_HEADER,
                                                       spec,
@@ -469,5 +469,3 @@ TAO_UIOP_Transport::send_request_header (TAO_Operation_Details & /*opdetails*/,
 }
 
 #endif  /* TAO_HAS_UIOP */
-
-