diff options
| author | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2002-11-15 21:25:18 +0000 |
|---|---|---|
| committer | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2002-11-15 21:25:18 +0000 |
| commit | ce1a4fc109ee0b044b6c8b9c8a13985e5c00ac52 (patch) | |
| tree | 04771165fc69d6d334bbbb83c107cde4807735c4 | |
| parent | 9de9345ba8e49c30c88a7e9675976a10ac90006b (diff) | |
| download | ATCD-ce1a4fc109ee0b044b6c8b9c8a13985e5c00ac52.tar.gz | |
ChangeLogTag: Fri Nov 15 15:22:54 2002 Jeff Parsons <parsons@isis-server.isis.vanderbilt.edu>
| -rw-r--r-- | TAO/ChangeLog | 8 | ||||
| -rw-r--r-- | TAO/TAO_IDL/be/be_visitor_ccm_pre_proc.cpp | 22 |
2 files changed, 29 insertions, 1 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index d56e7dc15f3..9d95f29def8 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,11 @@ +Fri Nov 15 15:22:54 2002 Jeff Parsons <parsons@isis-server.isis.vanderbilt.edu> + + * TAO_IDL/be/be_visitor_ccm_pre_proc.cpp: + + Added check to skip implied IDL generation for imported nodes. + Thanks once again to Nanbor <nanbor@cse.wustl.edu> for his + testing of the new CCM-related IDL features. + Fri Nov 15 14:51:31 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> * tao/Asynch_Queued_Message.cpp: diff --git a/TAO/TAO_IDL/be/be_visitor_ccm_pre_proc.cpp b/TAO/TAO_IDL/be/be_visitor_ccm_pre_proc.cpp index 5f3ef54ce81..a2e1ac058d1 100644 --- a/TAO/TAO_IDL/be/be_visitor_ccm_pre_proc.cpp +++ b/TAO/TAO_IDL/be/be_visitor_ccm_pre_proc.cpp @@ -91,7 +91,12 @@ be_visitor_ccm_pre_proc::visit_root (be_root *node) int be_visitor_ccm_pre_proc::visit_module (be_module *node) { - if (!node->imported () && this->visit_scope (node) == -1) + if (node->imported ()) + { + return 0; + } + + if (this->visit_scope (node) == -1) { ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_visitor_ccm_pre_proc::" @@ -105,6 +110,11 @@ be_visitor_ccm_pre_proc::visit_module (be_module *node) int be_visitor_ccm_pre_proc::visit_component (be_component *node) { + if (node->imported ()) + { + return 0; + } + if (this->lookup_cookie (node) == -1) { ACE_ERROR_RETURN ((LM_ERROR, @@ -174,6 +184,11 @@ be_visitor_ccm_pre_proc::visit_component (be_component *node) int be_visitor_ccm_pre_proc::visit_home (be_home *node) { + if (node->imported ()) + { + return 0; + } + AST_Interface *xplicit = this->create_explicit (node); if (xplicit == 0) @@ -239,6 +254,11 @@ be_visitor_ccm_pre_proc::visit_home (be_home *node) int be_visitor_ccm_pre_proc::visit_eventtype (be_eventtype *node) { + if (node->imported ()) + { + return 0; + } + if (this->create_event_consumer (node) == -1) { ACE_ERROR_RETURN ((LM_ERROR, |