From 0f470505f090112fa88fa3c8cf7408dfc9a64310 Mon Sep 17 00:00:00 2001
From: schmidt <douglascraigschmidt@users.noreply.github.com>
Date: Sun, 18 Mar 2001 14:16:42 +0000
Subject: ChangeLogTag:Sat Mar 17 18:02:28 2001  Steve Huston 
 <shuston@riverace.com>

---
 TAO/ChangeLogs/ChangeLog-02a                     |  7 +++++++
 TAO/examples/PluggableUDP/tests/UDP_Client_i.cpp |  2 +-
 TAO/examples/PluggableUDP/tests/client.cpp       | 18 ++++++++----------
 TAO/examples/PluggableUDP/tests/server.cpp       | 15 ++++-----------
 THANKS                                           |  1 +
 5 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index a8bc03406e4..0a22eada0cc 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,10 @@
+Sat Mar 17 19:36:02 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
+
+	* examples/PluggableUDP/tests/{client,server}.cpp: Changed "true" to 1 
+	  and "false" to 0 to work on compiler platforms that don't
+ 	  support bool.  Thanks to Craig Rodrigues for suggesting this
+ 	  fix.
+
 Sun Mar 18 02:43:41 2001  Ossama Othman  <ossama@uci.edu>
 
 	* orbsvcs/orbsvcs/Security.dsp:
diff --git a/TAO/examples/PluggableUDP/tests/UDP_Client_i.cpp b/TAO/examples/PluggableUDP/tests/UDP_Client_i.cpp
index faabc2cf14e..844ff0a2d24 100644
--- a/TAO/examples/PluggableUDP/tests/UDP_Client_i.cpp
+++ b/TAO/examples/PluggableUDP/tests/UDP_Client_i.cpp
@@ -26,7 +26,7 @@ UDP_Client_i::~UDP_Client_i (void)
 }
 
 int
-UDP_Client_i::svc ()
+UDP_Client_i::svc (void)
 {
   ACE_CString client_name ("UDP");
 
diff --git a/TAO/examples/PluggableUDP/tests/client.cpp b/TAO/examples/PluggableUDP/tests/client.cpp
index 104f0919c25..3c7428694b2 100644
--- a/TAO/examples/PluggableUDP/tests/client.cpp
+++ b/TAO/examples/PluggableUDP/tests/client.cpp
@@ -88,12 +88,10 @@ main (int argc, char *argv[])
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (udp_var.in ()))
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "Object reference <%s> is nil\n",
-                             ior),
-                            1);
-        }
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "Object reference <%s> is nil\n",
+                           ior),
+                          1);
 
       // Activate POA to handle the call back.
 
@@ -128,7 +126,7 @@ main (int argc, char *argv[])
       ACE_TRY_CHECK;
 
       // Instantiate client
-      UDP_Client_i* client = new UDP_Client_i (orb.in (),
+      UDP_Client_i *client = new UDP_Client_i (orb.in (),
                                                udp_var.in (),
                                                udpHandler_var.in (),
                                                msec,
@@ -144,9 +142,9 @@ main (int argc, char *argv[])
 
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
 
-      root_poa->destroy (true,  // ethernalize objects
- 					               false, // wait for completion
-						             ACE_TRY_ENV);
+      root_poa->destroy (1,  // ethernalize objects
+                         0, // wait for completion
+                         ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
       orb->destroy (ACE_TRY_ENV);
diff --git a/TAO/examples/PluggableUDP/tests/server.cpp b/TAO/examples/PluggableUDP/tests/server.cpp
index d27b657b4db..be921b617b6 100644
--- a/TAO/examples/PluggableUDP/tests/server.cpp
+++ b/TAO/examples/PluggableUDP/tests/server.cpp
@@ -80,7 +80,6 @@ main (int argc, char *argv[])
 
       // Install a persistent POA in order to achieve a persistent IOR
       // for our object.
-      //*
       CORBA::PolicyList policies;
       policies.length (2);
       policies[0] =
@@ -106,7 +105,6 @@ main (int argc, char *argv[])
       policies[1]->destroy (ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
-      //*/
       if (parse_args (argc, argv) != 0)
         return 1;
 
@@ -114,7 +112,6 @@ main (int argc, char *argv[])
 
       udp_i.orb (orb.in ());
 
-      //*
       PortableServer::ObjectId_var id =
         PortableServer::string_to_ObjectId ("UDP_Object");
 
@@ -131,8 +128,7 @@ main (int argc, char *argv[])
 
       UDP_var udp_var = UDP::_narrow (obj.in (), ACE_TRY_ENV);
 
-      //*/
-      //UDP_var udp_var = udp_i._this (ACE_TRY_ENV);
+      // UDP_var udp_var = udp_i._this (ACE_TRY_ENV);
       ACE_TRY_CHECK;
       if (CORBA::is_nil (udp_var.in ()))
         ACE_DEBUG ((LM_DEBUG,
@@ -160,7 +156,6 @@ main (int argc, char *argv[])
       poa_manager->activate (ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
-
       /*
       // Instantiate reply handler
       UDP_i udpHandler_i;
@@ -178,17 +173,15 @@ main (int argc, char *argv[])
 
       client->activate ();
       */
-
       
       orb->run (ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
-      
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
 
-      root_poa->destroy (true,  // ethernalize objects
- 					               false, // wait for completion
-						             ACE_TRY_ENV);
+      root_poa->destroy (1,  // ethernalize objects
+                         0, // wait for completion
+                         ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
       orb->destroy (ACE_TRY_ENV);
diff --git a/THANKS b/THANKS
index b9534a0b017..79b93f234b9 100644
--- a/THANKS
+++ b/THANKS
@@ -9,6 +9,7 @@ Shawn Atkins <sma1@cs.wustl.edu>
 Matt Braun <mjb2@cs.wustl.edu>
 Darrell Brunsch <brunsch@cs.wustl.edu>
 Chris Cleeland <chris@cs.wustl.edu>
+Mayur Deshpande <mayur@ics.uci.edu>
 Eric Ding <qnd1@cs.wustl.edu>
 Sergio Flores-Gaitan <sergio@cs.wustl.edu>
 Chris Gill <cdgill@cs.wustl.edu>
-- 
cgit v1.2.1