1 files changed, 19 insertions, 23 deletions

diff --git a/TAO/TAO_IDL/be/be_connector.cpp b/TAO/TAO_IDL/be/be_connector.cpp
index b1c4c1c68a9..fb1863a9759 100644
--- a/TAO/TAO_IDL/be/be_connector.cpp
+++ b/TAO/TAO_IDL/be/be_connector.cpp
@@ -16,17 +16,17 @@ be_connector::be_connector (
               n),
     UTL_Scope (AST_Decl::NT_connector),
     AST_Interface (n,
+                   nullptr,
                    0,
-                   0,
-                   0,
+                   nullptr,
                    0,
                    false,
                    false),
     AST_Component (n,
                    base_connector,
+                   nullptr,
                    0,
-                   0,
-                   0,
+                   nullptr,
                    0),
     AST_Connector (n,
                    base_connector),
@@ -36,17 +36,17 @@ be_connector::be_connector (
     be_type (AST_Decl::NT_connector,
              n),
     be_interface (n,
+                  nullptr,
                   0,
-                  0,
-                  0,
+                  nullptr,
                   0,
                   false,
                   false),
     be_component (n,
                   base_connector,
+                  nullptr,
                   0,
-                  0,
-                  0,
+                  nullptr,
                   0),
     dds_connector_ (false),
     ami_connector_ (false)
@@ -57,12 +57,12 @@ be_connector::be_connector (
     }
 }
 
-be_connector::~be_connector (void)
+be_connector::~be_connector ()
 {
 }
 
 void
-be_connector::destroy (void)
+be_connector::destroy ()
 {
   this->AST_Connector::destroy ();
   this->be_component::destroy ();
@@ -75,23 +75,23 @@ be_connector::accept (be_visitor *visitor)
 }
 
 bool
-be_connector::dds_connector (void)
+be_connector::dds_connector ()
 {
   return this->dds_connector_;
 }
 
 bool
-be_connector::ami_connector (void)
+be_connector::ami_connector ()
 {
   return this->ami_connector_;
 }
 
 void
-be_connector::check_ancestors (void)
+be_connector::check_ancestors ()
 {
   AST_Connector *base = this;
 
-  while (base != 0)
+  while (base != nullptr)
     {
       const char *base_fname = base->full_name ();
 
@@ -112,14 +112,14 @@ be_connector::check_ancestors (void)
           // If we have a templated module, enable it as dds_connector_
           // for the moment
           AST_Module *m =
-            AST_Module::narrow_from_scope (this->defined_in ());
-          AST_Template_Module_Inst *t_inst = 0;
-          while (t_inst == 0 && m != 0)
+            dynamic_cast<AST_Module*> (this->defined_in ());
+          AST_Template_Module_Inst *t_inst = nullptr;
+          while (t_inst == nullptr && m != nullptr)
             {
               t_inst = m->from_inst ();
-              m = AST_Module::narrow_from_scope (m->defined_in ());
+              m = dynamic_cast<AST_Module*> (m->defined_in ());
             }
-          if (t_inst != 0 && t_inst->template_args () != 0)
+          if (t_inst != nullptr && t_inst->template_args () != nullptr)
             {
               if (t_inst->template_args ()->size () > 0)
                 {
@@ -132,7 +132,3 @@ be_connector::check_ancestors (void)
       base = base->base_connector ();
     }
 }
-
-IMPL_NARROW_FROM_DECL (be_connector)
-IMPL_NARROW_FROM_SCOPE (be_connector)
-