diff options
author | Phil Mesnier <mesnier_p@ociweb.com> | 2013-10-29 03:30:43 +0000 |
---|---|---|
committer | Phil Mesnier <mesnier_p@ociweb.com> | 2013-10-29 03:30:43 +0000 |
commit | 3ca320f7cde982b38c661c438771529810bed1c0 (patch) | |
tree | 71e86a34c4c160f935b462e66ed8ecb803661ad7 | |
parent | a28f465ca4e03fe2e4bcd6f7a10be0e5b0650106 (diff) | |
download | ATCD-3ca320f7cde982b38c661c438771529810bed1c0.tar.gz |
Tue Oct 29 03:24:14 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com>
* TAO_IDL/be/be_visitor_operation/operation.cpp:
Fix the output format.
* tao/Valuetype/AbstractBase_Invocation_Adapter.h:
* tao/Valuetype/AbstractBase_Invocation_Adapter.cpp:
Add missing parameter.
-rw-r--r-- | TAO/ChangeLog | 13 | ||||
-rw-r--r-- | TAO/TAO_IDL/be/be_visitor_operation/operation.cpp | 8 | ||||
-rw-r--r-- | TAO/tao/Valuetype/AbstractBase_Invocation_Adapter.cpp | 6 | ||||
-rw-r--r-- | TAO/tao/Valuetype/AbstractBase_Invocation_Adapter.h | 3 |
4 files changed, 24 insertions, 6 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index a5f7699d574..fea2fd6f5de 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,14 @@ +Tue Oct 29 03:24:14 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com> + + * TAO_IDL/be/be_visitor_operation/operation.cpp: + + Fix the output format. + + * tao/Valuetype/AbstractBase_Invocation_Adapter.h: + * tao/Valuetype/AbstractBase_Invocation_Adapter.cpp: + + Add missing parameter. + Mon Oct 28 21:27:19 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com> * NEWS: @@ -43,7 +54,7 @@ Mon Oct 14 07:50:48 UTC 2013 Johnny Willemsen <jwillemsen@remedy.nl> * orbsvcs/examples/ImR/Combined_Service/test.cpp: No need to print filename - +rr Thu Oct 3 09:36:41 UTC 2013 Johnny Willemsen <jwillemsen@remedy.nl> * NEWS: diff --git a/TAO/TAO_IDL/be/be_visitor_operation/operation.cpp b/TAO/TAO_IDL/be/be_visitor_operation/operation.cpp index 7e64f339b65..9b32efdb647 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/operation.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/operation.cpp @@ -295,10 +295,14 @@ be_visitor_operation::gen_stub_operation_body ( if (node->flags () == AST_Operation::OP_oneway) { *os << "," << be_nl; - *os << "TAO::TAO_ONEWAY_INVOCATION" << be_nl; + *os << "TAO::TAO_ONEWAY_INVOCATION"; } - if (!node->has_in_arguments ()) + if (node->has_in_arguments ()) + { + *os << be_nl; + } + else { if (node->flags () != AST_Operation::OP_oneway) { diff --git a/TAO/tao/Valuetype/AbstractBase_Invocation_Adapter.cpp b/TAO/tao/Valuetype/AbstractBase_Invocation_Adapter.cpp index b9018137a4b..e0baa8f930f 100644 --- a/TAO/tao/Valuetype/AbstractBase_Invocation_Adapter.cpp +++ b/TAO/tao/Valuetype/AbstractBase_Invocation_Adapter.cpp @@ -16,7 +16,8 @@ namespace TAO size_t op_len, int collocation_opportunity, Invocation_Type type, - Invocation_Mode mode) + Invocation_Mode mode, + bool has_in_args) : Invocation_Adapter (target->equivalent_objref (), args, arg_number, @@ -24,7 +25,8 @@ namespace TAO op_len, collocation_opportunity, type, - mode) + mode, + has_in_args) { } } // End namespace TAO diff --git a/TAO/tao/Valuetype/AbstractBase_Invocation_Adapter.h b/TAO/tao/Valuetype/AbstractBase_Invocation_Adapter.h index 498dd7eaae1..8b16ffcd9bb 100644 --- a/TAO/tao/Valuetype/AbstractBase_Invocation_Adapter.h +++ b/TAO/tao/Valuetype/AbstractBase_Invocation_Adapter.h @@ -53,7 +53,8 @@ namespace TAO size_t op_len, int collocation_opportunity, TAO::Invocation_Type type = TAO_TWOWAY_INVOCATION, - TAO::Invocation_Mode mode = TAO_SYNCHRONOUS_INVOCATION); + TAO::Invocation_Mode mode = TAO_SYNCHRONOUS_INVOCATION, + bool has_in_args = false); private: // Don't allow default initializations |