summaryrefslogtreecommitdiff
path: root/TAO/tao/Messaging/MessagingC.h
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/tao/Messaging/MessagingC.h')
-rw-r--r--TAO/tao/Messaging/MessagingC.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/TAO/tao/Messaging/MessagingC.h b/TAO/tao/Messaging/MessagingC.h
index da218e55e7d..34595011524 100644
--- a/TAO/tao/Messaging/MessagingC.h
+++ b/TAO/tao/Messaging/MessagingC.h
@@ -419,7 +419,7 @@ namespace TAO
{
static void tao_add_ref (Messaging::ExceptionHolder *);
static void tao_remove_ref (Messaging::ExceptionHolder *);
- static void release (Messaging::ExceptionHolder *);
+ static void tao_release (Messaging::ExceptionHolder *);
};
#endif /* end #if !defined */
@@ -430,14 +430,14 @@ namespace TAO
ACE_TEMPLATE_SPECIALIZATION
struct TAO_Messaging_Export Objref_Traits<Messaging::ReplyHandler>
{
- static Messaging::ReplyHandler_ptr duplicate (
+ static Messaging::ReplyHandler_ptr tao_duplicate (
Messaging::ReplyHandler_ptr
);
- static void release (
+ static void tao_release (
Messaging::ReplyHandler_ptr
);
- static Messaging::ReplyHandler_ptr nil (void);
- static CORBA::Boolean marshal (
+ static Messaging::ReplyHandler_ptr tao_nil (void);
+ static CORBA::Boolean tao_marshal (
Messaging::ReplyHandler_ptr p,
TAO_OutputCDR & cdr
);