diff options
Diffstat (limited to 'TAO/TAO_IDL/be/be_visitor_interface/ami_handler_stub_ch.cpp')
| -rw-r--r-- | TAO/TAO_IDL/be/be_visitor_interface/ami_handler_stub_ch.cpp | 111 |
1 files changed, 41 insertions, 70 deletions
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/ami_handler_stub_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface/ami_handler_stub_ch.cpp index f9e6bb9cc80..d399206d20f 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/ami_handler_stub_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/ami_handler_stub_ch.cpp @@ -16,13 +16,13 @@ // // = AUTHOR // Aniruddha Gokhale and Alexander Babu Arulanthu -// <alex@cs.wustl.edu> +// <alex@cs.wustl.edu> // // ============================================================================ -#include "idl.h" -#include "idl_extern.h" -#include "be.h" +#include "idl.h" +#include "idl_extern.h" +#include "be.h" #include "be_visitor_interface.h" @@ -50,83 +50,61 @@ be_visitor_interface_ami_handler_stub_ch::visit_interface (be_interface *node) { // Grab the stream. os = this->ctx_->stream (); - + // Ifdef guard. - - // Generate AMI_...name..._Handler string. - char *ifdef_string = 0; - ACE_NEW_RETURN (ifdef_string, - char [ACE_OS::strlen ("AMI_") + - ACE_OS::strlen (node->flatname ()) + - ACE_OS::strlen ("_Handler") + - // end of string - 1], - 0); - ACE_OS::sprintf (ifdef_string, - "AMI_%s_Handler", - node->flatname ()); - - os->gen_ifdef_macro (ifdef_string); - - // Prepare the local name for the class. - char *local_name = 0; - ACE_NEW_RETURN (local_name, - char [ACE_OS::strlen ("AMI_") + - ACE_OS::strlen (node->local_name ()->get_string ()) + - ACE_OS::strlen ("_Handler") + - // end of string - 1], - 0); - ACE_OS::sprintf (local_name, - "AMI_%s_Handler", - node->local_name ()->get_string ()); + + os->gen_ifdef_macro (node->flat_name ()); // Now generate the class definition. - + os->indent (); - *os << "class " << idl_global->stub_export_macro () << " " - << local_name; - + *os << "class " << idl_global->export_macro () << " " + << node->local_name (); + // Node interface inherits from the Messaging::ReplyHandler - // interface. - *os << " : public virtual Messaging::ReplyHandler" << be_nl; - + // interface. + *os << " : public virtual Messaging::ReplyHandler" << be_nl; + // Generate the body. - + *os << "{" << be_nl << "public:" << be_nl - + // generate the _ptr_type and _var_type typedefs // but we must protect against certain versions of g++ - << "#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)" + << "#if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8" << be_idt_nl - << "typedef " << local_name << "_ptr _ptr_type;" << be_nl - << "typedef " << local_name << "_var _var_type;" << be_uidt_nl - << "#endif /* ! __GNUC__ || g++ >= 2.8 */\n" << be_idt_nl - + << "typedef " << node->local_name () << "_ptr _ptr_type;" << be_nl + << "typedef " << node->local_name () << "_var _var_type;" << be_uidt_nl + << "#endif /* __GNUC__ */\n" << be_idt_nl + // generate the static _duplicate, _narrow, and _nil operations << "// the static operations" << be_nl - << "static " << local_name << "_ptr " << "_duplicate (" - << local_name << "_ptr obj);" << be_nl - << "static " << local_name << "_ptr " + << "static " << node->local_name () << "_ptr " << "_duplicate (" + << node->local_name () << "_ptr obj);" << be_nl + << "static " << node->local_name () << "_ptr " << "_narrow (" << be_idt << be_idt_nl << "CORBA::Object_ptr obj," << be_nl << "CORBA::Environment &env = " << be_idt_nl << "TAO_default_environment ()" << be_uidt << be_uidt_nl << ");" << be_uidt_nl - << "static " << local_name << "_ptr " + << "static " << node->local_name () << "_ptr " << "_unchecked_narrow (" << be_idt << be_idt_nl << "CORBA::Object_ptr obj," << be_nl << "CORBA::Environment &env = " << be_idt_nl << "TAO_default_environment ()" << be_uidt << be_uidt_nl << ");" << be_uidt_nl - << "static " << local_name << "_ptr " << "_nil (void);\n\n"; + << "static " << node->local_name () + << "_ptr _nil (void)" << be_nl + << "{" << be_idt_nl + << "return (" << node->local_name () << "_ptr)0;" << be_uidt_nl + << "}\n\n"; // Visit the scope to generate the stubs for the call back - // methods. + // methods. if (this->visit_scope (node) == -1) { ACE_ERROR_RETURN ((LM_ERROR, @@ -136,7 +114,7 @@ be_visitor_interface_ami_handler_stub_ch::visit_interface (be_interface *node) -1); } - + // the _is_a method os->indent (); *os << "virtual CORBA::Boolean _is_a (" << be_idt << be_idt_nl @@ -147,30 +125,30 @@ be_visitor_interface_ami_handler_stub_ch::visit_interface (be_interface *node) << ");" << be_uidt_nl << "virtual const char* " << "_interface_repository_id (void) const;\n" << be_uidt_nl; - + // generate the "protected" constructor so that users cannot instantiate // us *os << "protected:" << be_idt_nl - << local_name << " (void);" << be_nl - << local_name + << node->local_name () << " (void);" << be_nl + << node->local_name () << " (TAO_Stub *objref, " << be_idt << be_idt_nl << "TAO_ServantBase *_tao_servant = 0, " << be_nl << "CORBA::Boolean _tao_collocated = 0" << be_uidt_nl << ");" << be_uidt_nl - << "virtual ~" << local_name << " (void);" << be_uidt_nl; - + << "virtual ~" << node->local_name () << " (void);" << be_uidt_nl; + // private copy constructor and assignment operator. These are not // allowed, hence they are private. *os << "private:\n"; os->incr_indent (); - *os << local_name << " (const " << local_name << " &);" + *os << node->local_name () << " (const " << node->local_name () << " &);" << be_nl - << "void operator= (const " << local_name << " &);\n"; - + << "void operator= (const " << node->local_name () << " &);\n"; + os->decr_indent (); *os << "};\n\n"; os->gen_endif (); - + // by using a visitor to declare and define the TypeCode, we have the // added advantage to conditionally not generate any code. This will be // based on the command line options. This is still TO-DO @@ -186,13 +164,6 @@ be_visitor_interface_ami_handler_stub_ch::visit_interface (be_interface *node) "TypeCode declaration failed\n"), -1); } - - - // Delete the heap allocated vars. - delete ifdef_string; - ifdef_string = 0; - delete local_name; - local_name = 0; } return 0; } |