1 files changed, 8 insertions, 8 deletions

diff --git a/TAO/TAO_IDL/be/be_visitor_operation/arglist.cpp b/TAO/TAO_IDL/be/be_visitor_operation/arglist.cpp
index aeb7d0d0ca9..9e72f70475d 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/arglist.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/arglist.cpp
@@ -25,7 +25,7 @@ be_visitor_operation_arglist::be_visitor_operation_arglist (
 {
 }
 
-be_visitor_operation_arglist::~be_visitor_operation_arglist (void)
+be_visitor_operation_arglist::~be_visitor_operation_arglist ()
 {
 }
 
@@ -148,24 +148,24 @@ be_visitor_operation_arglist::visit_argument (be_argument *node)
   // inside the scope of the interface node. In such cases, we would like to
   // generate the appropriate relative scoped names.
   be_operation *op =
-    be_operation::narrow_from_scope (this->ctx_->scope ());
-  be_interface *intf = 0;
+    dynamic_cast<be_operation*> (this->ctx_->scope ());
+  be_interface *intf = nullptr;
 
   // We need the interface node in which this operation was defined. However,
   // if this operation node was an attribute node in disguise, we get this
   // information from the context
-  if (op == 0)
+  if (op == nullptr)
     {
       be_factory *f =
-        be_factory::narrow_from_scope (this->ctx_->scope ());
+        dynamic_cast<be_factory*> (this->ctx_->scope ());
 
-      intf = be_interface::narrow_from_scope (f->defined_in ());
+      intf = dynamic_cast<be_interface*> (f->defined_in ());
     }
   else
     {
       intf = this->ctx_->attribute ()
-        ? be_interface::narrow_from_scope (this->ctx_->attribute ()->defined_in ())
-        : be_interface::narrow_from_scope (op->defined_in ());
+        ? dynamic_cast<be_interface*> (this->ctx_->attribute ()->defined_in ())
+        : dynamic_cast<be_interface*> (op->defined_in ());
     }
 
   // Set new scope.