summaryrefslogtreecommitdiff
path: root/TAO/tao/GIOP.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/tao/GIOP.cpp')
-rw-r--r--TAO/tao/GIOP.cpp21
1 files changed, 8 insertions, 13 deletions
diff --git a/TAO/tao/GIOP.cpp b/TAO/tao/GIOP.cpp
index e6ac6fd445a..278f33e6b2a 100644
--- a/TAO/tao/GIOP.cpp
+++ b/TAO/tao/GIOP.cpp
@@ -311,8 +311,7 @@ TAO_GIOP::send_request (TAO_Transport *transport,
// static CORBA::Octet
static const char close_message [TAO_GIOP_HEADER_LEN] =
{
- // 'G', 'I', 'O', 'P',
- 0x47, 0x49, 0x4f, 0x50, // work on non-ASCII platforms...
+ 'G', 'I', 'O', 'P',
TAO_GIOP_MessageHeader::MY_MAJOR,
TAO_GIOP_MessageHeader::MY_MINOR,
TAO_ENCAP_BYTE_ORDER,
@@ -357,8 +356,7 @@ TAO_GIOP::close_connection (TAO_Transport *transport, void *)
static const char
error_message [TAO_GIOP_HEADER_LEN] =
{
- // 'G', 'I', 'O', 'P',
- 0x47, 0x49, 0x4f, 0x50, // work on non-ASCII platforms...
+ 'G', 'I', 'O', 'P',
TAO_GIOP_MessageHeader::MY_MAJOR,
TAO_GIOP_MessageHeader::MY_MINOR,
TAO_ENCAP_BYTE_ORDER,
@@ -606,12 +604,10 @@ TAO_GIOP::parse_header_std (TAO_InputCDR &cdr,
{
char *header = cdr.start_.rd_ptr ();
- // The values are hard-coded to support non-ASCII platforms
- if (!(header [0] == 0x47 // 'G'
- && header [1] == 0x49 // 'I'
- && header [2] == 0x4f // 'O'
- && header [3] == 0x50 // 'P'
- ))
+ if (!(header [0] == 'G'
+ && header [1] == 'I'
+ && header [2] == 'O'
+ && header [3] == 'P'))
{
ACE_DEBUG ((LM_DEBUG,
"TAO: (%P|%t) bad header, magic word [%c%c%c%c]\n",
@@ -708,8 +704,7 @@ TAO_GIOP::start_message_std (TAO_GIOP::Message_Type type,
static CORBA::Octet header[] =
{
- // 'G', 'I', 'O', 'P',
- 0x47, 0x49, 0x4f, 0x50, // work on non-ASCII platforms...
+ 'G', 'I', 'O', 'P',
TAO_GIOP_MessageHeader::MY_MAJOR,
TAO_GIOP_MessageHeader::MY_MINOR,
TAO_ENCAP_BYTE_ORDER
@@ -781,7 +776,7 @@ TAO_GIOP::message_name (TAO_GIOP::Message_Type which)
}
TAO_GIOP_ReplyStatusType
-TAO_GIOP::convert_CORBA_to_GIOP_exception (CORBA::exception_type corba_type)
+TAO_GIOP::convert_CORBA_to_GIOP_exception (CORBA::ExceptionType corba_type)
{
switch (corba_type)
{