1 files changed, 8 insertions, 8 deletions
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/amh_sh.cpp b/TAO/TAO_IDL/be/be_visitor_operation/amh_sh.cpp
index 45a289e6fe5..f926fced243 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/amh_sh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/amh_sh.cpp
@@ -18,7 +18,7 @@ be_visitor_amh_operation_sh::be_visitor_amh_operation_sh (
 {
 }
 
-be_visitor_amh_operation_sh::~be_visitor_amh_operation_sh (void)
+be_visitor_amh_operation_sh::~be_visitor_amh_operation_sh ()
 {
 }
 
@@ -53,9 +53,9 @@ be_visitor_amh_operation_sh::visit_operation (be_operation *node)
        i.next ())
     {
       be_argument *argument =
-        be_argument::narrow_from_decl (i.item ());
+        dynamic_cast<be_argument*> (i.item ());
 
-      if (argument == 0
+      if (argument == nullptr
           || argument->direction () == AST_Argument::dir_OUT)
         {
           continue;
@@ -139,16 +139,16 @@ be_visitor_amh_operation_sh::generate_shared_prologue (
   // if this operation node was an attribute node in disguise, we get this
   // information from the context
   be_interface *intf =
-    be_interface::narrow_from_scope (node->defined_in ());
+    dynamic_cast<be_interface*> (node->defined_in ());
 
-  if (this->ctx_->attribute () != 0)
+  if (this->ctx_->attribute () != nullptr)
     {
-      intf = be_interface::narrow_from_scope (
+      intf = dynamic_cast<be_interface*> (
                  this->ctx_->attribute()->defined_in ()
                );
     }
 
-  if (intf == 0)
+  if (intf == nullptr)
     {
       ACE_ERROR ((LM_ERROR,
                   "(%N:%l) be_visitor_amh_operation_sh::"
@@ -177,5 +177,5 @@ be_visitor_amh_operation_sh::generate_shared_prologue (
   // buf was allocated by ACE_OS::strdup, so we must use free instead
   // of delete.
   ACE_OS::free (buf);
-  buf = 0;
+  buf = nullptr;
 }