diff options
| author | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-11-02 23:42:53 +0000 |
|---|---|---|
| committer | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-11-02 23:42:53 +0000 |
| commit | 0537f4f2c7be2ae2e1e7ab5b26a6b74e19c62c22 (patch) | |
| tree | 13c2b2a38283b6a670ad1cd448b12f12d0949e3b | |
| parent | f55dfa0dabbcbde3b0fc3a11782cbe7a138177df (diff) | |
| download | ATCD-0537f4f2c7be2ae2e1e7ab5b26a6b74e19c62c22.tar.gz | |
ChangeLogTag: Tue Nov 2 17:26:42 2004 Jeff Parsons <j.parsons@vanderbilt.edu>
| -rw-r--r-- | TAO/CIAO/CIDLC/ServantHeaderGenerator.cpp | 12 | ||||
| -rw-r--r-- | TAO/CIAO/CIDLC/ServantSourceGenerator.cpp | 10 | ||||
| -rw-r--r-- | TAO/CIAO/ChangeLog | 8 |
3 files changed, 19 insertions, 11 deletions
diff --git a/TAO/CIAO/CIDLC/ServantHeaderGenerator.cpp b/TAO/CIAO/CIDLC/ServantHeaderGenerator.cpp index 2178e79fb27..c8fe1b94155 100644 --- a/TAO/CIAO/CIDLC/ServantHeaderGenerator.cpp +++ b/TAO/CIAO/CIDLC/ServantHeaderGenerator.cpp @@ -132,7 +132,7 @@ namespace virtual void post (Type&) { - os << ";" << endl; + os << ";" << endl << endl; } virtual void @@ -300,7 +300,7 @@ namespace Traversal::Belongs read_belongs_; }; - struct InterfaceEmitter : Traversal::UnconstrainedInterface, + struct InterfaceEmitter : Traversal::Interface, EmitterBase { InterfaceEmitter (Context& c) @@ -308,22 +308,22 @@ namespace {} bool - add (UnconstrainedInterface& i) + add (Interface& i) { return interfaces_.insert (&i).second; } virtual void - traverse (UnconstrainedInterface& i) + traverse (Interface& i) { if (add (i)) { - Traversal::UnconstrainedInterface::traverse (i); + Traversal::Interface::traverse (i); } } private: - std::set<UnconstrainedInterface*> interfaces_; + std::set<Interface*> interfaces_; }; struct FacetEmitter : Traversal::UnconstrainedInterface, diff --git a/TAO/CIAO/CIDLC/ServantSourceGenerator.cpp b/TAO/CIAO/CIDLC/ServantSourceGenerator.cpp index ac794849fe4..f0feb5de717 100644 --- a/TAO/CIAO/CIDLC/ServantSourceGenerator.cpp +++ b/TAO/CIAO/CIDLC/ServantSourceGenerator.cpp @@ -348,7 +348,7 @@ namespace std::ostream& os; }; - struct InterfaceEmitter : Traversal::UnconstrainedInterface, + struct InterfaceEmitter : Traversal::Interface, EmitterBase { InterfaceEmitter (Context& c) @@ -356,22 +356,22 @@ namespace {} bool - add (UnconstrainedInterface& i) + add (Interface& i) { return interfaces_.insert (&i).second; } virtual void - traverse (UnconstrainedInterface& i) + traverse (Interface& i) { if (add (i)) { - Traversal::UnconstrainedInterface::traverse (i); + Traversal::Interface::traverse (i); } } private: - std::set<UnconstrainedInterface*> interfaces_; + std::set<Interface*> interfaces_; }; // Generates operations associated with attributes. diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog index fe7ff5c3e06..47bb2c6a2ce 100644 --- a/TAO/CIAO/ChangeLog +++ b/TAO/CIAO/ChangeLog @@ -1,3 +1,11 @@ +Tue Nov 2 17:26:42 2004 Jeff Parsons <j.parsons@vanderbilt.edu> + + * CIDLC/ServantHeaderGenerator.cpp: + * CIDLC/ServantSourceGenerator.cpp: + + Fixed the emitters for supported operations to include + abstract interfaces in their traversals. + Tue Nov 2 09:59:15 2004 Jeff Parsons <j.parsons@vanderbilt.edu> * CIDLC/ServantGenerator.cpp: |