diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2011-12-13 10:20:59 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2011-12-13 10:20:59 +0000 |
| commit | 785418cdda1c5f84a91fb88ace32e37a405d03fb (patch) | |
| tree | 97777f8d2c0c76d1af5b2fa050bd52f8d0195d66 | |
| parent | ee9de6e18e349936ee734b30bd659d4710bdbd12 (diff) | |
| download | ATCD-785418cdda1c5f84a91fb88ace32e37a405d03fb.tar.gz | |
Tue Dec 13 10:19:29 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl>
* TAO_IDL/be/be_visitor_component/context_svs.cpp:
* TAO_IDL/be/be_visitor_operation.cpp:
* TAO_IDL/be/be_visitor_operation/rettype.cpp:
* TAO_IDL/be_include/be_connector.h:
* TAO_IDL/be_include/be_visitor_operation/rettype.h:
Generate the needed return type when we have a home factory
method
that returns a connector type
| -rw-r--r-- | TAO/ChangeLog.BRANCH | 9 | ||||
| -rw-r--r-- | TAO/TAO_IDL/be/be_visitor_operation.cpp | 1 | ||||
| -rw-r--r-- | TAO/TAO_IDL/be/be_visitor_operation/rettype.cpp | 7 | ||||
| -rw-r--r-- | TAO/TAO_IDL/be_include/be_connector.h | 1 | ||||
| -rw-r--r-- | TAO/TAO_IDL/be_include/be_visitor_operation/rettype.h | 3 |
5 files changed, 20 insertions, 1 deletions
diff --git a/TAO/ChangeLog.BRANCH b/TAO/ChangeLog.BRANCH new file mode 100644 index 00000000000..656f27b51b4 --- /dev/null +++ b/TAO/ChangeLog.BRANCH @@ -0,0 +1,9 @@ +Tue Dec 13 10:19:29 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl> + + * TAO_IDL/be/be_visitor_component/context_svs.cpp: + * TAO_IDL/be/be_visitor_operation.cpp: + * TAO_IDL/be/be_visitor_operation/rettype.cpp: + * TAO_IDL/be_include/be_connector.h: + * TAO_IDL/be_include/be_visitor_operation/rettype.h: + Generate the needed return type when we have a home factory method + that returns a connector type diff --git a/TAO/TAO_IDL/be/be_visitor_operation.cpp b/TAO/TAO_IDL/be/be_visitor_operation.cpp index a8a88696190..67a27436f8f 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation.cpp @@ -33,6 +33,7 @@ #include "be_valuetype_fwd.h" #include "be_component.h" #include "be_component_fwd.h" +#include "be_connector.h" #include "be_eventtype.h" #include "be_eventtype_fwd.h" #include "be_home.h" diff --git a/TAO/TAO_IDL/be/be_visitor_operation/rettype.cpp b/TAO/TAO_IDL/be/be_visitor_operation/rettype.cpp index 323474b95be..f7a3c815ad7 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/rettype.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/rettype.cpp @@ -242,6 +242,13 @@ be_visitor_operation_rettype::visit_component ( } int +be_visitor_operation_rettype::visit_connector ( + be_connector *node) +{ + return this->visit_component (node); +} + +int be_visitor_operation_rettype::visit_component_fwd ( be_component_fwd *node) { diff --git a/TAO/TAO_IDL/be_include/be_connector.h b/TAO/TAO_IDL/be_include/be_connector.h index 27c5ee7d74d..bec713f376a 100644 --- a/TAO/TAO_IDL/be_include/be_connector.h +++ b/TAO/TAO_IDL/be_include/be_connector.h @@ -21,7 +21,6 @@ public: virtual void destroy (void); // Narrowing. - DEF_NARROW_FROM_DECL (be_connector); DEF_NARROW_FROM_SCOPE (be_connector); diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/rettype.h b/TAO/TAO_IDL/be_include/be_visitor_operation/rettype.h index bf56ac72d00..ce8858224bd 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_operation/rettype.h +++ b/TAO/TAO_IDL/be_include/be_visitor_operation/rettype.h @@ -76,6 +76,9 @@ public: /// visit a forward declared valuetype node int visit_valuetype_fwd (be_valuetype_fwd *node); + /// visit a connector node + int visit_connector (be_connector *node); + /// visit a component node int visit_component (be_component *node); |