1 files changed, 8 insertions, 9 deletions
diff --git a/TAO/tao/IOP_CodecC.cpp b/TAO/tao/IOP_CodecC.cpp
index 3a6a8dbddaa..5a99e777ab4 100644
--- a/TAO/tao/IOP_CodecC.cpp
+++ b/TAO/tao/IOP_CodecC.cpp
@@ -30,7 +30,6 @@
 
 
 #include "IOP_CodecC.h"
-#include "tao/SystemException.h"
 #include "tao/CDR.h"
 #include "ace/OS_NS_string.h"
 
@@ -58,7 +57,7 @@ namespace TAO
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 IOP::Codec_ptr
-TAO::Objref_Traits<IOP::Codec>::duplicate (
+TAO::Objref_Traits<IOP::Codec>::tao_duplicate (
     IOP::Codec_ptr p
   )
 {
@@ -67,7 +66,7 @@ TAO::Objref_Traits<IOP::Codec>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<IOP::Codec>::release (
+TAO::Objref_Traits<IOP::Codec>::tao_release (
     IOP::Codec_ptr p
   )
 {
@@ -76,14 +75,14 @@ TAO::Objref_Traits<IOP::Codec>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 IOP::Codec_ptr
-TAO::Objref_Traits<IOP::Codec>::nil (void)
+TAO::Objref_Traits<IOP::Codec>::tao_nil (void)
 {
   return IOP::Codec::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<IOP::Codec>::marshal (
+TAO::Objref_Traits<IOP::Codec>::tao_marshal (
     IOP::Codec_ptr p,
     TAO_OutputCDR & cdr
   )
@@ -662,7 +661,7 @@ IOP::Encoding::_tao_any_destructor (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 IOP::CodecFactory_ptr
-TAO::Objref_Traits<IOP::CodecFactory>::duplicate (
+TAO::Objref_Traits<IOP::CodecFactory>::tao_duplicate (
     IOP::CodecFactory_ptr p
   )
 {
@@ -671,7 +670,7 @@ TAO::Objref_Traits<IOP::CodecFactory>::duplicate (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 void
-TAO::Objref_Traits<IOP::CodecFactory>::release (
+TAO::Objref_Traits<IOP::CodecFactory>::tao_release (
     IOP::CodecFactory_ptr p
   )
 {
@@ -680,14 +679,14 @@ TAO::Objref_Traits<IOP::CodecFactory>::release (
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 IOP::CodecFactory_ptr
-TAO::Objref_Traits<IOP::CodecFactory>::nil (void)
+TAO::Objref_Traits<IOP::CodecFactory>::tao_nil (void)
 {
   return IOP::CodecFactory::_nil ();
 }
 
 ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
 CORBA::Boolean
-TAO::Objref_Traits<IOP::CodecFactory>::marshal (
+TAO::Objref_Traits<IOP::CodecFactory>::tao_marshal (
     IOP::CodecFactory_ptr p,
     TAO_OutputCDR & cdr
   )