Wed May 30 03:17:16 UTC 2007 Abdullah Sowayan <abdullah.sowayan@lmco.com>

4 files changed, 16 insertions, 10 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 7b575d73a37..9025e46058e 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,15 @@
+Wed May 30 03:17:16 UTC 2007  Abdullah Sowayan  <abdullah.sowayan@lmco.com>
+
+        * orbsvcs/tests/Event/Mcast/AddrServer/Client.cpp:
+
+          Added missing "ace/OS_NS_strings.h" include and used
+          ACE_OS::strcasecmp instead of raw strcasecmp call.
+
+        * orbsvcs/tests/Event/Mcast/AddrServer/TestAddrServer.h:
+        * orbsvcs/tests/Event/Mcast/AddrServer/TestAddrServer.cpp:
+
+          Fixed fuzz error, ACE_THROW_SEPC is deprecated now.
+
 Wed May 30 02:05:51 UTC 2007  Phil Mesnier  <mesnier_p@ociweb.com>
 
         * orbsvcs/tests/EC_MT_Mcast/AddrServer.h:
diff --git a/TAO/orbsvcs/tests/Event/Mcast/AddrServer/Client.cpp b/TAO/orbsvcs/tests/Event/Mcast/AddrServer/Client.cpp
index aab7bee8b44..1b1bc8ad9b2 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/AddrServer/Client.cpp
+++ b/TAO/orbsvcs/tests/Event/Mcast/AddrServer/Client.cpp
@@ -3,6 +3,7 @@
 #include "ace/INET_Addr.h"
 #include "orbsvcs/RtecUDPAdminC.h"
 #include "orbsvcs/RtecEventCommC.h"
+#include "ace/OS_NS_strings.h"
 
 ACE_RCSID(Hello, client, "$Id$")
 
@@ -18,7 +19,7 @@ main (int argc, char *argv[])
 
       for (int i = 1; i < argc; i++)
         {
-          if (strcasecmp(argv[i], "-k") == 0)
+          if (ACE_OS::strcasecmp(argv[i], "-k") == 0)
             {
               if (argv[i+1] != 0)
                 ior = argv[++i];
diff --git a/TAO/orbsvcs/tests/Event/Mcast/AddrServer/TestAddrServer.cpp b/TAO/orbsvcs/tests/Event/Mcast/AddrServer/TestAddrServer.cpp
index ba282de4cb2..b766b206c42 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/AddrServer/TestAddrServer.cpp
+++ b/TAO/orbsvcs/tests/Event/Mcast/AddrServer/TestAddrServer.cpp
@@ -19,13 +19,11 @@ TestAddrServer_i::TestAddrServer_i (const ACE_INET_Addr& addr,
   addr6_.addr_to_string (abuf,256);
 
   ACE_DEBUG ((LM_DEBUG,"Test Addr (v6) = %s\n",abuf));
-
 }
 
 void
 TestAddrServer_i::get_addr (const RtecEventComm::EventHeader& h,
                                RtecUDPAdmin::UDP_Addr& address)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_INET_Addr &addr = (h.type == 0) ? this->addr_ : this->addr6_;
 
@@ -41,7 +39,6 @@ TestAddrServer_i::get_addr (const RtecEventComm::EventHeader& h,
 void
 TestAddrServer_i::get_address (const RtecEventComm::EventHeader& h,
                                RtecUDPAdmin::UDP_Address_out outaddr)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_INET_Addr &addr = (h.type == 0) ? this->addr_ : this->addr6_;
   char abuf[256];
@@ -65,5 +62,4 @@ TestAddrServer_i::get_address (const RtecEventComm::EventHeader& h,
   v4.ipaddr = addr.get_ip_address ();
   v4.port = addr.get_port_number ();
   outaddr.v4_addr (v4);
-
 }
diff --git a/TAO/orbsvcs/tests/Event/Mcast/AddrServer/TestAddrServer.h b/TAO/orbsvcs/tests/Event/Mcast/AddrServer/TestAddrServer.h
index 61132ef7f5f..1f87fb38a7b 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/AddrServer/TestAddrServer.h
+++ b/TAO/orbsvcs/tests/Event/Mcast/AddrServer/TestAddrServer.h
@@ -14,17 +14,14 @@ public:
                     const ACE_INET_Addr& addr6);
 
   virtual void get_addr (const RtecEventComm::EventHeader& header,
-                         RtecUDPAdmin::UDP_Addr& address)
-  ACE_THROW_SPEC ((CORBA::SystemException));
+                         RtecUDPAdmin::UDP_Addr& address);
 
   virtual void get_address (const RtecEventComm::EventHeader& header,
-                               RtecUDPAdmin::UDP_Address_out addr6)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+                               RtecUDPAdmin::UDP_Address_out addr6);
 
 private:
   ACE_INET_Addr addr_;
   ACE_INET_Addr addr6_;
-
 };
 
 #endif