diff options
| -rw-r--r-- | TAO/ChangeLog | 7 | ||||
| -rw-r--r-- | TAO/tests/RTCORBA/Server_Protocol/server.cpp | 2 | ||||
| -rw-r--r-- | TAO/utils/catior/catior.cpp | 2 | ||||
| -rw-r--r-- | TAO/utils/nslist/nslist.cpp | 17 |
4 files changed, 14 insertions, 14 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index d4d16f08b47..f561a8c02c4 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,10 @@ +Sat Aug 31 15:59:07 UTC 2002 Craig Rodrigues <crodrigu@bbn.com> + + * tests/RTCORBA/Server_Protocol/server.cpp: + * utils/catior/catior.cpp: + * utils/nslist/nslist.cpp: + Change to TAO_TAG_IIOP_PROFILE to IOP::TAG_INTERNET_IOP. + Sat Aug 31 01:29:05 UTC 2002 Craig Rodrigues <crodrigu@bbn.com> * tao/Makefile.dirs: (Added) Specifies the DIRS= list of directories diff --git a/TAO/tests/RTCORBA/Server_Protocol/server.cpp b/TAO/tests/RTCORBA/Server_Protocol/server.cpp index 99c8f19d00d..feee0fb030c 100644 --- a/TAO/tests/RTCORBA/Server_Protocol/server.cpp +++ b/TAO/tests/RTCORBA/Server_Protocol/server.cpp @@ -121,7 +121,7 @@ check_default_server_protocol (CORBA::ORB_ptr orb protocols[i].transport_protocol_properties; // Print properties. - if (protocol_type == TAO_TAG_IIOP_PROFILE) + if (protocol_type == IOP::TAG_INTERNET_IOP) { RTCORBA::TCPProtocolProperties_var tcp_properties = RTCORBA::TCPProtocolProperties::_narrow (properties.in diff --git a/TAO/utils/catior/catior.cpp b/TAO/utils/catior/catior.cpp index b8e108f3419..1bc4d5987d6 100644 --- a/TAO/utils/catior/catior.cpp +++ b/TAO/utils/catior/catior.cpp @@ -249,7 +249,7 @@ catior (char* str continue; } - if (tag == TAO_TAG_IIOP_PROFILE) + if (tag == IOP::TAG_INTERNET_IOP) { ACE_DEBUG ((LM_DEBUG, "%{")); continue_decoding = cat_iiop_profile (stream); diff --git a/TAO/utils/nslist/nslist.cpp b/TAO/utils/nslist/nslist.cpp index 373ef784d64..2c93a0b84aa 100644 --- a/TAO/utils/nslist/nslist.cpp +++ b/TAO/utils/nslist/nslist.cpp @@ -31,25 +31,18 @@ static void list_context (CosNaming::NamingContext_ptr nc, static void get_tag_name (CORBA::ULong tag, ACE_CString& tag_string) { - switch(tag) - { - case TAO_TAG_IIOP_PROFILE: + if (tag == IOP::TAG_INTERNET_IOP) tag_string = "IIOP"; - break; - case TAO_TAG_UIOP_PROFILE: + else if (tag == TAO_TAG_UIOP_PROFILE) tag_string = "UIOP"; - break; - case TAO_TAG_SHMEM_PROFILE: + else if (tag == TAO_TAG_SHMEM_PROFILE) tag_string = "SHMEM"; - break; #ifdef TAO_TAG_UDP_PROFILE - case TAO_TAG_UDP_PROFILE: + else if (tag == TAO_TAG_UDP_PROFILE) tag_string = "GIOP over UDP"; #endif /* TAO_TAG_UDP_PROFILE */ - default: + else tag_string = "Unknown tag: " + tag; - break; - } } |