diff options
| author | mcorino <mcorino@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2010-12-08 12:38:04 +0000 |
|---|---|---|
| committer | mcorino <mcorino@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2010-12-08 12:38:04 +0000 |
| commit | 3c2e72da953a3cfa273b3695fd1898a7527421d4 (patch) | |
| tree | 10b78980fec67801815eaa4afeb9277a109e3726 | |
| parent | 9fce1ba6ccc73d477cc647531a0d6b6dff4fa5ff (diff) | |
| download | ATCD-3c2e72da953a3cfa273b3695fd1898a7527421d4.tar.gz | |
Wed Dec 8 12:36:06 UTC 2010 Martin Corino <corino_m@remedy.nl>
* TAO_IDL/be/be_visitor_component/component_ami_rh_ex_base.cpp:
* TAO_IDL/be/be_visitor_component/component_ami_rh_exh.cpp:
Some more fixes for the AMI reply handler executor implementation
generation.
| -rw-r--r-- | TAO/ChangeLog | 7 | ||||
| -rw-r--r-- | TAO/TAO_IDL/be/be_visitor_component/component_ami_rh_ex_base.cpp | 1 | ||||
| -rw-r--r-- | TAO/TAO_IDL/be/be_visitor_component/component_ami_rh_exh.cpp | 6 |
3 files changed, 11 insertions, 3 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index f48b43a2f5e..a727efc0405 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,10 @@ +Wed Dec 8 12:36:06 UTC 2010 Martin Corino <corino_m@remedy.nl> + + * TAO_IDL/be/be_visitor_component/component_ami_rh_ex_base.cpp: + * TAO_IDL/be/be_visitor_component/component_ami_rh_exh.cpp: + Some more fixes for the AMI reply handler executor implementation + generation. + Wed Dec 8 03:13:28 UTC 2010 Jeff Parsons <j.parsons@vanderbilt.edu> * TAO_IDL/fe/fe_utils.cpp(can_be_redefined): diff --git a/TAO/TAO_IDL/be/be_visitor_component/component_ami_rh_ex_base.cpp b/TAO/TAO_IDL/be/be_visitor_component/component_ami_rh_ex_base.cpp index 8e4d70d6e59..6c536403d57 100644 --- a/TAO/TAO_IDL/be/be_visitor_component/component_ami_rh_ex_base.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component/component_ami_rh_ex_base.cpp @@ -60,6 +60,7 @@ be_visitor_component_ami_rh_ex_base::init (void) this->base_class_name_ = scope->full_name (); this->base_class_name_ += smart_scope; + this->base_class_name_ += "CCM_"; this->base_class_name_ += base; this->class_name_ = base; diff --git a/TAO/TAO_IDL/be/be_visitor_component/component_ami_rh_exh.cpp b/TAO/TAO_IDL/be/be_visitor_component/component_ami_rh_exh.cpp index 12d081fe174..79674937547 100644 --- a/TAO/TAO_IDL/be/be_visitor_component/component_ami_rh_exh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component/component_ami_rh_exh.cpp @@ -34,9 +34,9 @@ be_visitor_component_ami_rh_exh::visit_uses (be_uses *node) this->init (); os_ << be_nl_2 - << "class " << this->export_macro_.c_str () << " " - << this->class_name_ << be_idt_nl - << ": public ::" << this->base_class_name_ << be_uidt_nl + << "class " << this->class_name_ << be_idt_nl + << ": public ::" << this->base_class_name_ << "," << be_idt_nl + << "public virtual ::CORBA::LocalObject" << be_uidt_nl << "{" << be_nl << "public:" << be_idt_nl << this->class_name_ << " (void);" << be_nl |