diff options
| author | mhengstmengel <mhengstmengel@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2011-12-13 14:54:44 +0000 |
|---|---|---|
| committer | mhengstmengel <mhengstmengel@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2011-12-13 14:54:44 +0000 |
| commit | e63fb75d787d5526d453fb43bc0d7857278aac86 (patch) | |
| tree | f2c09f1d8c9774b12a98675da1aa09378c53283f /TAO/TAO_IDL/be_include | |
| parent | 53457445b8068504b31fe94faca96441faf4834e (diff) | |
| download | ATCD-e63fb75d787d5526d453fb43bc0d7857278aac86.tar.gz | |
Tue Dec 13 13:33:25 UTC 2011 Marijke Hengstmengel
<mhengstmengel@remedy.nl>
Merged changes from our work branch. Changes for home factory
with a connector.
=== start changelog ===
Tue Dec 13 11:23:20 UTC 2011 Johnny Willemsen
<jwillemsen@remedy.nl>
* TAO_IDL/be/be_visitor_home/home_svs.cpp:
If the factory method returns nil throw a
CreateFailure
Tue Dec 13 11:03:39 UTC 2011 Johnny Willemsen
<jwillemsen@remedy.nl>
* TAO_IDL/be/be_visitor_home/home_svs.cpp:
Fixed scoping
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
=== end changelog ===
Tue Dec 13 13:37:25 UTC 2011 Marijke Hengstmengel
<mhengstmengel@remedy.nl>
Merged changes from our work branch. Test Home with connectors.F
=== start changelog ===
Tue Dec 13 13:17:07 UTC 2011 Marijke Hengstmengel
<mhengstmengel@remedy.nl>
* bin/ciao_tests.lst
Added HomeTest
Tue Dec 13 13:00:07 UTC 2011 Marijke Hengstmengel
<mhengstmengel@remedy.nl>
* connectors/dds4ccm/tests/HomeTest/HomeComp/HomeT_Home.mpc:
* connectors/dds4ccm/tests/HomeTest/HomeComp/HomeT_HomeC.idl:
* connectors/dds4ccm/tests/HomeTest/HomeComp/HomeT_HomeC_exec.cpp:
* connectors/dds4ccm/tests/HomeTest/HomeComp/controller.cpp:
* connectors/dds4ccm/tests/HomeTest/descriptors/run_test.pl:
Home created now a connector instance, without
activating it.
Mon Dec 12 10:59:27 UTC 2011 Marijke Hengstmengel
<mhengstmengel@remedy.nl>
* connectors/dds4ccm/tests/HomeTest/HomeComp/HomeT_Home.mpc:
* connectors/dds4ccm/tests/HomeTest/HomeComp/HomeT_HomeC.idl:
* connectors/dds4ccm/tests/HomeTest/HomeComp/HomeT_HomeC_exec.cpp:
* connectors/dds4ccm/tests/HomeTest/HomeComp/controller.cpp:
* connectors/dds4ccm/tests/HomeTest/descriptors/DeploymentPlanConnOnly.cdp:
* connectors/dds4ccm/tests/HomeTest/descriptors/run_test.pl:
Add controller, acting on Home component
* connectors/dds4ccm/tests/HomeTest/HomeComp/client.cpp:
Removed this file.
Thu Dec 8 16:08:07 UTC 2011 Marijke Hengstmengel
<mhengstmengel@remedy.nl>
* connectors/dds4ccm/tests/HomeTest:
* connectors/dds4ccm/tests/HomeTest/Base:
* connectors/dds4ccm/tests/HomeTest/Base/HomeT_Base.idl:
* connectors/dds4ccm/tests/HomeTest/Base/HomeT_Base.mpc:
* connectors/dds4ccm/tests/HomeTest/Connector:
* connectors/dds4ccm/tests/HomeTest/Connector/HomeT_Connector.idl:
* connectors/dds4ccm/tests/HomeTest/Connector/HomeT_Connector.mpc:
* connectors/dds4ccm/tests/HomeTest/HomeComp:
* connectors/dds4ccm/tests/HomeTest/HomeComp/HomeT_Home.mpc:
* connectors/dds4ccm/tests/HomeTest/HomeComp/HomeT_HomeC.idl:
* connectors/dds4ccm/tests/HomeTest/HomeComp/HomeT_HomeC_exec.h:
* connectors/dds4ccm/tests/HomeTest/HomeComp/HomeT_HomeC_exec.cpp:
* connectors/dds4ccm/tests/HomeTest/HomeComp/client.cpp:
* connectors/dds4ccm/tests/HomeTest/descriptors:
* connectors/dds4ccm/tests/HomeTest/descriptors/DeploymentPlanConnOnly.cdp:
* connectors/dds4ccm/tests/HomeTest/descriptors/USER_QOS_PROFILES.xml:
* connectors/dds4ccm/tests/HomeTest/descriptors/run_test.pl:
First commit new test for Connector Homes.
=== end changelog ===
Diffstat (limited to 'TAO/TAO_IDL/be_include')
| -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 |
2 files changed, 3 insertions, 1 deletions
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); |