Tue Jun 5 18:56:16 UTC 2007 Phil Mesnier <mesnier_p@ociweb.com>

5 files changed, 23 insertions, 10 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 453603be73e..847c5ed9bcd 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,7 +1,20 @@
+Tue Jun  5 18:56:16 UTC 2007  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp:
+        * orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp:
+        * orbsvcs/orbsvcs/RtecUDPAdmin.idl:
+        * orbsvcs/tests/EC_MT_Mcast/AddrServer.cpp:
+
+          The enum added to RtecUDPAdmin.idl contained "INET" which
+          apparently collided with a '#define INET' on some VxWorks build
+          environments. To avoid this collision, the enum values have been
+          renamed. Thanks to Martin Corino for finding the cause of this
+          build problem on VxWorks.
+
 Tue Jun  5 13:23:04 UTC 2007  Jeff Parsons <j.parsons@vanderbilt.edu>
 
         * tests/IDL_Test/nested_scope.idl:
-        
+
           Commented out a line that has been determined by Simon Massey
           <simon dot massey at prismtech dot com> to be melformed IDL.
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp
index c66d8a90aec..148695aad77 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp
@@ -166,11 +166,11 @@ TAO_ECG_Mcast_EH::compute_required_subscriptions (
           this->receiver_->get_address (header, udp_addr.out());
           switch (udp_addr->_d())
             {
-            case RtecUDPAdmin::INET:
+            case RtecUDPAdmin::Rtec_inet:
               inet_addr.set(udp_addr->v4_addr().port,
                             udp_addr->v4_addr().ipaddr);
               break;
-            case RtecUDPAdmin::INET6:
+            case RtecUDPAdmin::Rtec_inet6:
 #if defined (ACE_HAS_IPV6)
               inet_addr.set_type(PF_INET6);
 #endif
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp
index ebf3071ba7c..28c3f78f8f8 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp
@@ -208,11 +208,11 @@ TAO_ECG_UDP_Sender::push (const RtecEventComm::EventSet &events)
           this->addr_server_->get_address (header, udp_addr.out());
           switch (udp_addr->_d())
             {
-            case RtecUDPAdmin::INET:
+            case RtecUDPAdmin::Rtec_inet:
               inet_addr.set(udp_addr->v4_addr().port,
                             udp_addr->v4_addr().ipaddr);
               break;
-            case RtecUDPAdmin::INET6:
+            case RtecUDPAdmin::Rtec_inet6:
 #if defined (ACE_HAS_IPV6)
               inet_addr.set_type(PF_INET6);
 #endif
diff --git a/TAO/orbsvcs/orbsvcs/RtecUDPAdmin.idl b/TAO/orbsvcs/orbsvcs/RtecUDPAdmin.idl
index 38217d203fb..e64f6537b30 100644
--- a/TAO/orbsvcs/orbsvcs/RtecUDPAdmin.idl
+++ b/TAO/orbsvcs/orbsvcs/RtecUDPAdmin.idl
@@ -60,8 +60,8 @@ module RtecUDPAdmin
    */
   enum Address_Family
   {
-    INET,
-    INET6
+    Rtec_inet,
+    Rtec_inet6
   };
 
   /**
@@ -73,9 +73,9 @@ module RtecUDPAdmin
    */
   union UDP_Address switch (Address_Family)
   {
-  case INET:
+  case Rtec_inet:
     UDP_Addr v4_addr;
-  case INET6:
+  case Rtec_inet6:
     UDP_Addr_v6 v6_addr;
   };
 
diff --git a/TAO/orbsvcs/tests/EC_MT_Mcast/AddrServer.cpp b/TAO/orbsvcs/tests/EC_MT_Mcast/AddrServer.cpp
index 951f5177e26..723910ec736 100644
--- a/TAO/orbsvcs/tests/EC_MT_Mcast/AddrServer.cpp
+++ b/TAO/orbsvcs/tests/EC_MT_Mcast/AddrServer.cpp
@@ -32,7 +32,7 @@ void
 AddrServer::get_addr (const RtecEventComm::EventHeader&,
                       RtecUDPAdmin::UDP_Addr& addr)
 {
-  if (this->addr_._d() == RtecUDPAdmin::INET6)
+  if (this->addr_._d() == RtecUDPAdmin::Rtec_inet6)
     throw CORBA::DATA_CONVERSION(0, CORBA::COMPLETED_YES);
   addr = this->addr_.v4_addr();
 }