diff options
| author | boris <boris@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-01-07 19:48:04 +0000 |
|---|---|---|
| committer | boris <boris@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-01-07 19:48:04 +0000 |
| commit | 1a030494156ba9d9d48038831dbc71cea694d235 (patch) | |
| tree | 52b43e61e0ecaadcd853a224b2c8f334c314b024 | |
| parent | e789c44511e2bdc60c6ca33219e6df602a4a8389 (diff) | |
| download | ATCD-1a030494156ba9d9d48038831dbc71cea694d235.tar.gz | |
ChangeLogTag: Wed Jan 7 13:52:13 2004 Boris Kolpackov <boris@dre.vanderbilt.edu>
| -rw-r--r-- | TAO/ChangeLog | 8 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/CosLifeCycle.idl | 4 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/RtecEventChannelAdmin.idl | 4 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/mgm.idl | 39 |
4 files changed, 12 insertions, 43 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 4cb80163ff4..6e25762846a 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,11 @@ +Wed Jan 7 13:52:13 2004 Boris Kolpackov <boris@dre.vanderbilt.edu> + + * orbsvcs/orbsvcs/CosLifeCycle.idl: + * orbsvcs/orbsvcs/RtecEventChannelAdmin.idl: + + Fixed name redefinition bugs and recoded usage of deprecated + anonymous sequences. + Wed Jan 7 13:30:28 2004 Chad Elliott <elliott_c@ociweb.com> * utils/wxNamingViewer/wxNamingViewer.mpc: diff --git a/TAO/orbsvcs/orbsvcs/CosLifeCycle.idl b/TAO/orbsvcs/orbsvcs/CosLifeCycle.idl index f3c1fb266b7..33b6bdbffed 100644 --- a/TAO/orbsvcs/orbsvcs/CosLifeCycle.idl +++ b/TAO/orbsvcs/orbsvcs/CosLifeCycle.idl @@ -46,11 +46,11 @@ module CosLifeCycle typedef Object _Factory; typedef sequence <_Factory> Factories; - typedef struct NVP + struct NameValuePair { CosNaming::Istring name; any value; - } NameValuePair; + }; typedef sequence <NameValuePair> Criteria; diff --git a/TAO/orbsvcs/orbsvcs/RtecEventChannelAdmin.idl b/TAO/orbsvcs/orbsvcs/RtecEventChannelAdmin.idl index 376af817329..b217e6bffca 100644 --- a/TAO/orbsvcs/orbsvcs/RtecEventChannelAdmin.idl +++ b/TAO/orbsvcs/orbsvcs/RtecEventChannelAdmin.idl @@ -192,7 +192,7 @@ module RtecEventChannelAdmin /// Resume the reception of events. void resume_connection (); -#if 0 +/* //@{ void checkpoint (in RtecEventComm::SequenceNumber last_received) raises (Invalid_Checkpoint); @@ -201,7 +201,7 @@ module RtecEventChannelAdmin void resend_by_date (in RtecEventComm::Time last_timestamp) raises (Invalid_Resend_Request); //@} -#endif /* 0 */ +*/ }; /** diff --git a/TAO/orbsvcs/orbsvcs/mgm.idl b/TAO/orbsvcs/orbsvcs/mgm.idl deleted file mode 100644 index b9470031486..00000000000 --- a/TAO/orbsvcs/orbsvcs/mgm.idl +++ /dev/null @@ -1,39 +0,0 @@ -// -// $Id$ -// -// ================================================================ -// -// = LIBRARY -// TAO_PortableGroup -// -// = FILENAME -// mgm.pidl -// -// = DESCRIPTION -// -// This file contains the multicast group manager interface from -// the MIOP specification. It is currently unused. -// -// ================================================================ - - -#ifdef _MGM_idl -#define _MGM_idl - -#include "PortableGroup.idl" - -module MGM { - // Property values - typedef long GroupCreationMode - - const GroupCreationMode CREATE_ADDRESS_DEFERED = 0; - const GroupCreationMode CREATE_ADDRESS_GENERATED = 1; - const GroupCreationMode CREATE_ADDRESS_SUPPLIED = 2; - - interface ObjectGroupFactory : - PortableGroup::GenericFactory, - PortableGroup::PropertyManager, - PortableGroup::ObjectGroupManager {} -}; - -#endif // _MGM_idl |