ChangeLogTag:Mon Feb 8 13:43:10 1999 Carlos O'Ryan <coryan@cs.wustl.edu>

1 files changed, 57 insertions, 60 deletions

diff --git a/TAO/tao/Object_KeyC.h b/TAO/tao/Object_KeyC.h
index df8e28a944a..75063be9575 100644
--- a/TAO/tao/Object_KeyC.h
+++ b/TAO/tao/Object_KeyC.h
@@ -13,85 +13,82 @@
 #ifndef TAO_IDL_OBJECT_KEYC_H
 #define TAO_IDL_OBJECT_KEYC_H
 
-#if !defined (_TAO__TAO_SEQ_OCTET_CH_)
-#define _TAO__TAO_SEQ_OCTET_CH_
+#include "tao/corbafwd.h"
+#include "tao/Sequence.h"
 
-// *************************************************************
-// TAO_tao_seq_Octet
-// *************************************************************
-
-typedef TAO_Unbounded_Sequence<CORBA::Octet > TAO_tao_seq_Octet;
-typedef TAO_tao_seq_Octet* TAO_tao_seq_Octet_ptr;
-
-#endif // end #if !defined
-
-#if !defined (_TAO__TAO_SEQ_OCTET___VAR_CH_)
-#define _TAO__TAO_SEQ_OCTET___VAR_CH_
-
-// *************************************************************
-// class TAO_tao_seq_Octet_var
-// *************************************************************
-
-class TAO_tao_seq_Octet_var
+class TAO_Export TAO_ObjectKey : public TAO_Unbounded_Sequence<CORBA::Octet>
 {
+  // = TITLE
+  //   TAO class used to represent Object Keys
+  //
+  // = DESCRIPTION
+  //   The object is basically a sequence of octets, but we derive
+  //   from it to create a unique type; this is useful for
+  //   overloading. 
+  //
 public:
-  TAO_tao_seq_Octet_var (void); // default constructor
-  TAO_tao_seq_Octet_var (TAO_tao_seq_Octet *);
-  TAO_tao_seq_Octet_var (const TAO_tao_seq_Octet_var &); // copy constructor
-  ~TAO_tao_seq_Octet_var (void); // destructor
-
-  TAO_tao_seq_Octet_var &operator= (TAO_tao_seq_Octet *);
-  TAO_tao_seq_Octet_var &operator= (const TAO_tao_seq_Octet_var &);
-  TAO_tao_seq_Octet *operator-> (void);
-  const TAO_tao_seq_Octet *operator-> (void) const;
+  TAO_ObjectKey (void);
+  TAO_ObjectKey (CORBA::ULong max);
+  TAO_ObjectKey (CORBA::ULong max,
+                  CORBA::ULong length,
+                  CORBA::Octet *data,
+                  CORBA::Boolean release = 0);
+  TAO_ObjectKey (const TAO_ObjectKey &);
+  TAO_ObjectKey& operator= (const TAO_ObjectKey &);
+};
 
-  operator const TAO_tao_seq_Octet &() const;
-  operator TAO_tao_seq_Octet &();
-  operator TAO_tao_seq_Octet &() const;
+class TAO_ObjectKey_var
+{
+public:
+  TAO_ObjectKey_var (void); // default constructor
+  TAO_ObjectKey_var (TAO_ObjectKey *);
+  TAO_ObjectKey_var (const TAO_ObjectKey_var &); // copy constructor
+  ~TAO_ObjectKey_var (void); // destructor
+
+  TAO_ObjectKey_var &operator= (TAO_ObjectKey *);
+  TAO_ObjectKey_var &operator= (const TAO_ObjectKey_var &);
+  TAO_ObjectKey *operator-> (void);
+  const TAO_ObjectKey *operator-> (void) const;
+
+  operator const TAO_ObjectKey &() const;
+  operator TAO_ObjectKey &();
+  operator TAO_ObjectKey &() const;
   CORBA::Octet &operator[] (CORBA::ULong index);
   // in, inout, out, _retn
-  const TAO_tao_seq_Octet &in (void) const;
-  TAO_tao_seq_Octet &inout (void);
-  TAO_tao_seq_Octet *&out (void);
-  TAO_tao_seq_Octet *_retn (void);
-  TAO_tao_seq_Octet *ptr (void) const;
+  const TAO_ObjectKey &in (void) const;
+  TAO_ObjectKey &inout (void);
+  TAO_ObjectKey *&out (void);
+  TAO_ObjectKey *_retn (void);
+  TAO_ObjectKey *ptr (void) const;
 
 private:
-  TAO_tao_seq_Octet *ptr_;
+  TAO_ObjectKey *ptr_;
 };
 
-#endif // end #if !defined
-
-#if !defined (_TAO__TAO_SEQ_OCTET___OUT_CH_)
-#define _TAO__TAO_SEQ_OCTET___OUT_CH_
-
-class TAO_tao_seq_Octet_out
+class TAO_ObjectKey_out
 {
 public:
-  TAO_tao_seq_Octet_out (TAO_tao_seq_Octet *&);
-  TAO_tao_seq_Octet_out (TAO_tao_seq_Octet_var &);
-  TAO_tao_seq_Octet_out (TAO_tao_seq_Octet_out &);
-  TAO_tao_seq_Octet_out &operator= (TAO_tao_seq_Octet_out &);
-  TAO_tao_seq_Octet_out &operator= (TAO_tao_seq_Octet *);
-  operator TAO_tao_seq_Octet *&();
-  TAO_tao_seq_Octet *&ptr (void);
-  TAO_tao_seq_Octet *operator-> (void);
+  TAO_ObjectKey_out (TAO_ObjectKey *&);
+  TAO_ObjectKey_out (TAO_ObjectKey_var &);
+  TAO_ObjectKey_out (TAO_ObjectKey_out &);
+  TAO_ObjectKey_out &operator= (TAO_ObjectKey_out &);
+  TAO_ObjectKey_out &operator= (TAO_ObjectKey *);
+  operator TAO_ObjectKey *&();
+  TAO_ObjectKey *&ptr (void);
+  TAO_ObjectKey *operator-> (void);
   CORBA::Octet &operator[] (CORBA::ULong index);
 
 private:
-  TAO_tao_seq_Octet *&ptr_;
+  TAO_ObjectKey *&ptr_;
   // assignment from T_var not allowed
-  void operator= (const TAO_tao_seq_Octet_var &);
+  void operator= (const TAO_ObjectKey_var &);
 };
 
-#endif // end #if !defined
-
-typedef TAO_tao_seq_Octet TAO_ObjectKey;
-typedef TAO_tao_seq_Octet_var TAO_ObjectKey_var;
-typedef TAO_tao_seq_Octet_out TAO_ObjectKey_out;
+extern TAO_Export int operator== (const TAO_ObjectKey &l,
+                                  const TAO_ObjectKey &r);
 
 #if defined (__ACE_INLINE__)
-#include "Object_KeyC.i"
-#endif // defined INLINE
+#include "tao/Object_KeyC.i"
+#endif /* __ACE_INLINE__ */
 
 #endif /* TAO_IDL_OBJECT_KEYC_H */