diff options
| -rw-r--r-- | TAO/CIAO/CIDLC/ServantHeaderGenerator.cpp | 15 | ||||
| -rw-r--r-- | TAO/CIAO/CIDLC/ServantSourceGenerator.cpp | 1 | ||||
| -rw-r--r-- | TAO/CIAO/ChangeLog | 12 |
3 files changed, 14 insertions, 14 deletions
diff --git a/TAO/CIAO/CIDLC/ServantHeaderGenerator.cpp b/TAO/CIAO/CIDLC/ServantHeaderGenerator.cpp index a28492bae1d..8924ea8059a 100644 --- a/TAO/CIAO/CIDLC/ServantHeaderGenerator.cpp +++ b/TAO/CIAO/CIDLC/ServantHeaderGenerator.cpp @@ -1783,30 +1783,19 @@ ServantHeaderEmitter::generate_facets (TranslationUnit& u, Context& c) // Layer 2 // - Traversal::TranslationRegion included_region; /// Includes are handled here so they will all be present /// before the facet servants (if any) are generated. Traversal::ContainsRoot contains_root; - Traversal::QuoteIncludes quote_includes; - Traversal::BracketIncludes bracket_includes; IncludesEmitter includes_emitter (c); principal_region.edge_traverser (includes_emitter); - principal_region.edge_traverser (quote_includes); - principal_region.edge_traverser (bracket_includes); principal_region.edge_traverser (contains_root); - included_region.edge_traverser (quote_includes); - included_region.edge_traverser (bracket_includes); - //-- Traversal::Root root; - contains_root.node_traverser (root); - quote_includes.node_traverser (included_region); - bracket_includes.node_traverser (included_region); // Layer 3 // @@ -1819,13 +1808,13 @@ ServantHeaderEmitter::generate_facets (TranslationUnit& u, Context& c) root_defines.node_traverser (module); root_defines.node_traverser (composition); + module.edge_traverser (root_defines); + // Layer 4 // Traversal::Defines composition_defines; composition.edge_traverser (composition_defines); - module.edge_traverser (composition_defines); - //-- Traversal::ComponentExecutor component_executor; Traversal::HomeExecutor home_executor; diff --git a/TAO/CIAO/CIDLC/ServantSourceGenerator.cpp b/TAO/CIAO/CIDLC/ServantSourceGenerator.cpp index d64c42822c6..b0220822a43 100644 --- a/TAO/CIAO/CIDLC/ServantSourceGenerator.cpp +++ b/TAO/CIAO/CIDLC/ServantSourceGenerator.cpp @@ -4387,7 +4387,6 @@ ServantSourceEmitter::generate_facets (TranslationUnit& u, Context& c) //-- Traversal::Root root; - // includes.node_traverser (region); contains_root.node_traverser (root); // Layer 3 diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog index 9a4d686783a..b5850485b1e 100644 --- a/TAO/CIAO/ChangeLog +++ b/TAO/CIAO/ChangeLog @@ -1,3 +1,15 @@ +Mon May 15 20:48:52 UTC 2006 Jeff Parsons <j.parsons@vanderbilt.edu> + + * CIDLC/ServantSourceGenerator.cpp (generate): + + Removed commented-out code. + + * CIDLC/ServantHeaderGenerator.cpp (generate_facets): + + Fixed cut-and-paste error that was causing facet servant + class declaration to get skipped when the composition is + defined inside one or more IDL modules. + Fri May 12 07:36:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> * tools/Config_Handlers/Utils/Functors.h: |