diff options
Diffstat (limited to 'TAO/TAO_IDL/be/be_interface.cpp')
| -rw-r--r-- | TAO/TAO_IDL/be/be_interface.cpp | 156 |
1 files changed, 75 insertions, 81 deletions
diff --git a/TAO/TAO_IDL/be/be_interface.cpp b/TAO/TAO_IDL/be/be_interface.cpp index 9bb57139a06..aeeb44fe819 100644 --- a/TAO/TAO_IDL/be/be_interface.cpp +++ b/TAO/TAO_IDL/be/be_interface.cpp @@ -487,17 +487,17 @@ be_interface::gen_stub_ctor (TAO_OutStream *os) if (!this->is_local ()) { *os << "ACE_INLINE" << be_nl; - *os << this->name () << "::" - << this->local_name () << " (" - << be_idt << be_idt_nl + *os << this->name () << "::" + << this->local_name () << " (" + << be_idt << be_idt_nl << "TAO_Stub *objref," << be_nl - << "CORBA::Boolean _tao_collocated," << be_nl - << "TAO_Abstract_ServantBase *servant" << be_uidt_nl - << ")" // constructor - << be_nl; + << "CORBA::Boolean _tao_collocated," << be_nl + << "TAO_Abstract_ServantBase *servant" << be_uidt_nl + << ")" // constructor + << be_nl; *os << ": CORBA_Object (objref, _tao_collocated, servant)" << be_uidt_nl; *os << "{" << be_idt_nl - << "this->" << this->flat_name () + << "this->" << this->flat_name () << "_setup_collocation (_tao_collocated);" << be_uidt_nl; *os << "}" << be_nl << be_nl; } @@ -533,14 +533,14 @@ be_interface::gen_var_defn (char *interface_name) // for over here. *ch << "class " << be_global->stub_export_macro () - << " " << namebuf + << " " << namebuf << " : public TAO_Base_var" << be_nl; *ch << "{" << be_nl; *ch << "public:" << be_idt_nl; // Default constructor. *ch << namebuf << " (void); // default constructor" << be_nl; - *ch << namebuf << " (" << interface_name + *ch << namebuf << " (" << interface_name << "_ptr p)" << " : ptr_ (p) {} " << be_nl; @@ -549,16 +549,16 @@ be_interface::gen_var_defn (char *interface_name) << " &); // copy constructor" << be_nl; // Destructor. - *ch << "~" << namebuf + *ch << "~" << namebuf << " (void); // destructor" << be_nl; *ch << be_nl; // Assignment operator from a pointer. - *ch << namebuf << " &operator= (" << interface_name + *ch << namebuf << " &operator= (" << interface_name << "_ptr);" << be_nl; // Assignment from _var. - *ch << namebuf << " &operator= (const " << namebuf + *ch << namebuf << " &operator= (const " << namebuf << " &);" << be_nl; // Arrow operator @@ -566,9 +566,9 @@ be_interface::gen_var_defn (char *interface_name) *ch << be_nl; // Other extra types (cast operators, [] operator, and others). - *ch << "operator const " << interface_name + *ch << "operator const " << interface_name << "_ptr &() const;" << be_nl; - *ch << "operator " << interface_name + *ch << "operator " << interface_name << "_ptr &();" << be_nl; *ch << "// in, inout, out, _retn " << be_nl; @@ -579,7 +579,7 @@ be_interface::gen_var_defn (char *interface_name) *ch << interface_name << "_ptr &out (void);" << be_nl; *ch << interface_name << "_ptr _retn (void);" << be_nl; - // Generate an additional member function that returns the + // Generate an additional member function that returns the // underlying pointer. *ch << interface_name << "_ptr ptr (void) const;" << be_nl << be_nl; @@ -587,19 +587,19 @@ be_interface::gen_var_defn (char *interface_name) *ch << "// Hooks used by template sequence and object manager classes" << be_nl << "// for non-defined forward declared interfaces." << be_nl - << "static " << interface_name + << "static " << interface_name << "_ptr tao_duplicate (" << interface_name << "_ptr);" << be_nl << "static void tao_release (" << interface_name << "_ptr);" << be_nl - << "static " << interface_name + << "static " << interface_name << "_ptr tao_nil (void);" << be_nl - << "static " << interface_name + << "static " << interface_name << "_ptr tao_narrow (" << be_idt << be_idt_nl - << "CORBA::Object *," << be_nl - << "CORBA::Environment &" << be_uidt_nl + << "CORBA::Object *" << be_nl + << "TAO_ENV_ARG_DECL_NOT_USED" << be_uidt_nl << ");" << be_uidt_nl - << "static CORBA::Object * tao_upcast (void *);" + << "static CORBA::Object * tao_upcast (void *);" << be_uidt_nl << be_nl; // Private. @@ -607,7 +607,7 @@ be_interface::gen_var_defn (char *interface_name) *ch << interface_name << "_ptr ptr_;" << be_nl; *ch << "// Unimplemented - prevents widening assignment." << be_nl; *ch << interface_name << "_var (const TAO_Base_var &rhs);" << be_nl; - *ch << interface_name << "_var &operator= (const TAO_Base_var &rhs);" + *ch << interface_name << "_var &operator= (const TAO_Base_var &rhs);" << be_uidt_nl; *ch << "};\n\n"; @@ -675,7 +675,7 @@ be_interface::gen_var_impl (char *interface_local_name, // defined before the remaining member functions including the copy // constructor because this inline function is used elsewhere. Hence to make // inlining of this function possible, we must define it before its use. - *cs << "::" << interface_full_name + *cs << "::" << interface_full_name << "_ptr" << be_nl; *cs << fname << "::ptr (void) const" << be_nl; *cs << "{" << be_idt_nl; @@ -683,16 +683,16 @@ be_interface::gen_var_impl (char *interface_local_name, *cs << "}" << be_nl << be_nl; // Copy constructor. - *cs << fname << "::" << lname + *cs << fname << "::" << lname << " (const ::" << interface_full_name << "_var &p) // copy constructor" << be_nl; *cs << " : TAO_Base_var ()," << be_nl; - *cs << " ptr_ (" << interface_local_name + *cs << " ptr_ (" << interface_local_name << "::_duplicate (p.ptr ()))" << be_nl; *cs << "{}" << be_nl << be_nl; // Destructor. - *cs << fname << "::~" << lname + *cs << fname << "::~" << lname << " (void) // destructor" << be_nl; *cs << "{" << be_idt_nl; *cs << "CORBA::release (this->ptr_);" << be_uidt_nl; @@ -711,7 +711,7 @@ be_interface::gen_var_impl (char *interface_local_name, // Assignment operator from _var. *cs << fname << " &" << be_nl; *cs << fname << "::operator= (const " - << "::" << interface_full_name + << "::" << interface_full_name << "_var &p)" << be_nl; *cs << "{" << be_idt_nl; *cs << "if (this != &p)" << be_nl; @@ -737,7 +737,7 @@ be_interface::gen_var_impl (char *interface_local_name, *cs << "}" << be_nl << be_nl; // operator-> - *cs << "::" << interface_full_name + *cs << "::" << interface_full_name << "_ptr" << be_nl; *cs << fname << "::operator-> (void) const" << be_nl; *cs << "{" << be_idt_nl; @@ -745,21 +745,21 @@ be_interface::gen_var_impl (char *interface_local_name, *cs << "}" << be_nl << be_nl; // in, inout, out, and _retn - *cs << "::" << interface_full_name + *cs << "::" << interface_full_name << "_ptr" << be_nl; *cs << fname << "::in (void) const" << be_nl; *cs << "{" << be_idt_nl; *cs << "return this->ptr_;" << be_uidt_nl; *cs << "}" << be_nl << be_nl; - *cs << "::" << interface_full_name + *cs << "::" << interface_full_name << "_ptr &" << be_nl; *cs << fname << "::inout (void)" << be_nl; *cs << "{" << be_idt_nl; *cs << "return this->ptr_;" << be_uidt_nl; *cs << "}" << be_nl << be_nl; - *cs << "::" << interface_full_name + *cs << "::" << interface_full_name << "_ptr &" << be_nl; *cs << fname << "::out (void)" << be_nl; *cs << "{" << be_idt_nl; @@ -769,12 +769,12 @@ be_interface::gen_var_impl (char *interface_local_name, *cs << "return this->ptr_;" << be_uidt_nl; *cs << "}" << be_nl << be_nl; - *cs << "::" << interface_full_name + *cs << "::" << interface_full_name << "_ptr" << be_nl; *cs << fname << "::_retn (void)" << be_nl; *cs << "{" << be_idt_nl; *cs << "// yield ownership of managed obj reference" << be_nl; - *cs << "::" << interface_full_name + *cs << "::" << interface_full_name << "_ptr val = this->ptr_;" << be_nl; *cs << "this->ptr_ = ::" << interface_full_name << "::_nil ();" << be_nl; @@ -782,18 +782,18 @@ be_interface::gen_var_impl (char *interface_local_name, *cs << "}" << be_nl << be_nl; // Hooks for the global static functions used by non-defined interfaces. - *cs << "::" << interface_full_name + *cs << "::" << interface_full_name << "_ptr" << be_nl << fname << "::tao_duplicate (" << interface_local_name << "_ptr p)" << be_nl << "{" << be_idt_nl - << "return ::" << interface_full_name + << "return ::" << interface_full_name << "::_duplicate (p);" << be_uidt_nl << "}" << be_nl << be_nl; *cs << "void" << be_nl - << fname << "::tao_release (" << interface_local_name + << fname << "::tao_release (" << interface_local_name << "_ptr p)" << be_nl << "{" << be_idt_nl << "CORBA::release (p);" << be_uidt_nl @@ -802,18 +802,18 @@ be_interface::gen_var_impl (char *interface_local_name, *cs << "::" << interface_full_name << "_ptr" << be_nl << fname << "::tao_nil (void)" << be_nl << "{" << be_idt_nl - << "return ::" << interface_full_name + << "return ::" << interface_full_name << "::_nil ();" << be_uidt_nl << "}" << be_nl << be_nl; *cs << "::" << interface_full_name << "_ptr" << be_nl << fname << "::tao_narrow (" << be_idt << be_idt_nl - << "CORBA::Object *p," << be_nl - << "CORBA::Environment &ACE_TRY_ENV" << be_uidt_nl + << "CORBA::Object *p" << be_nl + << "TAO_ENV_ARG_DECL" << be_uidt_nl << ")" << be_uidt_nl << "{" << be_idt_nl - << "return ::" << interface_full_name - << "::_narrow (p, ACE_TRY_ENV);" + << "return ::" << interface_full_name + << "::_narrow (p TAO_ENV_ARG_PARAMETER);" << be_uidt_nl << "}" << be_nl << be_nl; @@ -821,8 +821,8 @@ be_interface::gen_var_impl (char *interface_local_name, << fname << "::tao_upcast (void *src)" << be_nl << "{" << be_idt_nl << interface_local_name << " **tmp =" << be_idt_nl - << "ACE_static_cast (" << interface_local_name - << " **, src);" + << "ACE_static_cast (" << interface_local_name + << " **, src);" << be_uidt_nl << "return *tmp;" << be_uidt_nl << "}\n\n"; @@ -859,31 +859,31 @@ be_interface::gen_out_defn (char *interface_name) // No default constructor. // Constructor from a pointer. - *ch << namebuf << " (" << interface_name + *ch << namebuf << " (" << interface_name << "_ptr &);" << be_nl; // Constructor from a _var &. - *ch << namebuf << " (" << interface_name + *ch << namebuf << " (" << interface_name << "_var &);" << be_nl; // Constructor from a _out &. - *ch << namebuf << " (const " << namebuf + *ch << namebuf << " (const " << namebuf << " &);" << be_nl; // Assignment operator from a _out & - *ch << namebuf << " &operator= (const " << namebuf + *ch << namebuf << " &operator= (const " << namebuf << " &);" << be_nl; // Assignment operator from a pointer &, cast operator, ptr fn, operator // -> and any other extra operators. // Only interface allows assignment from var &. - *ch << namebuf << " &operator= (const " << interface_name + *ch << namebuf << " &operator= (const " << interface_name << "_var &);" << be_nl; - *ch << namebuf << " &operator= (" << interface_name + *ch << namebuf << " &operator= (" << interface_name << "_ptr);" << be_nl; // Cast. - *ch << "operator " << interface_name + *ch << "operator " << interface_name << "_ptr &();" << be_nl; // ptr fn @@ -941,7 +941,7 @@ be_interface::gen_out_impl (char *interface_local_name, << be_nl << be_nl; // Constructor from a _ptr. - *ci << fname << "::" << lname + *ci << fname << "::" << lname << " (" << interface_local_name << "_ptr &p)" << be_nl; *ci << " : ptr_ (p)" << be_nl; @@ -951,7 +951,7 @@ be_interface::gen_out_impl (char *interface_local_name, *ci << "}" << be_nl << be_nl; // Constructor from _var &. - *ci << fname << "::" << lname + *ci << fname << "::" << lname << " (" << interface_local_name << "_var &p) // constructor from _var" << be_nl; *ci << " : ptr_ (p.out ())" << be_nl; @@ -962,7 +962,7 @@ be_interface::gen_out_impl (char *interface_local_name, *ci << "}" << be_nl << be_nl; // Copy constructor. - *ci << fname << "::" << lname + *ci << fname << "::" << lname << " (const ::" << interface_full_name << "_out &p) // copy constructor" << be_nl; *ci << " : ptr_ (ACE_const_cast (" << interface_local_name @@ -970,7 +970,7 @@ be_interface::gen_out_impl (char *interface_local_name, *ci << "{}" << be_nl << be_nl; // Assignment operator from _out &. - *ci << "::" << fname + *ci << "::" << fname << " &" << be_nl; *ci << fname << "::operator= (const ::" << interface_full_name << "_out &p)" << be_nl; @@ -1007,7 +1007,7 @@ be_interface::gen_out_impl (char *interface_local_name, *ci << "}" << be_nl << be_nl; // ptr function. - *ci << "::" << interface_full_name + *ci << "::" << interface_full_name << "_ptr &" << be_nl; *ci << fname << "::ptr (void) // ptr" << be_nl; *ci << "{" << be_idt_nl; @@ -1015,7 +1015,7 @@ be_interface::gen_out_impl (char *interface_local_name, *ci << "}" << be_nl << be_nl; // operator-> - *ci << "::" << interface_full_name + *ci << "::" << interface_full_name << "_ptr" << be_nl; *ci << fname << "::operator-> (void)" << be_nl; *ci << "{" << be_idt_nl; @@ -2091,10 +2091,8 @@ be_interface::gen_skel_helper (be_interface *derived, << "_skel (" << be_idt << be_idt_nl << "TAO_ServerRequest &req, " << be_nl << "void *obj," << be_nl - << "void *context," << be_nl - << "CORBA::Environment &ACE_TRY_ENV =" << be_idt_nl - << "TAO_default_environment ()" - << be_uidt << be_uidt_nl + << "void *context" << be_nl + << "TAO_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl << ");" << be_uidt << "\n\n"; } else @@ -2106,8 +2104,8 @@ be_interface::gen_skel_helper (be_interface *derived, << "_skel (" << be_idt << be_idt_nl << "TAO_ServerRequest &req," << be_nl << "void *obj," << be_nl - << "void *context," << be_nl - << "CORBA::Environment &ACE_TRY_ENV" << be_uidt_nl + << "void *context" << be_nl + << "TAO_ENV_ARG_DECL" << be_uidt_nl << ")" << be_uidt_nl << "{" << be_idt_nl; *os << ancestor->full_skel_name () @@ -2120,8 +2118,8 @@ be_interface::gen_skel_helper (be_interface *derived, << "req," << be_nl << "(" << ancestor->full_skel_name () << "_ptr) impl," << be_nl - << "context," << be_nl - << " ACE_TRY_ENV" << be_uidt_nl + << "context" << be_nl + << "TAO_ENV_ARG_PARAMETER" << be_uidt_nl << ");" << be_uidt << be_uidt_nl << "}\n"; } @@ -2144,10 +2142,8 @@ be_interface::gen_skel_helper (be_interface *derived, << "_skel (" << be_idt << be_idt_nl << "TAO_ServerRequest &req," << be_nl << "void *obj," << be_nl - << "void *context," << be_nl - << "CORBA::Environment &ACE_TRY_ENV =" << be_idt_nl - << "TAO_default_environment ()" - << be_uidt << be_uidt_nl + << "void *context" << be_nl + << "TAO_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl << ");" << be_uidt << "\n\n"; } else @@ -2159,8 +2155,8 @@ be_interface::gen_skel_helper (be_interface *derived, << "_skel (" << be_idt << be_idt_nl << "TAO_ServerRequest &req," << be_nl << "void *obj," << be_nl - << "void *context," << be_nl - << "CORBA::Environment &ACE_TRY_ENV" << be_uidt_nl + << "void *context" << be_nl + << "TAO_ENV_ARG_DECL" << be_uidt_nl << ")" << be_uidt_nl << "{" << be_idt_nl << ancestor->full_skel_name () @@ -2173,8 +2169,8 @@ be_interface::gen_skel_helper (be_interface *derived, << "req," << be_nl << "(" << ancestor->full_skel_name () << "_ptr) impl," << be_nl - << "context," << be_nl - << "ACE_TRY_ENV" << be_uidt_nl + << "context" << be_nl + << "TAO_ENV_ARG_PARAMETER" << be_uidt_nl << ");" << be_uidt << be_uidt_nl << "}\n"; } @@ -2193,10 +2189,8 @@ be_interface::gen_skel_helper (be_interface *derived, << "_skel (" << be_idt << be_idt_nl << "TAO_ServerRequest &req," << be_nl << "void *obj," << be_nl - << "void *context," << be_nl - << "CORBA::Environment &ACE_TRY_ENV = " << be_idt_nl - << "TAO_default_environment ()" - << be_uidt << be_uidt_nl + << "void *context" << be_nl + << "TAO_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl << ");" << be_uidt << "\n\n"; } else @@ -2209,8 +2203,8 @@ be_interface::gen_skel_helper (be_interface *derived, << "_skel (" << be_idt << be_idt_nl << "TAO_ServerRequest &req," << be_nl << "void *obj," << be_nl - << "void *context," << be_nl - << "CORBA::Environment &ACE_TRY_ENV" << be_uidt_nl + << "void *context" << be_nl + << "TAO_ENV_ARG_DECL" << be_uidt_nl << ")" << be_uidt_nl << "{" << be_idt_nl << ancestor->full_skel_name () @@ -2223,8 +2217,8 @@ be_interface::gen_skel_helper (be_interface *derived, << "req," << be_nl << "(" << ancestor->full_skel_name () << "_ptr) impl," << be_nl - << "context," << be_nl - << "ACE_TRY_ENV" << be_uidt_nl + << "context" << be_nl + << "TAO_ENV_ARG_PARAMETER" << be_uidt_nl << ");" << be_uidt << be_uidt_nl << "}\n"; } |