diff options
| author | Phil Mesnier <mesnier_p@ociweb.com> | 2013-06-19 22:49:55 +0000 |
|---|---|---|
| committer | Phil Mesnier <mesnier_p@ociweb.com> | 2013-06-19 22:49:55 +0000 |
| commit | 9018ea4376d4dc151e0af22b193d43905f2dfe25 (patch) | |
| tree | a6bfddb3531c6123f03363ba3bd79cb8374c124b /TAO/orbsvcs/orbsvcs/FtRtecEventChannelAdmin.idl | |
| parent | 3dc7958f8cb3419144c037d0e157bb027ac80ceb (diff) | |
| download | ATCD-9018ea4376d4dc151e0af22b193d43905f2dfe25.tar.gz | |
Wed Jun 19 22:41:28 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com>
* NEWS:
Add a comment about IMR List function fix.
* orbsvcs/ImplRepo_Service/LiveCheck.h:
removed unreferenced/unimplemented signatures.
* orbsvcs/orbsvcs/FtRtecEventChannelAdmin.idl:
Cleaning up scoreboard warning. The best fix would be to replace
the union with a struct, since there is only the one member, but I
went with a non-boolean union (to shut up the clang compiler) to
ensure the generated code kept the same acccessor operations.
Changing to a struct would be more efficient, but represents an
interface change that might break existing code.
* orbsvcs/orbsvcs/HTIOP/HTIOP_Connector_Impl.cpp:
* orbsvcs/orbsvcs/IFRService/Container_i.cpp:
* orbsvcs/orbsvcs/PortableGroup/UIPMC_Mcast_Transport.cpp:
* orbsvcs/orbsvcs/Trader/Trader.cpp:
* orbsvcs/orbsvcs/Trader/Trader_T.cpp:
* orbsvcs/tests/ImplRepo/servers_list/server.cpp:
* tao/Storable_FlatFileStream.cpp:
Clean up various scoreboard warnings.
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/FtRtecEventChannelAdmin.idl')
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/FtRtecEventChannelAdmin.idl | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/TAO/orbsvcs/orbsvcs/FtRtecEventChannelAdmin.idl b/TAO/orbsvcs/orbsvcs/FtRtecEventChannelAdmin.idl index 866640ef114..78e362f542c 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtecEventChannelAdmin.idl +++ b/TAO/orbsvcs/orbsvcs/FtRtecEventChannelAdmin.idl @@ -28,13 +28,19 @@ module FtRtecEventChannelAdmin RtecEventChannelAdmin::SupplierQOS qos; }; - union ProxyPushConsumerConnectionParamter switch (boolean) + union ProxyPushConsumerConnectionParamter switch (short) { - case FALSE: - case TRUE: + default: ProxyPushConsumerConnectionInfo info; }; + /* + struct ProxyPushConsumerConnectionParamter + { + ProxyPushConsumerConnectionInfo info; + }; + */ + struct ProxyPushConsumerStat { ObjectId object_id; @@ -48,12 +54,18 @@ module FtRtecEventChannelAdmin RtecEventChannelAdmin::ConsumerQOS qos; }; - union ProxyPushSupplierConnectionParamter switch (boolean) + union ProxyPushSupplierConnectionParamter switch (short) + { + default: + ProxyPushSupplierConnectionInfo info; + }; + + /* + struct ProxyPushSupplierConnectionParamter { - case FALSE: - case TRUE: ProxyPushSupplierConnectionInfo info; }; + */ struct ProxyPushSupplierStat { |