Fri Feb 11 11:16:00 UTC 2011 Martin Corino <mcorino@remedy.nl>

        Merged changes from Remedy work branch.

1 files changed, 5 insertions, 6 deletions

diff --git a/DAnCE/tools/Config_Handlers/DynAny_Handler/DynEnum_Handler.cpp b/DAnCE/tools/Config_Handlers/DynAny_Handler/DynEnum_Handler.cpp
index fef1bfed9fb..f90234b8e98 100644
--- a/DAnCE/tools/Config_Handlers/DynAny_Handler/DynEnum_Handler.cpp
+++ b/DAnCE/tools/Config_Handlers/DynAny_Handler/DynEnum_Handler.cpp
@@ -23,7 +23,7 @@ namespace DAnCE
     {
       try
         {
-          CORBA::TypeCode_ptr tc;
+          CORBA::TypeCode_var tc;
 
           if (req_tc)
             tc = req_tc;
@@ -75,7 +75,7 @@ namespace DAnCE
     {
       if (!type.enum_p ())
         {
-          DANCE_DEBUG (1, (LM_ERROR, ACE_TEXT ("ERROR: Enum type descriptioin required")));
+          DANCE_DEBUG (1, (LM_ERROR, ACE_TEXT ("ERROR: Enum type description required")));
           throw Config_Error (ACE_TEXT (""), ACE_TEXT ("Did not find expected enum type description, tk_kind may be wrong."));
         }
 
@@ -91,16 +91,15 @@ namespace DAnCE
           members[index++] = CORBA::string_dup (ACE_TEXT_ALWAYS_CHAR ((*i)->c_str ()));
         }
 
-      // @@ Leak this guy onto the heap to avoid a compile problem.
-      CORBA::TypeCode_ptr tc =
+      CORBA::TypeCode_var tc =
         DYNANY_HANDLER->orb ()->create_enum_tc (ACE_TEXT_ALWAYS_CHAR (type.enum_ ().typeId ().c_str ()),
                                                 ACE_TEXT_ALWAYS_CHAR (type.enum_ ().name ().c_str ()),
                                                 members);
 
       DYNANY_HANDLER->register_typecode ((type.enum_ ().typeId ()),
-                                         tc);
+                                         tc.in ());
 
-      return tc;
+      return tc._retn ();
     }
 
   }