diff options
| author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2005-02-25 01:40:20 +0000 |
|---|---|---|
| committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2005-02-25 01:40:20 +0000 |
| commit | ae8d81e416ce83a9939c9fdfd2f4f856dd0f9c10 (patch) | |
| tree | 6a166cfb1972711f6dbea86b4266fa3b994b6497 | |
| parent | ab3fe7e501ed866633597b186ea9e84e24dc10a0 (diff) | |
| download | ATCD-ae8d81e416ce83a9939c9fdfd2f4f856dd0f9c10.tar.gz | |
ChangeLogTag:Thu Feb 24 17:34:52 2005 Ossama Othman <ossama@dre.vanderbilt.edu>
| -rw-r--r-- | TAO/ChangeLog | 8 | ||||
| -rw-r--r-- | TAO/TAO_IDL/be/be_interface.cpp | 80 |
2 files changed, 51 insertions, 37 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 89b76f6777b..7dc01f5258c 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,11 @@ +Thu Feb 24 17:34:52 2005 Ossama Othman <ossama@dre.vanderbilt.edu> + + * TAO_IDL/be/be_interface.cpp (gen_skel_helper): + + Fixed order of "servant_upcall" and "servant" arguments passed + to "_skel" function corresponding to virtual base class. The + order was inadvertently swapped during skeleton-refactor merge. + Thu Feb 24 16:07:15 2005 J.T. Conklin <jtc@acorntoolworks.com> * orbsvcs/Concurrency_Service/Makefile.am: diff --git a/TAO/TAO_IDL/be/be_interface.cpp b/TAO/TAO_IDL/be/be_interface.cpp index c2586a5937c..a1562b6bd29 100644 --- a/TAO/TAO_IDL/be/be_interface.cpp +++ b/TAO/TAO_IDL/be/be_interface.cpp @@ -1946,9 +1946,9 @@ be_interface::gen_skel_helper (be_interface *derived, *os << "static void" << be_nl << d->local_name () << "_skel (" << be_idt << be_idt_nl - << "TAO_ServerRequest &req, " << be_nl - << "void *obj," << be_nl - << "void *context" << be_nl + << "TAO_ServerRequest & server_request, " << be_nl + << "void * servant_upcall," << be_nl + << "void * servant" << be_nl << "ACE_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl << ");" << be_uidt; } @@ -1960,22 +1960,24 @@ be_interface::gen_skel_helper (be_interface *derived, << derived->full_skel_name () << "::" << d->local_name () << "_skel (" << be_idt << be_idt_nl - << "TAO_ServerRequest &req," << be_nl - << "void *obj," << be_nl - << "void *context" << be_nl + << "TAO_ServerRequest & server_request," << be_nl + << "void * servant_upcall," << be_nl + << "void * servant" << be_nl << "ACE_ENV_ARG_DECL" << be_uidt_nl << ")" << be_uidt_nl << "{" << be_idt_nl; + *os << ancestor->full_skel_name () - << "_ptr impl = static_cast <" + << " * const impl = static_cast<" << derived->full_skel_name () - << "_ptr> (obj);" << be_nl; + << " *> (servant);" << be_nl; + *os << ancestor->full_skel_name () << "::" << d->local_name () << "_skel (" << be_idt << be_idt_nl - << "req," << be_nl - << "impl," << be_nl - << "context" << be_nl + << "server_request," << be_nl + << "servant_upcall," << be_nl + << "impl" << be_nl << "ACE_ENV_ARG_PARAMETER" << be_uidt_nl << ");" << be_uidt << be_uidt_nl << "}"; @@ -1998,9 +2000,9 @@ be_interface::gen_skel_helper (be_interface *derived, *os << "static void" << be_nl << "_get_" << d->local_name () << "_skel (" << be_idt << be_idt_nl - << "TAO_ServerRequest &req," << be_nl - << "void *obj," << be_nl - << "void *context" << be_nl + << "TAO_ServerRequest & server_request," << be_nl + << "void * servant_upcall," << be_nl + << "void * servant" << be_nl << "ACE_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl << ");" << be_uidt; } @@ -2012,22 +2014,24 @@ be_interface::gen_skel_helper (be_interface *derived, << derived->full_skel_name () << "::_get_" << d->local_name () << "_skel (" << be_idt << be_idt_nl - << "TAO_ServerRequest &req," << be_nl - << "void *obj," << be_nl - << "void *context" << be_nl + << "TAO_ServerRequest & server_request," << be_nl + << "void * servant_upcall," << be_nl + << "void * servant" << be_nl << "ACE_ENV_ARG_DECL" << be_uidt_nl << ")" << be_uidt_nl - << "{" << be_idt_nl - << ancestor->full_skel_name () - << "_ptr impl = static_cast <" + << "{" << be_idt_nl; + + *os << ancestor->full_skel_name () + << " * const impl = static_cast<" << derived->full_skel_name () - << "_ptr> (obj);" << be_nl; + << " *> (servant);" << be_nl; + *os << ancestor->full_skel_name () << "::_get_" << d->local_name () << "_skel (" << be_idt << be_idt_nl - << "req," << be_nl - << "impl," << be_nl - << "context" << be_nl + << "server_request," << be_nl + << "servant_upcall," << be_nl + << "impl" << be_nl << "ACE_ENV_ARG_PARAMETER" << be_uidt_nl << ");" << be_uidt << be_uidt_nl << "}"; @@ -2044,9 +2048,9 @@ be_interface::gen_skel_helper (be_interface *derived, *os << "static void" << be_nl << "_set_" << d->local_name () << "_skel (" << be_idt << be_idt_nl - << "TAO_ServerRequest &req," << be_nl - << "void *obj," << be_nl - << "void *context" << be_nl + << "TAO_ServerRequest & server_request," << be_nl + << "void * servant_upcall," << be_nl + << "void * servant" << be_nl << "ACE_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl << ");" << be_uidt; } @@ -2059,22 +2063,24 @@ be_interface::gen_skel_helper (be_interface *derived, << derived->full_skel_name () << "::_set_" << d->local_name () << "_skel (" << be_idt << be_idt_nl - << "TAO_ServerRequest &req," << be_nl - << "void *obj," << be_nl - << "void *context" << be_nl + << "TAO_ServerRequest & server_request," << be_nl + << "void * servant_upcall," << be_nl + << "void * servant" << be_nl << "ACE_ENV_ARG_DECL" << be_uidt_nl << ")" << be_uidt_nl - << "{" << be_idt_nl - << ancestor->full_skel_name () - << "_ptr impl = static_cast <" + << "{" << be_idt_nl; + + *os << ancestor->full_skel_name () + << " * const impl = static_cast<" << derived->full_skel_name () - << "_ptr> (obj);" << be_nl; + << " *> (servant);" << be_nl; + *os << ancestor->full_skel_name () << "::_set_" << d->local_name () << "_skel (" << be_idt << be_idt_nl - << "req," << be_nl - << "impl," << be_nl - << "context" << be_nl + << "server_request," << be_nl + << "servant_upcall," << be_nl + << "impl" << be_nl << "ACE_ENV_ARG_PARAMETER" << be_uidt_nl << ");" << be_uidt << be_uidt_nl << "}"; |