diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-07-30 18:55:07 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-07-30 18:55:07 +0000 |
| commit | 0f07f7aad6a908199e74c52bf6b48c81e3560d5f (patch) | |
| tree | c29272afd02f66c27f88d732fca6f54dc3e6f320 /TAO/TAO_IDL/be/be_visitor_interface | |
| parent | 55f46ffac44b3c4ff7b6e27a9ad8338b08046c95 (diff) | |
| download | ATCD-0f07f7aad6a908199e74c52bf6b48c81e3560d5f.tar.gz | |
Mon Jul 30 18:54:12 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>
Diffstat (limited to 'TAO/TAO_IDL/be/be_visitor_interface')
| -rw-r--r-- | TAO/TAO_IDL/be/be_visitor_interface/amh_sh.cpp | 15 | ||||
| -rw-r--r-- | TAO/TAO_IDL/be/be_visitor_interface/interface_sh.cpp | 15 | ||||
| -rw-r--r-- | TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp | 4 |
3 files changed, 21 insertions, 13 deletions
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/amh_sh.cpp b/TAO/TAO_IDL/be/be_visitor_interface/amh_sh.cpp index b6048ac5ed0..0d3bc9a9e2d 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/amh_sh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/amh_sh.cpp @@ -143,12 +143,15 @@ be_visitor_amh_interface_sh::visit_interface (be_interface *node) << "void *servant_upcall" << be_uidt_nl << ");" << be_uidt_nl << be_nl; - // Add a skeleton for our _component method. - *os << "static void _component_skel (" << be_idt << be_idt_nl - << "TAO_ServerRequest &req," << be_nl - << "void *obj," << be_nl - << "void *servant_upcall" << be_uidt_nl - << ");" << be_uidt_nl << be_nl; + if (!be_global->gen_corba_e ()) + { + // Add a skeleton for our _component method. + *os << "static void _component_skel (" << be_idt << be_idt_nl + << "TAO_ServerRequest &req," << be_nl + << "void *obj," << be_nl + << "void *servant_upcall" << be_uidt_nl + << ");" << be_uidt_nl << be_nl; + } // Add a skeleton for our _repository_id method. *os << "static void _repository_id_skel (" << be_idt << be_idt_nl diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_sh.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_sh.cpp index aa6f995848c..93442a1b0ad 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/interface_sh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_sh.cpp @@ -191,12 +191,15 @@ be_visitor_interface_sh::visit_interface (be_interface *node) << "void * servant" << be_uidt_nl << ");" << be_uidt_nl << be_nl; - // Add a skeleton for our _component method. - *os << "static void _component_skel (" << be_idt << be_idt_nl - << "TAO_ServerRequest & req," << be_nl - << "void * servant_upcall," << be_nl - << "void * servant" << be_uidt_nl - << ");" << be_uidt_nl << be_nl; + if (!be_global->gen_corba_e ()) + { + // Add a skeleton for our _component method. + *os << "static void _component_skel (" << be_idt << be_idt_nl + << "TAO_ServerRequest & req," << be_nl + << "void * servant_upcall," << be_nl + << "void * servant" << be_uidt_nl + << ");" << be_uidt_nl << be_nl; + } // Add a skeleton for our _repository_id method. *os << "static void _repository_id_skel (" << be_idt << be_idt_nl diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp index 701de416ee9..3c473fd1ebb 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp @@ -548,7 +548,9 @@ be_visitor_interface_ss::visit_interface (be_interface *node) << "}" << be_nl << be_nl; - // Generate code for the _component skeleton. + // Generate code for the _component skeleton, don't generate it when + // we use CORBA/e + if (!be_global->gen_corba_e ()) { be_predefined_type rt (AST_PredefinedType::PT_object, 0); // @@ Cheat a little by placing a space before the operation name |