diff options
| author | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-11-09 20:22:47 +0000 |
|---|---|---|
| committer | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-11-09 20:22:47 +0000 |
| commit | 2058d8390f67ce2f8ef0598428ea477455056c2d (patch) | |
| tree | 51603c05be1eafb6dc65f82bc69e58b55917586c | |
| parent | 3406685f0a4fb5b170736249bc3c38c3fd8a33b5 (diff) | |
| download | ATCD-2058d8390f67ce2f8ef0598428ea477455056c2d.tar.gz | |
ChangeLogTag: Tue Nov 9 14:20:31 2004 Jeff Parsons <j.parsons@vanderbilt.edu>
| -rw-r--r-- | TAO/CIAO/CIDLC/ServantSourceGenerator.cpp | 8 | ||||
| -rw-r--r-- | TAO/CIAO/ChangeLog | 8 |
2 files changed, 14 insertions, 2 deletions
diff --git a/TAO/CIAO/CIDLC/ServantSourceGenerator.cpp b/TAO/CIAO/CIDLC/ServantSourceGenerator.cpp index b06dc8d5488..c6521b5eae5 100644 --- a/TAO/CIAO/CIDLC/ServantSourceGenerator.cpp +++ b/TAO/CIAO/CIDLC/ServantSourceGenerator.cpp @@ -3031,11 +3031,13 @@ namespace return_type_name_emitter_ (c.os ()), enclosing_type_name_emitter_ (c.os ()), simple_type_name_emitter_ (c.os ()), + type_name_emitter_ (c.os ()), scope_ (home) { returns_.node_traverser (return_type_name_emitter_); enclosing_manages_.node_traverser (enclosing_type_name_emitter_); simple_manages_.node_traverser (simple_type_name_emitter_); + manages_.node_traverser (type_name_emitter_); } virtual void @@ -3118,7 +3120,7 @@ namespace os << "ACE_CHECK_RETURN ("; - Traversal::HomeFactory::returns (hf, returns_); + Traversal::Home::manages (scope_, manages_); os << "::_nil ());" << endl; @@ -3142,7 +3144,7 @@ namespace os << "ACE_CHECK_RETURN ("; - Traversal::HomeFactory::returns (hf, returns_); + Traversal::Home::manages (scope_, manages_); os << "::_nil ());" << endl; @@ -3163,9 +3165,11 @@ namespace ReturnTypeNameEmitter return_type_name_emitter_; EnclosingTypeNameEmitter enclosing_type_name_emitter_; SimpleTypeNameEmitter simple_type_name_emitter_; + TypeNameEmitter type_name_emitter_; Traversal::Returns returns_; Traversal::Manages enclosing_manages_; Traversal::Manages simple_manages_; + Traversal::Manages manages_; SemanticGraph::Home& scope_; }; diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog index 8a3709764be..f92ac10dc98 100644 --- a/TAO/CIAO/ChangeLog +++ b/TAO/CIAO/ChangeLog @@ -1,3 +1,11 @@ +Tue Nov 9 14:20:31 2004 Jeff Parsons <j.parsons@vanderbilt.edu> + + * CIDLC/ServantSourceGenerator.cpp: + + Fixed incorrect code generation for home factory operations. + Thanks to Chad Elliott <elliott_c@ociweb.com> for pointing + out the mistake. + Mon Nov 8 12:58:24 2004 Chad Elliott <elliott_c@ociweb.com> * DAnCE/tests/NodeApplicationTest/NodeAppTest.mpc: |