ChangeLogTag: Sun Mar 4 21:39:03 2001 Frank Hunleth <fhunleth@cs.wustl.edu>

4 files changed, 25 insertions, 12 deletions

diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index 10bf6aded16..1b485a5cf46 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,13 @@
+Sun Mar  4 21:39:03 2001  Frank Hunleth  <fhunleth@cs.wustl.edu>
+
+	* tao/corbafwd.h:
+	  Commented in TAO_TAG_UDP_PROFILE now that DIOP is being
+	  built regularly.
+
+	* examples/PluggableUDP/DIOP/DIOP_Connector.cpp:
+	* examples/PluggableUDP/DIOP/DIOP_Transport.cpp:
+	  Fixed compile warnings under Linux.
+
 Sun Mar  4 19:12:59 2001  Darrell Brunsch <brunsch@uci.edu>
 
         * examples/Callback_Quoter/Consumer.dsp:
diff --git a/TAO/examples/PluggableUDP/DIOP/DIOP_Connector.cpp b/TAO/examples/PluggableUDP/DIOP/DIOP_Connector.cpp
index 93f2f50ee4e..654bafc9b52 100644
--- a/TAO/examples/PluggableUDP/DIOP/DIOP_Connector.cpp
+++ b/TAO/examples/PluggableUDP/DIOP/DIOP_Connector.cpp
@@ -77,8 +77,11 @@ TAO_DIOP_Connector::close (void)
 
   while (!iter.done ())
     {
+      // @@ Frank
+      /*
       TAO_DIOP_Connection_Handler *svc_handler = (*iter).int_id_;
-// @@ Frank      svc_handler->decrement ();
+      svc_handler->decrement ();
+      */
 
       // Delete the addr
       delete (*iter).ext_id_;
@@ -98,7 +101,7 @@ TAO_DIOP_Connector::close (void)
 int
 TAO_DIOP_Connector::connect (TAO_Connection_Descriptor_Interface *desc,
                              TAO_Transport *&transport,
-                             ACE_Time_Value *max_wait_time,
+                             ACE_Time_Value */*max_wait_time*/,
                              CORBA::Environment &)
 {
   TAO_Endpoint *endpoint = desc->endpoint ();
@@ -132,9 +135,9 @@ TAO_DIOP_Connector::connect (TAO_Connection_Descriptor_Interface *desc,
       return -1;
     }
 
-  int result = 0;
+  // @@ Frank: int result = 0;
   TAO_DIOP_Connection_Handler *svc_handler = 0;
-  TAO_Connection_Handler *conn_handler = 0;
+  // @@ Frank:   TAO_Connection_Handler *conn_handler = 0;
 
   // @@ Michael -- UDP Additions ----------------------------
 
diff --git a/TAO/examples/PluggableUDP/DIOP/DIOP_Transport.cpp b/TAO/examples/PluggableUDP/DIOP/DIOP_Transport.cpp
index 7496442a5a0..7ee87a3432b 100644
--- a/TAO/examples/PluggableUDP/DIOP/DIOP_Transport.cpp
+++ b/TAO/examples/PluggableUDP/DIOP/DIOP_Transport.cpp
@@ -91,7 +91,7 @@ TAO_DIOP_Transport::idle (void)
 
 ssize_t
 TAO_DIOP_Transport::send (const ACE_Message_Block *message_block,
-                          const ACE_Time_Value *max_wait_time,
+                          const ACE_Time_Value */*max_wait_time*/,
                           size_t *bt)
 {
   const ACE_INET_Addr &addr = this->connection_handler_->addr ();
@@ -129,10 +129,10 @@ TAO_DIOP_Transport::send (const ACE_Message_Block *message_block,
               // as 16.
               if (iovcnt == IOV_MAX)
                 {
-                  size_t current_transfer =
+                  ssize_t current_transfer =
                     this->connection_handler_->dgram ().send (iov,
-                                                   iovcnt,
-                                                   addr);
+                                                              iovcnt,
+                                                              addr);
                   // Errors.
                   if (current_transfer == -1 || current_transfer == 0)
                     return current_transfer;
@@ -157,7 +157,7 @@ TAO_DIOP_Transport::send (const ACE_Message_Block *message_block,
   // IOV_MAX is not a multiple of the number of message blocks.
   if (iovcnt != 0)
     {
-      size_t current_transfer =
+      ssize_t current_transfer =
         this->connection_handler_->dgram ().send (iov,
                                        iovcnt,
                                        addr);
@@ -182,7 +182,7 @@ TAO_DIOP_Transport::send (const ACE_Message_Block *message_block,
 ssize_t
 TAO_DIOP_Transport::recv (char *buf,
                           size_t len,
-                          const ACE_Time_Value *max_wait_time)
+                          const ACE_Time_Value */*max_wait_time*/)
 {
   ACE_INET_Addr from_addr;
 
diff --git a/TAO/tao/corbafwd.h b/TAO/tao/corbafwd.h
index 4a4396bbc57..e03cc72e78f 100644
--- a/TAO/tao/corbafwd.h
+++ b/TAO/tao/corbafwd.h
@@ -1030,7 +1030,7 @@ TAO_NAMESPACE_CLOSE  // end of class (namespace) CORBA
 // #define TAO_TAG_AIOP_PROFILE   0x54414f01U /* ATM/AAL5 */
 #define TAO_TAG_SHMEM_PROFILE  0x54414f02U /* Shared memory */
 // #define TAO_TAG_MSGQ_PROFILE   0x54414f03U /* Message Queue */
-// #define TAO_TAG_UDP_PROFILE    0x54414f04U /* UDP */
+#define TAO_TAG_UDP_PROFILE    0x54414f04U /* UDP */
 // #define TAO_TAG_MCAST_PROFILE  0x54414f05U /* IP/Multicast */
 // #define TAO_TAG_CPCI_PROFILE   0x54414f06U /* Compact/PCI */
 // #define TAO_TAG_VME_PROFILE    0x54414f07U /* VME Bus */
@@ -1038,7 +1038,7 @@ TAO_NAMESPACE_CLOSE  // end of class (namespace) CORBA
 // #define TAO_TAG_HTTPNG_PROFILE 0x54414f09U /* HTTP-NG */
 // #define TAO_TAG_PIPE_PROFILE   0x54414f0AU /* Pipe */
 // #define TAO_TAG_XXXX_PROFILE   0x54414f0BU /* ???? */
-#define TAO_TAG_BIOP_PROFILE   0x54414f0FU /* Boeign Custom Protocol */
+#define TAO_TAG_BIOP_PROFILE   0x54414f0FU /* Boeing Custom Protocol */
 
 // We reserved the range 0x54414f00 - 0x54414f0f with the OMG to
 // define our own profile tagged components in TAO.