diff options
author | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-03-12 18:21:12 +0000 |
---|---|---|
committer | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-03-12 18:21:12 +0000 |
commit | c2273db3038aa78168712387d0f5b3e156426b7c (patch) | |
tree | 2c8fe02cbe8afbb142516d2949198abb17026740 | |
parent | c79272597708a9ab6ee16c6e19e4486c65774286 (diff) | |
download | ATCD-c2273db3038aa78168712387d0f5b3e156426b7c.tar.gz |
ChangeLogTag: Wed Mar 12 12:19:58 2003 Jeff Parsons <j.parsons@vanderbilt.edu>
-rw-r--r-- | TAO/ChangeLog | 6 | ||||
-rw-r--r-- | TAO/tao/ObjectIDList.cpp | 189 | ||||
-rw-r--r-- | TAO/tao/ObjectIDList.h | 147 | ||||
-rw-r--r-- | TAO/tao/ObjectIDList.i | 199 |
4 files changed, 6 insertions, 535 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index ee7a4c24b86..c56abd8c5a7 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,9 @@ +Wed Mar 12 12:19:58 2003 Jeff Parsons <j.parsons@vanderbilt.edu> + + * tao/ObjectIDListC.*: + + Removed these misspelled filenames from the repository. + Wed Mar 12 10:09:57 2003 Ossama Othman <ossama@uci.edu> * tao/Makefile.am: diff --git a/TAO/tao/ObjectIDList.cpp b/TAO/tao/ObjectIDList.cpp deleted file mode 100644 index 316ba624a6b..00000000000 --- a/TAO/tao/ObjectIDList.cpp +++ /dev/null @@ -1,189 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ -// ****** Code generated by the The ACE ORB (TAO) IDL Compiler ******* -// TAO and the TAO IDL Compiler have been developed by the Center for -// Distributed Object Computing at Washington University, St. Louis. -// -// Information about TAO is available at: -// http://www.cs.wustl.edu/~schmidt/TAO.html -// -// Hand Modified by Vishal Kachroo <vishal@cs.wustl.edu> -// - -#include "tao/ObjectIDList.h" -#include "tao/Typecode.h" -#include "tao/ORB.h" -#include "tao/Any.h" - -#if !defined (__ACE_INLINE__) -#include "tao/ObjectIDList.i" -#endif /* !defined INLINE */ - -#if !defined (_CORBA_ORB_OBJECTIDLIST_CS_) -#define _CORBA_ORB_OBJECTIDLIST_CS_ - -// ************************************************************* -// CORBA::ORB_ObjectIdList -// ************************************************************* - -CORBA::ORB_ObjectIdList::ORB_ObjectIdList (void) -{} -CORBA::ORB_ObjectIdList::ORB_ObjectIdList (CORBA::ULong max) // uses max size - : -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) - TAO_Unbounded_String_Sequence -#else /* TAO_USE_SEQUENCE_TEMPLATES */ - TAO_Unbounded_String_Sequence -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - (max) -{} -CORBA::ORB_ObjectIdList::ORB_ObjectIdList (CORBA::ULong max, CORBA::ULong length, char * *buffer, CORBA::Boolean release) - : -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) - TAO_Unbounded_String_Sequence -#else /* TAO_USE_SEQUENCE_TEMPLATES */ - TAO_Unbounded_String_Sequence -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - (max, length, buffer, release) -{} -CORBA::ORB_ObjectIdList::ORB_ObjectIdList (const CORBA::ORB_ObjectIdList &seq) // copy ctor - : -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) - TAO_Unbounded_String_Sequence -#else /* TAO_USE_SEQUENCE_TEMPLATES */ - TAO_Unbounded_String_Sequence -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - (seq) -{} -CORBA::ORB_ObjectIdList::~ORB_ObjectIdList (void) // dtor -{} - - -#endif /* end #if !defined */ - -static const CORBA::Long _oc_CORBA_ORB_ObjectIdList[] = -{ - TAO_ENCAP_BYTE_ORDER, // byte order - 39, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4f52), ACE_NTOHL (0x422f4f62), ACE_NTOHL (0x6a656374), ACE_NTOHL (0x49644c69), ACE_NTOHL (0x73743a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/ORB/ObjectIdList:1.0 - 13, ACE_NTOHL (0x4f626a65), ACE_NTOHL (0x63744964), ACE_NTOHL (0x4c697374), ACE_NTOHL (0x0), // name = ObjectIdList - CORBA::tk_sequence, // typecode kind - 84, // encapsulation length - TAO_ENCAP_BYTE_ORDER, // byte order - CORBA::tk_alias, // typecode kind for typedefs - 68, // encapsulation length - TAO_ENCAP_BYTE_ORDER, // byte order - 35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4f52), ACE_NTOHL (0x422f4f62), ACE_NTOHL (0x6a656374), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/ORB/ObjectId:1.0 - 9, ACE_NTOHL (0x4f626a65), ACE_NTOHL (0x63744964), ACE_NTOHL (0x0), // name = ObjectId - CORBA::tk_string, - 0, // string length - 0, -}; -static CORBA::TypeCode _tc_TAO_tc_CORBA_ORB_ObjectIdList (CORBA::tk_alias, sizeof (_oc_CORBA_ORB_ObjectIdList), (char *) &_oc_CORBA_ORB_ObjectIdList, 0, sizeof (CORBA::ORB_ObjectIdList)); -CORBA::TypeCode_ptr CORBA::ORB::_tc_ObjectIdList = &_tc_TAO_tc_CORBA_ORB_ObjectIdList; - -void operator<<= ( - CORBA::Any &_tao_any, - const CORBA::ORB_ObjectIdList &_tao_elem - ) // copying -{ - TAO_OutputCDR stream; - stream << _tao_elem; - - _tao_any._tao_replace (CORBA::ORB::_tc_ObjectIdList, - TAO_ENCAP_BYTE_ORDER, - stream.begin ()); -} - -CORBA::Boolean -operator<< ( - TAO_OutputCDR &strm, - const CORBA::ORB_ObjectIdList &_tao_sequence - ) -{ - if (strm << _tao_sequence.length ()) - { - // encode all elements - CORBA::Boolean _tao_marshal_flag = 1; - for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++) - _tao_marshal_flag = (strm << _tao_sequence[i].in ()); - return _tao_marshal_flag; - } - return 0; // error -} - -CORBA::Boolean -operator>> (TAO_InputCDR &strm, CORBA::ORB_ObjectIdList &_tao_sequence) -{ - CORBA::ULong _tao_seq_len; - if (strm >> _tao_seq_len) - { - // set the length of the sequence - _tao_sequence.length (_tao_seq_len); - // retrieve all the elements - CORBA::Boolean _tao_marshal_flag = 1; - for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++) - _tao_marshal_flag = (strm >> _tao_sequence[i].out ()); - return _tao_marshal_flag; - } - return 0; // error -} - -void CORBA::ORB_ObjectIdList::_tao_any_destructor (void *x) -{ - CORBA::ORB_ObjectIdList *tmp = ACE_static_cast (CORBA::ORB_ObjectIdList*, x); - delete tmp; -} - -void operator<<= (CORBA::Any &_tao_any, CORBA::ORB_ObjectIdList *_tao_elem) -{ - TAO_OutputCDR stream; - stream << *_tao_elem; - - _tao_any._tao_replace (CORBA::ORB::_tc_ObjectIdList, - TAO_ENCAP_BYTE_ORDER, - stream.begin (), - 1, - _tao_elem, - CORBA::ORB_ObjectIdList::_tao_any_destructor); -} - -CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::ORB_ObjectIdList *&_tao_elem) -{ - ACE_TRY_NEW_ENV - { - CORBA::TypeCode_var type = _tao_any.type (); - if (!type->equal (CORBA::ORB::_tc_ObjectIdList ACE_ENV_ARG_PARAMETER)) return 0; // not equal - ACE_TRY_CHECK; - if (_tao_any.any_owns_data ()) - { - _tao_elem = (CORBA::ORB_ObjectIdList *)_tao_any.value (); - return 1; - } - else - { - ACE_NEW_RETURN (_tao_elem, CORBA::ORB_ObjectIdList, 0); - TAO_InputCDR stream (_tao_any._tao_get_cdr (), - _tao_any._tao_byte_order ()); - if (stream >> *_tao_elem) - { - ((CORBA::Any *)&_tao_any)->_tao_replace ( - CORBA::ORB::_tc_ObjectIdList, - 1, - _tao_elem, - CORBA::ORB_ObjectIdList::_tao_any_destructor); - return 1; - } - else - { - delete _tao_elem; - } - } - } - ACE_CATCHANY - { - delete _tao_elem; - return 0; - } - ACE_ENDTRY; - return 0; -} diff --git a/TAO/tao/ObjectIDList.h b/TAO/tao/ObjectIDList.h deleted file mode 100644 index e66b35067bf..00000000000 --- a/TAO/tao/ObjectIDList.h +++ /dev/null @@ -1,147 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ -// ****** Code generated by the The ACE ORB (TAO) IDL Compiler ******* -// TAO and the TAO IDL Compiler have been developed by the Center for -// Distributed Object Computing at Washington University, St. Louis. -// -// Information about TAO is available at: -// http://www.cs.wustl.edu/~schmidt/TAO.html -// -// Hand Modified by Vishal Kachroo <vishal@cs.wustl.edu> -// - -#ifndef OBJECTIDLIST_H_ -#define OBJECTIDLIST_H_ -#include "ace/pre.h" - -#include "tao/corbafwd.h" -#include "tao/Sequence.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - - -#if defined (TAO_EXPORT_MACRO) -#undef TAO_EXPORT_MACRO -#endif -#define TAO_EXPORT_MACRO -#if defined(_MSC_VER) -#if (_MSC_VER >= 1200) -#pragma warning(push) -#endif /* _MSC_VER >= 1200 */ -#pragma warning(disable:4250) -#endif /* _MSC_VER */ - - -#if !defined (_CORBA_ORB_OBJECTIDLIST_CH_) -#define _CORBA_ORB_OBJECTIDLIST_CH_ - -// ************************************************************* -// ObjectIdList -// ************************************************************* - -namespace CORBA -{ - class TAO_Export ORB_ObjectIdList : public -#if !defined (TAO_USE_SEQUENCE_TEMPLATES) - TAO_Unbounded_String_Sequence -#else /* TAO_USE_SEQUENCE_TEMPLATES */ - TAO_Unbounded_String_Sequence -#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - { - public: - ORB_ObjectIdList (void); // default ctor - ORB_ObjectIdList (CORBA::ULong max); // uses max size - ORB_ObjectIdList ( - CORBA::ULong max, - CORBA::ULong length, - char * *buffer, - CORBA::Boolean release=0 - ); - ORB_ObjectIdList (const ORB_ObjectIdList &); // copy ctor - ~ORB_ObjectIdList (void); // dtor - - static void _tao_any_destructor (void*); - }; - - typedef ORB_ObjectIdList *ORB_ObjectIdList_ptr; - -#endif /* end #if !defined */ - -#if !defined (_CORBA_ORB_OBJECTIDLIST___VAR_CH_) -#define _CORBA_ORB_OBJECTIDLIST___VAR_CH_ - - // ************************************************************* - // class CORBA::ORB::ObjectIdList_var - // ************************************************************* - - class TAO_Export ORB_ObjectIdList_var - { - public: - ORB_ObjectIdList_var (void); // default constructor - ORB_ObjectIdList_var (ORB_ObjectIdList *); - ORB_ObjectIdList_var (const ORB_ObjectIdList_var &); // copy constructor - ~ORB_ObjectIdList_var (void); // destructor - - ORB_ObjectIdList_var &operator= (ORB_ObjectIdList *); - ORB_ObjectIdList_var &operator= (const ORB_ObjectIdList_var &); - ORB_ObjectIdList *operator-> (void); - const ORB_ObjectIdList *operator-> (void) const; - - operator const ORB_ObjectIdList &() const; - operator ORB_ObjectIdList &(); - operator ORB_ObjectIdList &() const; - TAO_SeqElem_String_Manager operator[] (CORBA::ULong slot); - // in, inout, out, _retn - const ORB_ObjectIdList &in (void) const; - ORB_ObjectIdList &inout (void); - ORB_ObjectIdList *&out (void); - ORB_ObjectIdList *_retn (void); - ORB_ObjectIdList *ptr (void) const; - - private: - ORB_ObjectIdList *ptr_; - }; - -#endif /* end #if !defined */ - - -#if !defined (_CORBA_ORB_OBJECTIDLIST___OUT_CH_) -#define _CORBA_ORB_OBJECTIDLIST___OUT_CH_ - - class TAO_Export ORB_ObjectIdList_out - { - public: - ORB_ObjectIdList_out (ORB_ObjectIdList *&); - ORB_ObjectIdList_out (ORB_ObjectIdList_var &); - ORB_ObjectIdList_out (const ORB_ObjectIdList_out &); - ORB_ObjectIdList_out &operator= (const ORB_ObjectIdList_out &); - ORB_ObjectIdList_out &operator= (ORB_ObjectIdList *); - operator ORB_ObjectIdList *&(); - ORB_ObjectIdList *&ptr (void); - ORB_ObjectIdList *operator-> (void); - TAO_SeqElem_String_Manager operator[] (CORBA::ULong slot); - - private: - ORB_ObjectIdList *&ptr_; - // assignment from T_var not allowed - void operator= (const ORB_ObjectIdList_var &); - }; - -#endif /* end #if !defined */ -} // End CORBA namespace. - -TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ORB_ObjectIdList &); // -TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ORB_ObjectIdList &); - -#if defined (__ACE_INLINE__) -#include "tao/ObjectIDList.i" -#endif /* defined INLINE */ - -#if defined(_MSC_VER) && (_MSC_VER >= 1200) -#pragma warning(pop) -#endif /* _MSC_VER */ - -#include "ace/post.h" -#endif /* ifndef */ diff --git a/TAO/tao/ObjectIDList.i b/TAO/tao/ObjectIDList.i deleted file mode 100644 index c76fcaeaccd..00000000000 --- a/TAO/tao/ObjectIDList.i +++ /dev/null @@ -1,199 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// ****** Code generated by the The ACE ORB (TAO) IDL Compiler ******* -// TAO and the TAO IDL Compiler have been developed by the Center for -// Distributed Object Computing at Washington University, St. Louis. -// -// Information about TAO is available at: -// http://www.cs.wustl.edu/~schmidt/TAO.html -// -// Hand modified by Vishal Kachroo <vishal@cs.wustl.edu> -// - -#if !defined (_CORBA_ORB_OBJECTIDLIST_I_) -#define _CORBA_ORB_OBJECTIDLIST_I_ - -// ************************************************************* -// Inline operations for class CORBA::ORB::ObjectIdList_var -// ************************************************************* - -ACE_INLINE -CORBA::ORB_ObjectIdList_var::ORB_ObjectIdList_var (void) // default constructor - : ptr_ (0) -{} - -ACE_INLINE -CORBA::ORB_ObjectIdList_var::ORB_ObjectIdList_var (CORBA::ORB_ObjectIdList *p) - : ptr_ (p) -{} - -ACE_INLINE -CORBA::ORB_ObjectIdList_var::ORB_ObjectIdList_var (const CORBA::ORB_ObjectIdList_var &p) // copy constructor -{ - if (p.ptr_) - this->ptr_ = new CORBA::ORB_ObjectIdList(*p.ptr_); - else - this->ptr_ = 0; -} - -ACE_INLINE -CORBA::ORB_ObjectIdList_var::~ORB_ObjectIdList_var (void) // destructor -{ - delete this->ptr_; -} - -ACE_INLINE CORBA::ORB_ObjectIdList_var & -CORBA::ORB_ObjectIdList_var::operator= (CORBA::ORB_ObjectIdList *p) -{ - delete this->ptr_; - this->ptr_ = p; - return *this; -} - -ACE_INLINE CORBA::ORB_ObjectIdList_var & -CORBA::ORB_ObjectIdList_var::operator= (const CORBA::ORB_ObjectIdList_var &p) // deep copy -{ - if (this != &p) - { - delete this->ptr_; - this->ptr_ = new CORBA::ORB_ObjectIdList (*p.ptr_); - } - return *this; -} - -ACE_INLINE const CORBA::ORB_ObjectIdList * -CORBA::ORB_ObjectIdList_var::operator-> (void) const -{ - return this->ptr_; -} - -ACE_INLINE CORBA::ORB_ObjectIdList * -CORBA::ORB_ObjectIdList_var::operator-> (void) -{ - return this->ptr_; -} - -ACE_INLINE -CORBA::ORB_ObjectIdList_var::operator const CORBA::ORB_ObjectIdList &() const // cast -{ - return *this->ptr_; -} - -ACE_INLINE -CORBA::ORB_ObjectIdList_var::operator CORBA::ORB_ObjectIdList &() // cast -{ - return *this->ptr_; -} - -ACE_INLINE -CORBA::ORB_ObjectIdList_var::operator CORBA::ORB_ObjectIdList &() const// cast -{ - return *this->ptr_; -} - -ACE_INLINE TAO_SeqElem_String_Manager -CORBA::ORB_ObjectIdList_var::operator[] (CORBA::ULong slot) -{ - return this->ptr_->operator[] (slot); -} - -ACE_INLINE const CORBA::ORB_ObjectIdList & -CORBA::ORB_ObjectIdList_var::in (void) const -{ - return *this->ptr_; -} - -ACE_INLINE CORBA::ORB_ObjectIdList & -CORBA::ORB_ObjectIdList_var::inout (void) -{ - return *this->ptr_; -} - -// mapping for variable size -ACE_INLINE CORBA::ORB_ObjectIdList *& -CORBA::ORB_ObjectIdList_var::out (void) -{ - delete this->ptr_; - this->ptr_ = 0; - return this->ptr_; -} - -ACE_INLINE CORBA::ORB_ObjectIdList * -CORBA::ORB_ObjectIdList_var::_retn (void) -{ - CORBA::ORB_ObjectIdList *tmp = this->ptr_; - this->ptr_ = 0; - return tmp; -} - -ACE_INLINE CORBA::ORB_ObjectIdList * -CORBA::ORB_ObjectIdList_var::ptr (void) const -{ - return this->ptr_; -} - -// ************************************************************* -// Inline operations for class CORBA::ORB_ObjectIdList_out -// ************************************************************* - -ACE_INLINE -CORBA::ORB_ObjectIdList_out::ORB_ObjectIdList_out (CORBA::ORB_ObjectIdList *&p) - : ptr_ (p) -{ - this->ptr_ = 0; -} - -ACE_INLINE -CORBA::ORB_ObjectIdList_out::ORB_ObjectIdList_out (CORBA::ORB_ObjectIdList_var &p) // constructor from _var - : ptr_ (p.out ()) -{ - delete this->ptr_; - this->ptr_ = 0; -} - -ACE_INLINE -CORBA::ORB_ObjectIdList_out::ORB_ObjectIdList_out (const CORBA::ORB_ObjectIdList_out &p) // copy constructor - : ptr_ (ACE_const_cast (CORBA::ORB_ObjectIdList_out&,p).ptr_) -{} - -ACE_INLINE CORBA::ORB_ObjectIdList_out & -CORBA::ORB_ObjectIdList_out::operator= (const CORBA::ORB_ObjectIdList_out &p) -{ - this->ptr_ = ACE_const_cast (CORBA::ORB_ObjectIdList_out&,p).ptr_; - return *this; -} - -ACE_INLINE CORBA::ORB_ObjectIdList_out & -CORBA::ORB_ObjectIdList_out::operator= (CORBA::ORB_ObjectIdList *p) -{ - this->ptr_ = p; - return *this; -} - -ACE_INLINE -CORBA::ORB_ObjectIdList_out::operator CORBA::ORB_ObjectIdList *&() // cast -{ - return this->ptr_; -} - -ACE_INLINE CORBA::ORB_ObjectIdList *& -CORBA::ORB_ObjectIdList_out::ptr (void) // ptr -{ - return this->ptr_; -} - -ACE_INLINE CORBA::ORB_ObjectIdList * -CORBA::ORB_ObjectIdList_out::operator-> (void) -{ - return this->ptr_; -} - -ACE_INLINE TAO_SeqElem_String_Manager -CORBA::ORB_ObjectIdList_out::operator[] (CORBA::ULong slot) -{ - return this->ptr_->operator[] (slot); -} - - -#endif /* end #if !defined */ |