ChangeLogTag: Wed Aug 26 18:25:27 UTC 2009 Jeff Parsons <j.parsons@vanderbilt.edu>

4 files changed, 74 insertions, 10 deletions

diff --git a/modules/TAO/ChangeLog b/modules/TAO/ChangeLog
index e9120ae0e07..d07b3f4723a 100644
--- a/modules/TAO/ChangeLog
+++ b/modules/TAO/ChangeLog
@@ -1,3 +1,13 @@
+Wed Aug 26 18:25:27 UTC 2009  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * orbsvcs/IFR_Service/ifr_visitor.h:
+        * orbsvcs/IFR_Service/ifr_visitor.cpp:
+        * orbsvcs/IFR_Service/ifr_adding_visitor.cpp:
+        
+          Updated visitors to include the new visit methods,
+          and commented out the existing methods that use
+          port descriptions, which have been eliminated.
+
 Wed Aug 26 17:33:01 UTC 2009  Jeff Parsons <j.parsons@vanderbilt.edu>
 
         * TAO_IDL/include/ast_instantiated_interface.h:
diff --git a/modules/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.cpp b/modules/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.cpp
index 18d64a14e1e..75ceaa86746 100644
--- a/modules/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.cpp
+++ b/modules/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.cpp
@@ -3862,9 +3862,10 @@ ifr_adding_visitor::fill_params (CORBA::ParDescriptionSeq &result,
 }
 
 void
-ifr_adding_visitor::visit_all_provides (AST_Component *node,
-                                        CORBA::ComponentIR::ComponentDef_ptr c)
+ifr_adding_visitor::visit_all_provides (AST_Component *,
+                                        CORBA::ComponentIR::ComponentDef_ptr)
 {
+/*
   AST_Component::port_description *tmp = 0;
   CORBA::Contained_var contained;
   CORBA::InterfaceDef_var interface_type;
@@ -3890,12 +3891,14 @@ ifr_adding_visitor::visit_all_provides (AST_Component *node,
                                     tmp->impl->version (),
                                     interface_type.in ());
     }
+    */
 }
 
 void
-ifr_adding_visitor::visit_all_uses (AST_Component *node,
-                                    CORBA::ComponentIR::ComponentDef_ptr c)
+ifr_adding_visitor::visit_all_uses (AST_Component *,
+                                    CORBA::ComponentIR::ComponentDef_ptr)
 {
+/*
   AST_Component::port_description *tmp = 0;
   CORBA::Contained_var contained;
   CORBA::InterfaceDef_var interface_type;
@@ -3922,12 +3925,14 @@ ifr_adding_visitor::visit_all_uses (AST_Component *node,
                                 interface_type.in (),
                                 static_cast<CORBA::Boolean> (tmp->is_multiple));
     }
+    */
 }
 
 void
-ifr_adding_visitor::visit_all_emits (AST_Component *node,
-                                     CORBA::ComponentIR::ComponentDef_ptr c)
+ifr_adding_visitor::visit_all_emits (AST_Component *,
+                                     CORBA::ComponentIR::ComponentDef_ptr)
 {
+/*
   AST_Component::port_description *tmp = 0;
   CORBA::Contained_var contained;
   CORBA::ComponentIR::EventDef_var event_type;
@@ -3954,12 +3959,14 @@ ifr_adding_visitor::visit_all_emits (AST_Component *node,
                                  tmp->impl->version (),
                                  event_type.in ());
     }
+    */
 }
 
 void
-ifr_adding_visitor::visit_all_publishes (AST_Component *node,
-                                         CORBA::ComponentIR::ComponentDef_ptr c)
+ifr_adding_visitor::visit_all_publishes (AST_Component *,
+                                         CORBA::ComponentIR::ComponentDef_ptr)
 {
+/*
   AST_Component::port_description *tmp = 0;
   CORBA::Contained_var contained;
   CORBA::ComponentIR::EventDef_var event_type;
@@ -3986,12 +3993,14 @@ ifr_adding_visitor::visit_all_publishes (AST_Component *node,
                                      tmp->impl->version (),
                                      event_type.in ());
     }
+    */
 }
 
 void
-ifr_adding_visitor::visit_all_consumes (AST_Component *node,
-                                        CORBA::ComponentIR::ComponentDef_ptr c)
+ifr_adding_visitor::visit_all_consumes (AST_Component *,
+                                        CORBA::ComponentIR::ComponentDef_ptr)
 {
+/*
   AST_Component::port_description *tmp = 0;
   CORBA::Contained_var contained;
   CORBA::ComponentIR::EventDef_var event_type;
@@ -4018,6 +4027,7 @@ ifr_adding_visitor::visit_all_consumes (AST_Component *node,
                                     tmp->impl->version (),
                                     event_type.in ());
     }
+    */
 }
 
 void
diff --git a/modules/TAO/orbsvcs/IFR_Service/ifr_visitor.cpp b/modules/TAO/orbsvcs/IFR_Service/ifr_visitor.cpp
index a07a8eacb73..895e6ff8ba3 100644
--- a/modules/TAO/orbsvcs/IFR_Service/ifr_visitor.cpp
+++ b/modules/TAO/orbsvcs/IFR_Service/ifr_visitor.cpp
@@ -146,6 +146,43 @@ ifr_visitor::visit_consumes (AST_Consumes *)
   return 0;
 }
 
+int
+ifr_visitor::visit_extended_port (AST_Extended_Port *)
+{
+  return 0;
+}
+
+int
+ifr_visitor::visit_mirror_port (AST_Mirror_Port *)
+{
+  return 0;
+}
+
+int
+ifr_visitor::visit_connector (AST_Connector *)
+{
+  return 0;
+}
+
+int
+ifr_visitor::visit_instantiated_connector (
+  AST_Instantiated_Connector *)
+{
+  return 0;
+}
+
+int
+ifr_visitor::visit_tmpl_port (AST_Tmpl_Port *)
+{
+  return 0;
+}
+
+int
+ifr_visitor::visit_tmpl_mirror_port (AST_Tmpl_Mirror_Port *)
+{
+  return 0;
+}
+
 int 
 ifr_visitor::visit_eventtype (AST_EventType *)
 {
diff --git a/modules/TAO/orbsvcs/IFR_Service/ifr_visitor.h b/modules/TAO/orbsvcs/IFR_Service/ifr_visitor.h
index 8dd43c0cf63..056bb9d7002 100644
--- a/modules/TAO/orbsvcs/IFR_Service/ifr_visitor.h
+++ b/modules/TAO/orbsvcs/IFR_Service/ifr_visitor.h
@@ -61,6 +61,13 @@ public:
   virtual int visit_publishes (AST_Publishes *node);
   virtual int visit_emits (AST_Emits *node);
   virtual int visit_consumes (AST_Consumes *node);
+  virtual int visit_extended_port (AST_Extended_Port *node);
+  virtual int visit_mirror_port (AST_Mirror_Port *node);
+  virtual int visit_connector (AST_Connector *node);
+  virtual int visit_instantiated_connector (
+    AST_Instantiated_Connector *node);
+  virtual int visit_tmpl_port (AST_Tmpl_Port *node);
+  virtual int visit_tmpl_mirror_port (AST_Tmpl_Mirror_Port *node);
   virtual int visit_eventtype (AST_EventType *node);
   virtual int visit_eventtype_fwd (AST_EventTypeFwd *node);
   virtual int visit_home (AST_Home *node);