summaryrefslogtreecommitdiff
path: root/TAO/tao/GIOP.h
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/tao/GIOP.h')
-rw-r--r--TAO/tao/GIOP.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/TAO/tao/GIOP.h b/TAO/tao/GIOP.h
index 00e7d4f0686..d69d996a7a0 100644
--- a/TAO/tao/GIOP.h
+++ b/TAO/tao/GIOP.h
@@ -129,7 +129,7 @@ typedef TAO_Unbounded_Sequence<TAO_IOP_TaggedComponent>
// namespace TAO_GIOP
-struct TAO_GIOP_Version
+struct TAO_Version
{
CORBA::Octet major;
CORBA::Octet minor;
@@ -152,7 +152,7 @@ public:
};
CORBA::Char magic [4]; // "GIOP"
- TAO_GIOP_Version giop_version;
+ TAO_Version giop_version;
CORBA::Octet byte_order; // 0 = big, 1 = little
CORBA::Octet message_type; // MsgType above
CORBA::ULong message_size; // in byte_order!
@@ -171,8 +171,8 @@ public:
// The IIOP Lite header length and the offset of the message size
// field in it.
-#define TAO_GIOP_LITE_HEADER_LEN 5
-#define TAO_GIOP_LITE_MESSAGE_SIZE_OFFSET 0
+#define TAO_IIOP_LITE_HEADER_LEN 5
+#define TAO_IIOP_LITE_MESSAGE_SIZE_OFFSET 0
// Support for Implicit ORB Service Context.
typedef CORBA::ULong TAO_GIOP_ServiceID;
@@ -351,7 +351,7 @@ public:
static const char *message_name (TAO_GIOP::Message_Type which);
// Returns the stringified <MsgType>.
- static TAO_GIOP_ReplyStatusType convert_CORBA_to_GIOP_exception (CORBA::exception_type corba_type);
+ static TAO_GIOP_ReplyStatusType convert_CORBA_to_GIOP_exception (CORBA::ExceptionType corba_type);
// Convert the exception type from CORBA to GIOP