From cdb6fd66611283a0314ab23e08472d11dae4f0e4 Mon Sep 17 00:00:00 2001
From: bala <bala@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>
Date: Tue, 28 Oct 2003 18:31:01 +0000
Subject: ChangeLogTag:Tue Oct 28 12:02:47 2003  Balachandran Natarajan 
 <bala@dre.vanderbilt.edu>

---
 TAO/tao/DynamicAny/DynEnum_i.cpp | 31 ++++---------------------------
 1 file changed, 4 insertions(+), 27 deletions(-)

(limited to 'TAO/tao/DynamicAny/DynEnum_i.cpp')

diff --git a/TAO/tao/DynamicAny/DynEnum_i.cpp b/TAO/tao/DynamicAny/DynEnum_i.cpp
index 0d556cd1e62..5c2a5e257ac 100644
--- a/TAO/tao/DynamicAny/DynEnum_i.cpp
+++ b/TAO/tao/DynamicAny/DynEnum_i.cpp
@@ -3,6 +3,7 @@
 
 #include "DynEnum_i.h"
 #include "DynAnyFactory.h"
+#include "tao/Any_Unknown_IDL_Type.h"
 
 ACE_RCSID (DynamicAny,
            DynEnum_i,
@@ -79,39 +80,15 @@ TAO_DynEnum_i::init (CORBA::TypeCode_ptr tc
 // ****************************************************************
 
 TAO_DynEnum_i *
-TAO_DynEnum_i::_narrow (CORBA::Object_ptr obj
+TAO_DynEnum_i::_narrow (CORBA::Object_ptr _tao_objref
                         ACE_ENV_ARG_DECL_NOT_USED)
 {
-  if (CORBA::is_nil (obj))
+  if (CORBA::is_nil (_tao_objref))
     {
       return 0;
     }
 
-  return ACE_reinterpret_cast (
-             TAO_DynEnum_i*,
-             obj->_tao_QueryInterface (
-                      ACE_reinterpret_cast (
-                          ptrdiff_t,
-                          &TAO_DynEnum_i::_narrow
-                        )
-                    )
-           );
-}
-
-void*
-TAO_DynEnum_i::_tao_QueryInterface (ptrdiff_t type)
-{
-  ptrdiff_t mytype =
-    ACE_reinterpret_cast (ptrdiff_t,
-                          &TAO_DynEnum_i::_narrow);
-  if (type == mytype)
-    {
-      this->_add_ref ();
-      return this;
-    }
-
-  return
-    this->ACE_NESTED_CLASS (DynamicAny, DynEnum::_tao_QueryInterface) (type);
+  return dynamic_cast<TAO_DynEnum_i *> (_tao_objref);
 }
 
 // ****************************************************************
-- 
cgit v1.2.1