ChangeLogTag:Mon May 1 21:12:07 2000 Carlos O'Ryan <coryan@uci.edu>

5 files changed, 916 insertions, 369 deletions

diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index 4b912475b3d..913a6f07ae3 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,12 @@
+Mon May  1 21:12:07 2000  Carlos O'Ryan  <coryan@uci.edu>
+
+        * MessagingC.i:
+        * MessagingC.cpp:
+        * diffs/MessagingC.i.diff:
+        * diffs/MessagingC.cpp.diff:
+          The IDL compiler generated code in the wrong file.  The IDL
+          compiler bug is documented in [BUGID:554]
+
 Mon May  1 19:20:04 2000  Jeff Parsons  <parsons@cs.wustl.edu>
 
 	* TAO_IDL/be/be_interface.cpp:
@@ -7,9 +16,9 @@ Mon May  1 19:20:04 2000  Jeff Parsons  <parsons@cs.wustl.edu>
 
 Mon May  1 14:32:11 2000  Marina Spivak  <marina@cs.wustl.edu>
 
-	* orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp:
-	  fixed type mismatch warning.  Thanks to Darrell for reporting
-	  it.
+        * orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp:
+          fixed type mismatch warning.  Thanks to Darrell for reporting
+          it.
 
 Mon May  1 10:25:11 2000  Darrell Brunsch <brunsch@uci.edu>
 
diff --git a/TAO/tao/MessagingC.cpp b/TAO/tao/MessagingC.cpp
index 6ab2469af69..e95c530c74e 100644
--- a/TAO/tao/MessagingC.cpp
+++ b/TAO/tao/MessagingC.cpp
@@ -1896,207 +1896,6 @@ void Messaging::ExceptionHolder::_tao_seq_Octet::_tao_any_destructor (void *x)
   delete tmp;
 }
 
-  // *************************************************************
-  // Inline operations for class Messaging::ExceptionHolder::_tao_seq_Octet_var
-  // *************************************************************
-
-ACE_INLINE
-  Messaging::ExceptionHolder::_tao_seq_Octet_var::_tao_seq_Octet_var (void) // default constructor
-    : ptr_ (0)
-  {}
-
-  ACE_INLINE
-  Messaging::ExceptionHolder::_tao_seq_Octet_var::_tao_seq_Octet_var (_tao_seq_Octet *p)
-    : ptr_ (p)
-  {}
-
-  ACE_INLINE
-  Messaging::ExceptionHolder::_tao_seq_Octet_var::_tao_seq_Octet_var (const ::Messaging::ExceptionHolder::_tao_seq_Octet_var &p) // copy constructor
-  {
-    if (p.ptr_)
-      ACE_NEW (this->ptr_, ::Messaging::ExceptionHolder::_tao_seq_Octet (*p.ptr_));
-    else
-      this->ptr_ = 0;
-  }
-
-// fixed-size base types only
-  ACE_INLINE
-  Messaging::ExceptionHolder::_tao_seq_Octet_var::_tao_seq_Octet_var (const ::Messaging::ExceptionHolder::_tao_seq_Octet &p)
-  {
-    ACE_NEW (this->ptr_, ::Messaging::ExceptionHolder::_tao_seq_Octet (p));
-  }
-
-  ACE_INLINE
-  Messaging::ExceptionHolder::_tao_seq_Octet_var::~_tao_seq_Octet_var (void) // destructor
-  {
-    delete this->ptr_;
-  }
-
-  ACE_INLINE Messaging::ExceptionHolder::_tao_seq_Octet_var &
-  Messaging::ExceptionHolder::_tao_seq_Octet_var::operator= (_tao_seq_Octet *p)
-  {
-    delete this->ptr_;
-    this->ptr_ = p;
-    return *this;
-  }
-
-  ACE_INLINE Messaging::ExceptionHolder::_tao_seq_Octet_var &
-  Messaging::ExceptionHolder::_tao_seq_Octet_var::operator= (const ::Messaging::ExceptionHolder::_tao_seq_Octet_var &p) // deep copy
-  {
-    if (this != &p)
-    {
-      delete this->ptr_;
-      ACE_NEW_RETURN (this->ptr_, ::Messaging::ExceptionHolder::_tao_seq_Octet (*p.ptr_), *this);
-    }
-    return *this;
-  }
-
-  // fixed-size types only
-  ACE_INLINE ::Messaging::ExceptionHolder::_tao_seq_Octet_var &
-  Messaging::ExceptionHolder::_tao_seq_Octet_var::operator= (const ::Messaging::ExceptionHolder::_tao_seq_Octet &p)
-  {
-    if (this->ptr_ != &p)
-    {
-      delete this->ptr_;
-      ACE_NEW_RETURN (this->ptr_, ::Messaging::ExceptionHolder::_tao_seq_Octet (p), *this);
-    }
-    return *this;
-  }
-
-  ACE_INLINE const ::Messaging::ExceptionHolder::_tao_seq_Octet *
-  Messaging::ExceptionHolder::_tao_seq_Octet_var::operator-> (void) const
-  {
-    return this->ptr_;
-  }
-
-  ACE_INLINE ::Messaging::ExceptionHolder::_tao_seq_Octet *
-  Messaging::ExceptionHolder::_tao_seq_Octet_var::operator-> (void)
-  {
-    return this->ptr_;
-  }
-
-  ACE_INLINE
-  Messaging::ExceptionHolder::_tao_seq_Octet_var::operator const ::Messaging::ExceptionHolder::_tao_seq_Octet &() const // cast
-  {
-    return *this->ptr_;
-  }
-
-  ACE_INLINE
-  Messaging::ExceptionHolder::_tao_seq_Octet_var::operator ::Messaging::ExceptionHolder::_tao_seq_Octet &() // cast
-  {
-    return *this->ptr_;
-  }
-
-  ACE_INLINE
-  Messaging::ExceptionHolder::_tao_seq_Octet_var::operator ::Messaging::ExceptionHolder::_tao_seq_Octet &() const // cast
-  {
-    return *this->ptr_;
-  }
-
-  ACE_INLINE CORBA::Octet &
-  Messaging::ExceptionHolder::_tao_seq_Octet_var::operator[] (CORBA::ULong index)
-  {
-    return this->ptr_->operator[] (index);
-  }
-
-  ACE_INLINE const ::Messaging::ExceptionHolder::_tao_seq_Octet &
-  Messaging::ExceptionHolder::_tao_seq_Octet_var::in (void) const
-  {
-    return *this->ptr_;
-  }
-
-  ACE_INLINE ::Messaging::ExceptionHolder::_tao_seq_Octet &
-  Messaging::ExceptionHolder::_tao_seq_Octet_var::inout (void)
-  {
-    return *this->ptr_;
-  }
-
-  // mapping for variable size
-  ACE_INLINE ::Messaging::ExceptionHolder::_tao_seq_Octet *&
-  Messaging::ExceptionHolder::_tao_seq_Octet_var::out (void)
-  {
-    delete this->ptr_;
-    this->ptr_ = 0;
-    return this->ptr_;
-  }
-
-  ACE_INLINE ::Messaging::ExceptionHolder::_tao_seq_Octet *
-  Messaging::ExceptionHolder::_tao_seq_Octet_var::_retn (void)
-  {
-    ::Messaging::ExceptionHolder::_tao_seq_Octet *tmp = this->ptr_;
-    this->ptr_ = 0;
-    return tmp;
-  }
-
-  ACE_INLINE ::Messaging::ExceptionHolder::_tao_seq_Octet *
-  Messaging::ExceptionHolder::_tao_seq_Octet_var::ptr (void) const
-  {
-    return this->ptr_;
-  }
-
-  // *************************************************************
-  // Inline operations for class Messaging::ExceptionHolder::_tao_seq_Octet_out
-  // *************************************************************
-
-  ACE_INLINE
-  Messaging::ExceptionHolder::_tao_seq_Octet_out::_tao_seq_Octet_out (_tao_seq_Octet *&p)
-    : ptr_ (p)
-  {
-    this->ptr_ = 0;
-  }
-
-  ACE_INLINE
-  Messaging::ExceptionHolder::_tao_seq_Octet_out::_tao_seq_Octet_out (_tao_seq_Octet_var &p) // constructor from _var
-    : ptr_ (p.out ())
-  {
-    delete this->ptr_;
-    this->ptr_ = 0;
-  }
-
-  ACE_INLINE
-  Messaging::ExceptionHolder::_tao_seq_Octet_out::_tao_seq_Octet_out (const ::Messaging::ExceptionHolder::_tao_seq_Octet_out &p) // copy constructor
-    : ptr_ (ACE_const_cast (_tao_seq_Octet_out&, p).ptr_)
-  {}
-
-  ACE_INLINE ::Messaging::ExceptionHolder::_tao_seq_Octet_out &
-  Messaging::ExceptionHolder::_tao_seq_Octet_out::operator= (const ::Messaging::ExceptionHolder::_tao_seq_Octet_out &p)
-  {
-    this->ptr_ = ACE_const_cast (_tao_seq_Octet_out&, p).ptr_;
-    return *this;
-  }
-
-  ACE_INLINE ::Messaging::ExceptionHolder::_tao_seq_Octet_out &
-  Messaging::ExceptionHolder::_tao_seq_Octet_out::operator= (_tao_seq_Octet *p)
-  {
-    this->ptr_ = p;
-    return *this;
-  }
-
-  ACE_INLINE
-  Messaging::ExceptionHolder::_tao_seq_Octet_out::operator ::Messaging::ExceptionHolder::_tao_seq_Octet *&() // cast
-  {
-    return this->ptr_;
-  }
-
-  ACE_INLINE ::Messaging::ExceptionHolder::_tao_seq_Octet *&
-  Messaging::ExceptionHolder::_tao_seq_Octet_out::ptr (void) // ptr
-  {
-    return this->ptr_;
-  }
-
-  ACE_INLINE ::Messaging::ExceptionHolder::_tao_seq_Octet *
-  Messaging::ExceptionHolder::_tao_seq_Octet_out::operator-> (void)
-  {
-    return this->ptr_;
-  }
-
-  ACE_INLINE CORBA::Octet &
-  Messaging::ExceptionHolder::_tao_seq_Octet_out::operator[] (CORBA::ULong index)
-  {
-    return this->ptr_->operator[] (index);
-  }
-
-
 #endif /* end #if !defined */
 
 // accessor to set the member
diff --git a/TAO/tao/MessagingC.i b/TAO/tao/MessagingC.i
index 8d1c5fbfc0e..c4a41db6931 100644
--- a/TAO/tao/MessagingC.i
+++ b/TAO/tao/MessagingC.i
@@ -3628,6 +3628,213 @@ Messaging::ExceptionHolder_out::operator-> (void)
   return this->ptr_;
 }
 
+#if !defined (_MESSAGING_EXCEPTIONHOLDER__TAO_SEQ_OCTET_CI_)
+#define _MESSAGING_EXCEPTIONHOLDER__TAO_SEQ_OCTET_CI_
+
+// *************************************************************
+// Inline operations for class Messaging::ExceptionHolder::_tao_seq_Octet_var
+// *************************************************************
+
+ACE_INLINE
+Messaging::ExceptionHolder::_tao_seq_Octet_var::_tao_seq_Octet_var (void) // default constructor
+  : ptr_ (0)
+{}
+
+ACE_INLINE
+Messaging::ExceptionHolder::_tao_seq_Octet_var::_tao_seq_Octet_var (_tao_seq_Octet *p)
+  : ptr_ (p)
+{}
+
+ACE_INLINE
+Messaging::ExceptionHolder::_tao_seq_Octet_var::_tao_seq_Octet_var (const ::Messaging::ExceptionHolder::_tao_seq_Octet_var &p) // copy constructor
+{
+  if (p.ptr_)
+    ACE_NEW (this->ptr_, ::Messaging::ExceptionHolder::_tao_seq_Octet (*p.ptr_));
+  else
+    this->ptr_ = 0;
+}
+
+// fixed-size base types only
+ACE_INLINE
+Messaging::ExceptionHolder::_tao_seq_Octet_var::_tao_seq_Octet_var (const ::Messaging::ExceptionHolder::_tao_seq_Octet &p)
+{
+  ACE_NEW (this->ptr_, ::Messaging::ExceptionHolder::_tao_seq_Octet (p));
+}
+
+ACE_INLINE
+Messaging::ExceptionHolder::_tao_seq_Octet_var::~_tao_seq_Octet_var (void) // destructor
+{
+  delete this->ptr_;
+}
+
+ACE_INLINE Messaging::ExceptionHolder::_tao_seq_Octet_var &
+Messaging::ExceptionHolder::_tao_seq_Octet_var::operator= (_tao_seq_Octet *p)
+{
+  delete this->ptr_;
+  this->ptr_ = p;
+  return *this;
+}
+
+ACE_INLINE Messaging::ExceptionHolder::_tao_seq_Octet_var &
+Messaging::ExceptionHolder::_tao_seq_Octet_var::operator= (const ::Messaging::ExceptionHolder::_tao_seq_Octet_var &p) // deep copy
+{
+  if (this != &p)
+  {
+    delete this->ptr_;
+    ACE_NEW_RETURN (this->ptr_, ::Messaging::ExceptionHolder::_tao_seq_Octet (*p.ptr_), *this);
+  }
+  return *this;
+}
+
+// fixed-size types only
+ACE_INLINE ::Messaging::ExceptionHolder::_tao_seq_Octet_var &
+Messaging::ExceptionHolder::_tao_seq_Octet_var::operator= (const ::Messaging::ExceptionHolder::_tao_seq_Octet &p)
+{
+  if (this->ptr_ != &p)
+  {
+    delete this->ptr_;
+    ACE_NEW_RETURN (this->ptr_, ::Messaging::ExceptionHolder::_tao_seq_Octet (p), *this);
+  }
+  return *this;
+}
+
+ACE_INLINE const ::Messaging::ExceptionHolder::_tao_seq_Octet *
+Messaging::ExceptionHolder::_tao_seq_Octet_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+ACE_INLINE ::Messaging::ExceptionHolder::_tao_seq_Octet *
+Messaging::ExceptionHolder::_tao_seq_Octet_var::operator-> (void)
+{
+  return this->ptr_;
+}
+
+ACE_INLINE
+Messaging::ExceptionHolder::_tao_seq_Octet_var::operator const ::Messaging::ExceptionHolder::_tao_seq_Octet &() const // cast
+{
+  return *this->ptr_;
+}
+
+ACE_INLINE
+Messaging::ExceptionHolder::_tao_seq_Octet_var::operator ::Messaging::ExceptionHolder::_tao_seq_Octet &() // cast
+{
+  return *this->ptr_;
+}
+
+ACE_INLINE
+Messaging::ExceptionHolder::_tao_seq_Octet_var::operator ::Messaging::ExceptionHolder::_tao_seq_Octet &() const // cast
+{
+  return *this->ptr_;
+}
+
+ACE_INLINE CORBA::Octet &
+Messaging::ExceptionHolder::_tao_seq_Octet_var::operator[] (CORBA::ULong index)
+{
+  return this->ptr_->operator[] (index);
+}
+
+ACE_INLINE const ::Messaging::ExceptionHolder::_tao_seq_Octet &
+Messaging::ExceptionHolder::_tao_seq_Octet_var::in (void) const
+{
+  return *this->ptr_;
+}
+
+ACE_INLINE ::Messaging::ExceptionHolder::_tao_seq_Octet &
+Messaging::ExceptionHolder::_tao_seq_Octet_var::inout (void)
+{
+  return *this->ptr_;
+}
+
+// mapping for variable size
+ACE_INLINE ::Messaging::ExceptionHolder::_tao_seq_Octet *&
+Messaging::ExceptionHolder::_tao_seq_Octet_var::out (void)
+{
+  delete this->ptr_;
+  this->ptr_ = 0;
+  return this->ptr_;
+}
+
+ACE_INLINE ::Messaging::ExceptionHolder::_tao_seq_Octet *
+Messaging::ExceptionHolder::_tao_seq_Octet_var::_retn (void)
+{
+  ::Messaging::ExceptionHolder::_tao_seq_Octet *tmp = this->ptr_;
+  this->ptr_ = 0;
+  return tmp;
+}
+
+ACE_INLINE ::Messaging::ExceptionHolder::_tao_seq_Octet *
+Messaging::ExceptionHolder::_tao_seq_Octet_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+// *************************************************************
+// Inline operations for class Messaging::ExceptionHolder::_tao_seq_Octet_out
+// *************************************************************
+
+ACE_INLINE
+Messaging::ExceptionHolder::_tao_seq_Octet_out::_tao_seq_Octet_out (_tao_seq_Octet *&p)
+  : ptr_ (p)
+{
+  this->ptr_ = 0;
+}
+
+ACE_INLINE
+Messaging::ExceptionHolder::_tao_seq_Octet_out::_tao_seq_Octet_out (_tao_seq_Octet_var &p) // constructor from _var
+  : ptr_ (p.out ())
+{
+  delete this->ptr_;
+  this->ptr_ = 0;
+}
+
+ACE_INLINE
+Messaging::ExceptionHolder::_tao_seq_Octet_out::_tao_seq_Octet_out (const ::Messaging::ExceptionHolder::_tao_seq_Octet_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (_tao_seq_Octet_out&, p).ptr_)
+{}
+
+ACE_INLINE ::Messaging::ExceptionHolder::_tao_seq_Octet_out &
+Messaging::ExceptionHolder::_tao_seq_Octet_out::operator= (const ::Messaging::ExceptionHolder::_tao_seq_Octet_out &p)
+{
+  this->ptr_ = ACE_const_cast (_tao_seq_Octet_out&, p).ptr_;
+  return *this;
+}
+
+ACE_INLINE ::Messaging::ExceptionHolder::_tao_seq_Octet_out &
+Messaging::ExceptionHolder::_tao_seq_Octet_out::operator= (_tao_seq_Octet *p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+ACE_INLINE
+Messaging::ExceptionHolder::_tao_seq_Octet_out::operator ::Messaging::ExceptionHolder::_tao_seq_Octet *&() // cast
+{
+  return this->ptr_;
+}
+
+ACE_INLINE ::Messaging::ExceptionHolder::_tao_seq_Octet *&
+Messaging::ExceptionHolder::_tao_seq_Octet_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+ACE_INLINE ::Messaging::ExceptionHolder::_tao_seq_Octet *
+Messaging::ExceptionHolder::_tao_seq_Octet_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
+ACE_INLINE CORBA::Octet &
+Messaging::ExceptionHolder::_tao_seq_Octet_out::operator[] (CORBA::ULong index)
+{
+  return this->ptr_->operator[] (index);
+}
+
+
+#endif /* end #if !defined */
+
+
 
 #endif /* end #if !defined */
 
diff --git a/TAO/tao/diffs/MessagingC.cpp.diff b/TAO/tao/diffs/MessagingC.cpp.diff
index 6d1cdd75986..07409a6dffe 100644
--- a/TAO/tao/diffs/MessagingC.cpp.diff
+++ b/TAO/tao/diffs/MessagingC.cpp.diff
@@ -1,5 +1,5 @@
---- orig/MessagingC.cpp	Sun Apr 30 18:03:08 2000
-+++ MessagingC.cpp	Sun Apr 30 18:06:01 2000
+--- orig/MessagingC.cpp	Mon May  1 21:10:26 2000
++++ MessagingC.cpp	Mon May  1 21:10:05 2000
 @@ -9,10 +9,18 @@
  
  #include "MessagingC.h"
@@ -543,26 +543,148 @@
   (seq)
  {}
  Messaging::PolicyValueSeq::~PolicyValueSeq (void) // dtor
-@@ -1435,6 +1496,9 @@
+@@ -1435,81 +1496,77 @@
  TAO_NAMESPACE_BEGIN (Messaging)
  TAO_NAMESPACE_DEFINE (const CORBA::ULong, INVOCATION_POLICIES, 2U)
  TAO_NAMESPACE_END
+-static const CORBA::Long _oc_Messaging_ExceptionHolder[] =
 +
 +#if (TAO_HAS_AMI_CALLBACK == 1) || (TAO_HAS_AMI_POLLER == 1)
 +
- Messaging::ExceptionHolder* Messaging::ExceptionHolder::_downcast (CORBA::ValueBase* v)
++Messaging::ExceptionHolder* Messaging::ExceptionHolder::_downcast (CORBA::ValueBase* v)
  {
-   if (v == 0) return 0;
-@@ -1499,7 +1563,7 @@
+-  TAO_ENCAP_BYTE_ORDER, // byte order
+-  42, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x4d657373), ACE_NTOHL (0x6167696e), ACE_NTOHL (0x672f4578), ACE_NTOHL (0x63657074), ACE_NTOHL (0x696f6e48), ACE_NTOHL (0x6f6c6465), ACE_NTOHL (0x723a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/Messaging/ExceptionHolder:1.0
+-  16, ACE_NTOHL (0x45786365), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e486f6c), ACE_NTOHL (0x64657200),  // name = ExceptionHolder
+-  3, // member count
+-  20, ACE_NTOHL (0x69735f73), ACE_NTOHL (0x79737465), ACE_NTOHL (0x6d5f6578), ACE_NTOHL (0x63657074), ACE_NTOHL (0x696f6e00),  // name = is_system_exception
+-  CORBA::tk_boolean,
++  if (v == 0) return 0;
++  return (ExceptionHolder* ) v->_tao_obv_narrow ((ptr_arith_t) &_downcast);
++}
+ 
+-  11, ACE_NTOHL (0x62797465), ACE_NTOHL (0x5f6f7264), ACE_NTOHL (0x65720000),  // name = byte_order
+-  CORBA::tk_boolean,
++const char* Messaging::ExceptionHolder::_tao_obv_repository_id () const
++{
++  return this->_tao_obv_static_repository_id ();
++}
+ 
+-  20, ACE_NTOHL (0x6d617273), ACE_NTOHL (0x68616c65), ACE_NTOHL (0x645f6578), ACE_NTOHL (0x63657074), ACE_NTOHL (0x696f6e00),  // name = marshaled_exception
+-  CORBA::tk_sequence, // typecode kind
+-  12, // encapsulation length
+-    TAO_ENCAP_BYTE_ORDER, // byte order
+-    CORBA::tk_octet,
++void* Messaging::ExceptionHolder::_tao_obv_narrow (ptr_arith_t type_id)
++{
++  if (type_id == (ptr_arith_t) &_downcast)
++    return this;
++  void *rval = 0;
++  return rval;
++}
+ 
+-    0U,
++CORBA::Boolean Messaging::ExceptionHolder::_tao_marshal_v (TAO_OutputCDR & strm)
++{
++  return this->_tao_marshal__Messaging_ExceptionHolder (strm);
++}
+ 
+-};
+-static CORBA::TypeCode _tc_TAO_tc_Messaging_ExceptionHolder (CORBA::tk_struct, sizeof (_oc_Messaging_ExceptionHolder), (char *) &_oc_Messaging_ExceptionHolder, 0, sizeof (Messaging::ExceptionHolder));
+-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+-TAO_NAMESPACE_BEGIN (Messaging)
+-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ExceptionHolder, &_tc_TAO_tc_Messaging_ExceptionHolder)
+-TAO_NAMESPACE_END
+-void Messaging::ExceptionHolder::_tao_any_destructor (void *x)
++CORBA::Boolean Messaging::ExceptionHolder::_tao_unmarshal_v (TAO_InputCDR & strm)
  {
+-  ExceptionHolder *tmp = ACE_static_cast (ExceptionHolder*,x);
+-  delete tmp;
++  return this->_tao_unmarshal__Messaging_ExceptionHolder (strm);
++}
++
++CORBA::Boolean Messaging::ExceptionHolder::_tao_unmarshal (TAO_InputCDR &strm, Messaging::ExceptionHolder *&new_object)
++{
++  CORBA::Boolean retval = 1;
++  CORBA::ValueBase *base;   // %! should be a _var
++  CORBA::ValueFactory_ptr factory;   // %! should be a _var
++  if (!CORBA::ValueBase::_tao_unmarshal_pre (strm, factory, base,
++          Messaging::ExceptionHolder::_tao_obv_static_repository_id ()) )
++    {
++      return 0;
++    }
++  if (factory != 0)
++    {
++      base = factory->create_for_unmarshal ();
++      factory->_remove_ref ();
++      if (base == 0)  return 0;  // %! except.?
++      //%! ACE_DEBUG ((LM_DEBUG, "Messaging::ExceptionHolder::_tao_unmarshal %s\n", base->_tao_obv_repository_id () ));
++      retval = base->_tao_unmarshal_v (strm);
++      //%! ACE_DEBUG ((LM_DEBUG, "Messaging::ExceptionHolder::_tao_unmarshal retval unmarshal_v is %d\n", retval));
++      if (!retval) return 0;
++    }
++  // Now base must be null or point to the unmarshaled object.
++  // Align the pointer to the right subobject.
++  new_object = Messaging::ExceptionHolder::_downcast (base);
++  // %! unmarshal_post
++  return 1;
  }
  
--const char* 
+ 
+-#if !defined (_MESSAGING_EXCEPTIONHOLDER__TAO_SEQ_OCTET_CS_)
+-#define _MESSAGING_EXCEPTIONHOLDER__TAO_SEQ_OCTET_CS_
++#if !defined (_MESSAGING_EXCEPTIONHOLDER___INIT_CS_)
++#define _MESSAGING_EXCEPTIONHOLDER___INIT_CS_
+ 
+-// *************************************************************
+-// Messaging::ExceptionHolder::_tao_seq_Octet
+-// *************************************************************
++Messaging::ExceptionHolder_init::~ExceptionHolder_init ()
++{
++}
+ 
+-Messaging::ExceptionHolder::_tao_seq_Octet::_tao_seq_Octet (void)
+-{}
+-Messaging::ExceptionHolder::_tao_seq_Octet::_tao_seq_Octet (CORBA::ULong max) // uses max size
+-  : 
+-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+-  TAO_Unbounded_Sequence<CORBA::Octet>
+-#else /* TAO_USE_SEQUENCE_TEMPLATES */
+-  TAO_Unbounded_Sequence<CORBA::Octet>
+-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+- (max)
+-{}
+-Messaging::ExceptionHolder::_tao_seq_Octet::_tao_seq_Octet (CORBA::ULong max, CORBA::ULong length, CORBA::Octet *buffer, CORBA::Boolean release)
+-  : 
+-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+-  TAO_Unbounded_Sequence<CORBA::Octet>
+-#else /* TAO_USE_SEQUENCE_TEMPLATES */
+-  TAO_Unbounded_Sequence<CORBA::Octet>
+-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+- (max, length, buffer, release)
+-{}
+-Messaging::ExceptionHolder::_tao_seq_Octet::_tao_seq_Octet (const _tao_seq_Octet &seq) // copy ctor
+-  : 
+-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+-  TAO_Unbounded_Sequence<CORBA::Octet>
+-#else /* TAO_USE_SEQUENCE_TEMPLATES */
+-  TAO_Unbounded_Sequence<CORBA::Octet>
+-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+- (seq)
+-{}
+-Messaging::ExceptionHolder::_tao_seq_Octet::~_tao_seq_Octet (void) // dtor
+-{}
+-void Messaging::ExceptionHolder::_tao_seq_Octet::_tao_any_destructor (void *x)
 +const char*
- Messaging::ExceptionHolder_init::tao_repository_id ()
++Messaging::ExceptionHolder_init::tao_repository_id ()
  {
-   return Messaging::ExceptionHolder::_tao_obv_static_repository_id ();
-@@ -1553,11 +1617,11 @@
+-  _tao_seq_Octet *tmp = ACE_static_cast (_tao_seq_Octet*,x);
+-  delete tmp;
++  return Messaging::ExceptionHolder::_tao_obv_static_repository_id ();
+ }
+ 
+ 
+@@ -1560,11 +1617,11 @@
          ACE_NEW_RETURN (default_proxy, ReplyHandler (stub), ReplyHandler::_nil ());
        #if (TAO_HAS_SMART_PROXIES == 1)
          return TAO_Messaging_ReplyHandler_PROXY_FACTORY_ADAPTER::instance ()->create_proxy (default_proxy);
@@ -576,7 +698,7 @@
      return
        ACE_reinterpret_cast
          (
-@@ -1601,7 +1665,7 @@
+@@ -1608,7 +1665,7 @@
    else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
      retv = ACE_reinterpret_cast (void *,
        ACE_static_cast (CORBA::Object_ptr, this));
@@ -585,7 +707,7 @@
    if (retv)
      this->_add_ref ();
    return retv;
-@@ -1612,6 +1676,7 @@
+@@ -1619,6 +1676,7 @@
    return "IDL:omg.org/Messaging/ReplyHandler:1.0";
  }
  
@@ -593,7 +715,7 @@
  Messaging::TAO_Messaging_ReplyHandler_Default_Proxy_Factory::TAO_Messaging_ReplyHandler_Default_Proxy_Factory (int register_proxy_factory)
  {
    if (register_proxy_factory)
-@@ -1671,7 +1736,7 @@
+@@ -1678,7 +1736,7 @@
    if (this->delete_proxy_factory_ == 0 && this->proxy_factory_ != 0)
      {
        // Its necessary to set <delete_proxy_factory_> to 1 to make sure that it
@@ -602,7 +724,7 @@
        // invoked in the destructor of the class too.
        this->delete_proxy_factory_ = 1;
        delete this->proxy_factory_;
-@@ -1691,10 +1756,10 @@
+@@ -1698,10 +1756,10 @@
    // Verify that an <proxy_factory_> is available else make one.
    if (this->proxy_factory_ == 0)
      ACE_NEW_RETURN (this->proxy_factory_,
@@ -616,7 +738,7 @@
    return this->proxy_factory_->create_proxy (proxy);
  }
  
-@@ -1714,7 +1779,7 @@
+@@ -1721,7 +1779,7 @@
  
  Messaging::ReplyHandler_ptr
  Messaging::TAO_Messaging_ReplyHandler_Smart_Proxy_Base::get_proxy (void)
@@ -625,7 +747,7 @@
  {
    // Obtain the real proxy stored in <base_proxy_>
    if (CORBA::is_nil (this->proxy_.in ()))
-@@ -1724,17 +1789,19 @@
+@@ -1731,17 +1789,19 @@
        TAO_Messaging_ReplyHandler_PROXY_FACTORY_ADAPTER::instance ()->unregister_proxy_factory ();
        this->proxy_ = ::Messaging::ReplyHandler::_unchecked_narrow (this->base_proxy_.in ());
      }
@@ -648,33 +770,56 @@
      static const CORBA::Long _oc_Messaging_ReplyHandler[] =
    {
      TAO_ENCAP_BYTE_ORDER, // byte order
-@@ -1746,14 +1813,19 @@
+@@ -1753,6 +1813,115 @@
    TAO_NAMESPACE_BEGIN (Messaging)
    TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ReplyHandler, &_tc_TAO_tc_Messaging_ReplyHandler)
    TAO_NAMESPACE_END
--    CORBA::Boolean 
 +
 +#endif /* TAO_HAS_AMI_CALLBACK == 1 || TAO_HAS_AMI_POLLER == 1 */
 +
 +#if (TAO_HAS_AMI_CALLBACK == 1)
 +
 +    CORBA::Boolean
-   OBV_Messaging::ExceptionHolder::_tao_marshal__Messaging_ExceptionHolder (TAO_OutputCDR &strm){
-     return _tao_marshal_state (strm);
--    
++  OBV_Messaging::ExceptionHolder::_tao_marshal__Messaging_ExceptionHolder (TAO_OutputCDR &strm){
++    return _tao_marshal_state (strm);
 +
-   }
- CORBA::Boolean OBV_Messaging::ExceptionHolder::_tao_unmarshal__Messaging_ExceptionHolder (TAO_InputCDR &strm){
-     return _tao_unmarshal_state (strm);
--    
++  }
++CORBA::Boolean OBV_Messaging::ExceptionHolder::_tao_unmarshal__Messaging_ExceptionHolder (TAO_InputCDR &strm){
++    return _tao_unmarshal_state (strm);
++
++  }
++  // accessor to set the member
++  void
++  OBV_Messaging::ExceptionHolder::is_system_exception (CORBA::Boolean val) // set
++  {
++    // set the value
++    this->_pd_is_system_exception = val;
++  }
++  // retrieve the member
++  CORBA::Boolean
++  OBV_Messaging::ExceptionHolder::is_system_exception (void) const
++  {
++    return this->_pd_is_system_exception;
++  }
++
++  // accessor to set the member
++  void
++  OBV_Messaging::ExceptionHolder::byte_order (CORBA::Boolean val) // set
++  {
++    // set the value
++    this->_pd_byte_order = val;
++  }
++  // retrieve the member
++  CORBA::Boolean
++  OBV_Messaging::ExceptionHolder::byte_order (void) const
++  {
++    return this->_pd_byte_order;
++  }
++
++
++#if !defined (_MESSAGING_EXCEPTIONHOLDER__TAO_SEQ_OCTET_CS_)
++#define _MESSAGING_EXCEPTIONHOLDER__TAO_SEQ_OCTET_CS_
 +
-   }
-   // accessor to set the member
-   void
-@@ -1787,6 +1859,43 @@
- #if !defined (_MESSAGING_EXCEPTIONHOLDER__TAO_SEQ_OCTET_CS_)
- #define _MESSAGING_EXCEPTIONHOLDER__TAO_SEQ_OCTET_CS_
- 
 +Messaging::ExceptionHolder::_tao_seq_Octet::_tao_seq_Octet (void)
 +{}
 +Messaging::ExceptionHolder::_tao_seq_Octet::_tao_seq_Octet (CORBA::ULong max) // uses max size
@@ -712,94 +857,124 @@
 +  delete tmp;
 +}
 +
-   // *************************************************************
-   // Inline operations for class Messaging::ExceptionHolder::_tao_seq_Octet_var
-   // *************************************************************
-@@ -1866,20 +1975,20 @@
-     return this->ptr_;
-   }
- 
--  ACE_INLINE 
-+  ACE_INLINE
-   Messaging::ExceptionHolder::_tao_seq_Octet_var::operator const ::Messaging::ExceptionHolder::_tao_seq_Octet &() const // cast
-   {
-     return *this->ptr_;
-   }
- 
--  ACE_INLINE 
--  Messaging::ExceptionHolder::_tao_seq_Octet_var::operator ::Messaging::ExceptionHolder::_tao_seq_Octet &() // cast 
-+  ACE_INLINE
-+  Messaging::ExceptionHolder::_tao_seq_Octet_var::operator ::Messaging::ExceptionHolder::_tao_seq_Octet &() // cast
-   {
-     return *this->ptr_;
-   }
- 
--  ACE_INLINE 
--  Messaging::ExceptionHolder::_tao_seq_Octet_var::operator ::Messaging::ExceptionHolder::_tao_seq_Octet &() const // cast 
-+  ACE_INLINE
-+  Messaging::ExceptionHolder::_tao_seq_Octet_var::operator ::Messaging::ExceptionHolder::_tao_seq_Octet &() const // cast
-   {
-     return *this->ptr_;
-   }
-@@ -1902,7 +2011,7 @@
-     return *this->ptr_;
-   }
- 
--  // mapping for variable size 
-+  // mapping for variable size
-   ACE_INLINE ::Messaging::ExceptionHolder::_tao_seq_Octet *&
-   Messaging::ExceptionHolder::_tao_seq_Octet_var::out (void)
-   {
-@@ -1963,7 +2072,7 @@
-     return *this;
-   }
- 
--  ACE_INLINE 
-+  ACE_INLINE
-   Messaging::ExceptionHolder::_tao_seq_Octet_out::operator ::Messaging::ExceptionHolder::_tao_seq_Octet *&() // cast
-   {
-     return this->ptr_;
-@@ -1996,22 +2105,25 @@
-   {
-     this->_pd_marshaled_exception = val;
-   }
--  
--  // readonly get method 
++#endif /* end #if !defined */
++
++// accessor to set the member
++  void
++  OBV_Messaging::ExceptionHolder::marshaled_exception (const Messaging::ExceptionHolder::_tao_seq_Octet &val)
++  {
++    this->_pd_marshaled_exception = val;
++  }
 +
 +  // readonly get method
-   const Messaging::ExceptionHolder::_tao_seq_Octet &
-   OBV_Messaging::ExceptionHolder::marshaled_exception (void) const
-   {
-     return this->_pd_marshaled_exception;
-   }
--  
--  // read/write get method 
++  const Messaging::ExceptionHolder::_tao_seq_Octet &
++  OBV_Messaging::ExceptionHolder::marshaled_exception (void) const
++  {
++    return this->_pd_marshaled_exception;
++  }
 +
 +  // read/write get method
-   Messaging::ExceptionHolder::_tao_seq_Octet &
-   OBV_Messaging::ExceptionHolder::marshaled_exception (void)
-   {
-     return this->_pd_marshaled_exception;
-   }
- 
--              void operator<<= (CORBA::Any &_tao_any, const Messaging::PriorityRange &_tao_elem) // copying
++  Messaging::ExceptionHolder::_tao_seq_Octet &
++  OBV_Messaging::ExceptionHolder::marshaled_exception (void)
++  {
++    return this->_pd_marshaled_exception;
++  }
++
 +#endif /* TAO_HAS_AMI_CALLBACK == 1 */
 +
 +
-+                void operator<<= (CORBA::Any &_tao_any, const Messaging::PriorityRange &_tao_elem) // copying
+                 void operator<<= (CORBA::Any &_tao_any, const Messaging::PriorityRange &_tao_elem) // copying
    {
      TAO_OutputCDR stream;
-     stream << _tao_elem;
-@@ -2343,6 +2455,8 @@
+@@ -2085,86 +2254,7 @@
      return 0;
    }
  
+-  void operator<<= (CORBA::Any &_tao_any, const Messaging::ExceptionHolder &_tao_elem) // copying
+-  {
+-    TAO_OutputCDR stream;
+-    stream << _tao_elem;
+-    _tao_any._tao_replace (
+-        Messaging::_tc_ExceptionHolder,
+-        TAO_ENCAP_BYTE_ORDER,
+-        stream.begin ()
+-      );
+-  }
+-
+-  void operator<<= (CORBA::Any &_tao_any, Messaging::ExceptionHolder *_tao_elem) // non copying
+-  {
+-    TAO_OutputCDR stream;
+-    stream << *_tao_elem;
+-    _tao_any._tao_replace (
+-        Messaging::_tc_ExceptionHolder,
+-        TAO_ENCAP_BYTE_ORDER,
+-        stream.begin (),
+-        1,
+-        _tao_elem,
+-        Messaging::ExceptionHolder::_tao_any_destructor
+-      );
+-  }
+-
+-  CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, Messaging::ExceptionHolder *&_tao_elem)
+-  {
+-    return _tao_any >>= ACE_const_cast(const Messaging::ExceptionHolder*&,_tao_elem);
+-  }
+-
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const Messaging::ExceptionHolder *&_tao_elem)
+-  {
+-    _tao_elem = 0;
+-    ACE_TRY_NEW_ENV
+-    {
+-      CORBA::TypeCode_var type = _tao_any.type ();
+-      if (!type->equivalent (Messaging::_tc_ExceptionHolder, ACE_TRY_ENV)) // not equal
+-        {
+-          return 0;
+-        }
+-      ACE_TRY_CHECK;
+-      if (_tao_any.any_owns_data ())
+-      {
+-        _tao_elem = ACE_static_cast(
+-            const Messaging::ExceptionHolder*,
+-            _tao_any.value ()
+-          );
+-        return 1;
+-      }
+-      else
+-      {
+-        Messaging::ExceptionHolder *tmp;
+-        ACE_NEW_RETURN (tmp, Messaging::ExceptionHolder, 0);
+-        TAO_InputCDR stream (
+-            _tao_any._tao_get_cdr (),
+-            _tao_any._tao_byte_order ()
+-          );
+-        if (stream >> *tmp)
+-        {
+-          ((CORBA::Any *)&_tao_any)->_tao_replace (
+-              Messaging::_tc_ExceptionHolder,
+-              1,
+-              ACE_static_cast (void *, tmp),
+-              Messaging::ExceptionHolder::_tao_any_destructor
+-            );
+-          _tao_elem = tmp;
+-          return 1;
+-        }
+-        else
+-        {
+-          delete tmp;
+-        }
+-      }
+-    }
+-    ACE_CATCHANY
+-    {
+-    }
+-    ACE_ENDTRY;
+-    return 0;
+-  }
 +#if (TAO_HAS_AMI_CALLBACK == 1) || (TAO_HAS_AMI_POLLER == 1)
-+
+ 
    Messaging::ReplyHandler_ptr (*_TAO_collocation_Messaging_ReplyHandler_Stub_Factory_function_pointer) (
        CORBA::Object_ptr obj
-     ) = 0;
-@@ -2352,7 +2466,7 @@
+@@ -2175,7 +2265,7 @@
      if (stream << _tao_elem)
      {
        _tao_any._tao_replace (
@@ -808,7 +983,7 @@
            TAO_ENCAP_BYTE_ORDER,
            stream.begin (),
            1,
-@@ -2382,7 +2496,7 @@
+@@ -2205,7 +2295,7 @@
        {
          _tao_elem = Messaging::ReplyHandler::_narrow (_tao_obj_var.in (), ACE_TRY_ENV);
          ACE_TRY_CHECK;
@@ -817,7 +992,7 @@
          ((CORBA::Any *)&_tao_any)->_tao_replace (
              Messaging::_tc_ReplyHandler,
              1,
-@@ -2409,7 +2523,9 @@
+@@ -2232,7 +2322,9 @@
      #  pragma instantiate TAO_Object_Manager<Messaging::ReplyHandler,Messaging::ReplyHandler_var>
    #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
  
@@ -828,7 +1003,7 @@
  #if !defined _TAO_CDR_OP_Messaging_PolicyValue__tao_seq_Octet_CPP_
    #define _TAO_CDR_OP_Messaging_PolicyValue__tao_seq_Octet_CPP_
  
-@@ -2421,20 +2537,20 @@
+@@ -2244,20 +2336,20 @@
      if (strm << _tao_sequence.length ())
      {
        // encode all elements
@@ -853,7 +1028,7 @@
  #endif /* TAO_NO_COPY_OCTET_SEQUENCES */
      }
      return 0; // error
-@@ -2451,14 +2567,14 @@
+@@ -2274,14 +2366,14 @@
        // set the length of the sequence
        _tao_sequence.length (_tao_seq_len);
        // If length is 0 we return true.
@@ -871,7 +1046,7 @@
            ACE_static_cast(TAO_Unbounded_Sequence<CORBA::Octet>*, &_tao_sequence);
          oseq->replace (_tao_seq_len, strm.start ());
          oseq->mb ()->wr_ptr (oseq->mb()->rd_ptr () + _tao_seq_len);
-@@ -2467,10 +2583,10 @@
+@@ -2290,10 +2382,10 @@
        }
        else
          return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_seq_len);
@@ -884,7 +1059,7 @@
  #endif /* TAO_NO_COPY_OCTET_SEQUENCES */
      }
      return 0; // error
-@@ -2507,7 +2623,7 @@
+@@ -2330,7 +2422,7 @@
      // set the length of the sequence
      _tao_sequence.length (_tao_seq_len);
      // If length is 0 we return true.
@@ -893,8 +1068,77 @@
        return 1;
      // retrieve all the elements
      CORBA::Boolean _tao_marshal_flag = 1;
-@@ -2520,3 +2636,4 @@
+@@ -2343,72 +2435,4 @@
    return 0; // error
  }
  
+-
+-#if !defined _TAO_CDR_OP_Messaging_ExceptionHolder__tao_seq_Octet_CPP_
+-#define _TAO_CDR_OP_Messaging_ExceptionHolder__tao_seq_Octet_CPP_
+-
+-CORBA::Boolean operator<< (
+-    TAO_OutputCDR &strm,
+-    const Messaging::ExceptionHolder::_tao_seq_Octet &_tao_sequence
+-  )
+-{
+-  if (strm << _tao_sequence.length ())
+-  {
+-    // encode all elements
+-    
+-#if defined (TAO_NO_COPY_OCTET_SEQUENCES)
+-    {
+-      TAO_Unbounded_Sequence<CORBA::Octet> *oseq = 
+-        ACE_static_cast (TAO_Unbounded_Sequence<CORBA::Octet>*, (Messaging::ExceptionHolder::_tao_seq_Octet *)&_tao_sequence);
+-      if (oseq->mb ())
+-        return strm.write_octet_array_mb (oseq->mb ());
+-      else
+-        return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
+-    }
+-    
+-#else /* TAO_NO_COPY_OCTET_SEQUENCES */
+-    return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
+-  
+-#endif /* TAO_NO_COPY_OCTET_SEQUENCES */
+-  }
+-  return 0; // error
+-}
+-
+-CORBA::Boolean operator>> (
+-    TAO_InputCDR &strm,
+-    Messaging::ExceptionHolder::_tao_seq_Octet &_tao_sequence
+-  )
+-{
+-  CORBA::ULong _tao_seq_len;
+-  if (strm >> _tao_seq_len)
+-  {
+-    // set the length of the sequence
+-    _tao_sequence.length (_tao_seq_len);
+-    // If length is 0 we return true.
+-    if (0 >= _tao_seq_len) 
+-      return 1;
+-    // retrieve all the elements
+-    
+-#if defined (TAO_NO_COPY_OCTET_SEQUENCES)
+-    if (ACE_BIT_DISABLED (strm.start ()->flags (),ACE_Message_Block::DONT_DELETE))
+-    {
+-      TAO_Unbounded_Sequence<CORBA::Octet> *oseq = 
+-        ACE_static_cast(TAO_Unbounded_Sequence<CORBA::Octet>*, &_tao_sequence);
+-      oseq->replace (_tao_seq_len, strm.start ());
+-      oseq->mb ()->wr_ptr (oseq->mb()->rd_ptr () + _tao_seq_len);
+-      strm.skip_bytes (_tao_seq_len);
+-      return 1;
+-    }
+-    else
+-      return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_seq_len);
+-    
+-#else /* TAO_NO_COPY_OCTET_SEQUENCES */
+-    return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
+-  
+-#endif /* TAO_NO_COPY_OCTET_SEQUENCES */
+-  }
+-  return 0; // error
+-}
+-
+-#endif /* _TAO_CDR_OP_Messaging_ExceptionHolder__tao_seq_Octet_CPP_ */
+-
 +#endif /* TAO_HAS_CORBA_MESSAGING == 1 */
diff --git a/TAO/tao/diffs/MessagingC.i.diff b/TAO/tao/diffs/MessagingC.i.diff
index 63c0198bb9b..a0db20df87a 100644
--- a/TAO/tao/diffs/MessagingC.i.diff
+++ b/TAO/tao/diffs/MessagingC.i.diff
@@ -1,5 +1,5 @@
---- orig/MessagingC.i	Sun Apr 30 18:03:08 2000
-+++ MessagingC.i	Sun Apr 30 18:06:01 2000
+--- orig/MessagingC.i	Mon May  1 21:10:26 2000
++++ MessagingC.i	Mon May  1 21:10:15 2000
 @@ -7,6 +7,8 @@
  // Information about TAO is available at:
  //                 http://www.cs.wustl.edu/~schmidt/TAO.html
@@ -830,85 +830,329 @@
  Messaging::PolicyValueSeq_out::operator ::Messaging::PolicyValueSeq *&() // cast
  {
    return this->ptr_;
-@@ -3382,6 +3430,8 @@
+@@ -3382,6 +3430,26 @@
  
  #endif /* end #if !defined */
  
 +#if (TAO_HAS_AMI_CALLBACK == 1) || (TAO_HAS_AMI_POLLER == 1)
 +
- ACE_INLINE
- Messaging::ExceptionHolder::ExceptionHolder () // default constructor
- {}
-@@ -3390,7 +3440,7 @@
- Messaging::ExceptionHolder::~ExceptionHolder () // destructor
++ACE_INLINE
++Messaging::ExceptionHolder::ExceptionHolder () // default constructor
++{}
++
++ACE_INLINE
++Messaging::ExceptionHolder::~ExceptionHolder () // destructor
++{}
++
++ACE_INLINE const char*
++Messaging::ExceptionHolder::_tao_obv_static_repository_id ()
++{
++  return "IDL:omg.org/Messaging/ExceptionHolder:1.0";
++}
++
++
++#if !defined (_MESSAGING_EXCEPTIONHOLDER___VAR_CI_)
++#define _MESSAGING_EXCEPTIONHOLDER___VAR_CI_
++
+ // *************************************************************
+ // Inline operations for class Messaging::ExceptionHolder_var
+ // *************************************************************
+@@ -3392,173 +3460,174 @@
  {}
  
--ACE_INLINE const char* 
-+ACE_INLINE const char*
- Messaging::ExceptionHolder::_tao_obv_static_repository_id ()
- {
-   return "IDL:omg.org/Messaging/ExceptionHolder:1.0";
-@@ -3419,7 +3469,7 @@
-   : ptr_ (ACE_const_cast(Messaging::ExceptionHolder*, p))
+ ACE_INLINE
+-Messaging::ExceptionHolder_var::ExceptionHolder_var (ExceptionHolder *p)
++Messaging::ExceptionHolder_var::ExceptionHolder_var (Messaging::ExceptionHolder* p)
+   : ptr_ (p)
  {}
  
--ACE_INLINE Messaging::ExceptionHolder* 
+ ACE_INLINE
+-Messaging::ExceptionHolder_var::ExceptionHolder_var (const ::Messaging::ExceptionHolder_var &p) // copy constructor
++Messaging::ExceptionHolder_var::ExceptionHolder_var (const Messaging::ExceptionHolder* p)
++  : ptr_ (ACE_const_cast(Messaging::ExceptionHolder*, p))
++{}
++
 +ACE_INLINE Messaging::ExceptionHolder*
- Messaging::ExceptionHolder_var::ptr (void) const
++Messaging::ExceptionHolder_var::ptr (void) const
+ {
+-  if (p.ptr_)
+-    ACE_NEW (this->ptr_, ::Messaging::ExceptionHolder (*p.ptr_));
+-  else
+-    this->ptr_ = 0;
++  return this->ptr_;
++}
++
++ACE_INLINE
++Messaging::ExceptionHolder_var::ExceptionHolder_var (const Messaging::ExceptionHolder_var &p) // copy constructor
++{
++  CORBA::add_ref (p.ptr ());
++  this->ptr_ = p.ptr ();
+ }
+ 
+ ACE_INLINE
+ Messaging::ExceptionHolder_var::~ExceptionHolder_var (void) // destructor
  {
-   return this->ptr_;
-@@ -3459,19 +3509,19 @@
+-  delete this->ptr_;
++  CORBA::remove_ref (this->ptr_);
+ }
+ 
+ ACE_INLINE Messaging::ExceptionHolder_var &
+-Messaging::ExceptionHolder_var::operator= (ExceptionHolder *p)
++Messaging::ExceptionHolder_var::operator= (Messaging::ExceptionHolder* p)
+ {
+-  delete this->ptr_;
++  CORBA::remove_ref (this->ptr_);
+   this->ptr_ = p;
    return *this;
  }
  
--ACE_INLINE 
-+ACE_INLINE
- Messaging::ExceptionHolder_var::operator const Messaging::ExceptionHolder* () const // cast
+-ACE_INLINE ::Messaging::ExceptionHolder_var &
+-Messaging::ExceptionHolder_var::operator= (const ::Messaging::ExceptionHolder_var &p)
++ACE_INLINE Messaging::ExceptionHolder_var &
++Messaging::ExceptionHolder_var::operator= (const Messaging::ExceptionHolder_var &p)
  {
-   return this->ptr_;
+   if (this != &p)
+   {
+-    delete this->ptr_;
+-    ACE_NEW_RETURN (this->ptr_, ::Messaging::ExceptionHolder (*p.ptr_), *this);
++    CORBA::remove_ref (this->ptr_);
++    ExceptionHolder* tmp = p.ptr ();
++    CORBA::add_ref (tmp);
++    this->ptr_ = tmp;
+   }
+   return *this;
  }
  
--ACE_INLINE 
--Messaging::ExceptionHolder_var::operator Messaging::ExceptionHolder* () // cast 
-+ACE_INLINE
+-ACE_INLINE const ::Messaging::ExceptionHolder *
+-Messaging::ExceptionHolder_var::operator-> (void) const
+-{
+-  return this->ptr_;
+-}
+-
+-ACE_INLINE ::Messaging::ExceptionHolder *
+-Messaging::ExceptionHolder_var::operator-> (void)
+-{
+-  return this->ptr_;
+-}
+-
+ ACE_INLINE
+-Messaging::ExceptionHolder_var::operator const ::Messaging::ExceptionHolder &() const // cast
++Messaging::ExceptionHolder_var::operator const Messaging::ExceptionHolder* () const // cast
+ {
+-  return *this->ptr_;
+-}
+-
+-ACE_INLINE
+-Messaging::ExceptionHolder_var::operator ::Messaging::ExceptionHolder &() // cast 
+-{
+-  return *this->ptr_;
++  return this->ptr_;
+ }
+ 
+ ACE_INLINE
+-Messaging::ExceptionHolder_var::operator ::Messaging::ExceptionHolder &() const // cast 
 +Messaging::ExceptionHolder_var::operator Messaging::ExceptionHolder* () // cast
  {
-   return this->ptr_;
+-  return *this->ptr_;
++  return this->ptr_;
  }
  
--ACE_INLINE Messaging::ExceptionHolder* 
+-// variable-size types only
+-ACE_INLINE
+-Messaging::ExceptionHolder_var::operator ::Messaging::ExceptionHolder *&() // cast 
 +ACE_INLINE Messaging::ExceptionHolder*
- Messaging::ExceptionHolder_var::operator-> (void) const
++Messaging::ExceptionHolder_var::operator-> (void) const
  {
    return this->ptr_;
-@@ -3497,7 +3547,7 @@
+ }
+ 
+-ACE_INLINE const ::Messaging::ExceptionHolder &
++ACE_INLINE Messaging::ExceptionHolder*
+ Messaging::ExceptionHolder_var::in (void) const
+ {
+-  return *this->ptr_;
++  return this->ptr_;
+ }
+ 
+-ACE_INLINE ::Messaging::ExceptionHolder &
++ACE_INLINE Messaging::ExceptionHolder* &
+ Messaging::ExceptionHolder_var::inout (void)
+ {
+-  return *this->ptr_;
++  return this->ptr_;
+ }
+ 
+-// mapping for variable size 
+-ACE_INLINE ::Messaging::ExceptionHolder *&
++ACE_INLINE Messaging::ExceptionHolder* &
+ Messaging::ExceptionHolder_var::out (void)
+ {
+-  delete this->ptr_;
++  CORBA::remove_ref (this->ptr_);
+   this->ptr_ = 0;
    return this->ptr_;
  }
  
--ACE_INLINE Messaging::ExceptionHolder* 
+-ACE_INLINE ::Messaging::ExceptionHolder *
 +ACE_INLINE Messaging::ExceptionHolder*
  Messaging::ExceptionHolder_var::_retn (void)
  {
-   // yield ownership of managed obj reference
-@@ -3560,7 +3610,7 @@
+-  ::Messaging::ExceptionHolder *tmp = this->ptr_;
++  // yield ownership of managed obj reference
++  ExceptionHolder* tmp = this->ptr_;
+   this->ptr_ = 0;
+   return tmp;
+ }
+ 
+-ACE_INLINE ::Messaging::ExceptionHolder *
+-Messaging::ExceptionHolder_var::ptr (void) const
+-{
+-  return this->ptr_;
+-}
++
++#endif /* end #if !defined */
++
++
++#if !defined (_MESSAGING_EXCEPTIONHOLDER___OUT_CI_)
++#define _MESSAGING_EXCEPTIONHOLDER___OUT_CI_
+ 
+ // *************************************************************
+ // Inline operations for class Messaging::ExceptionHolder_out
+ // *************************************************************
+ 
+ ACE_INLINE
+-Messaging::ExceptionHolder_out::ExceptionHolder_out (::Messaging::ExceptionHolder *&p)
++Messaging::ExceptionHolder_out::ExceptionHolder_out (Messaging::ExceptionHolder* &p)
+   : ptr_ (p)
+ {
+   this->ptr_ = 0;
+ }
+ 
+ ACE_INLINE
+-Messaging::ExceptionHolder_out::ExceptionHolder_out (ExceptionHolder_var &p) // constructor from _var
++Messaging::ExceptionHolder_out::ExceptionHolder_out (Messaging::ExceptionHolder_var &p) // constructor from _var
+   : ptr_ (p.out ())
+ {
+-  delete this->ptr_;
++  CORBA::remove_ref (this->ptr_);
+   this->ptr_ = 0;
+ }
+ 
+ ACE_INLINE
+-Messaging::ExceptionHolder_out::ExceptionHolder_out (const ::Messaging::ExceptionHolder_out &p) // copy constructor
+-  : ptr_ (ACE_const_cast (ExceptionHolder_out&, p).ptr_)
++Messaging::ExceptionHolder_out::ExceptionHolder_out (const Messaging::ExceptionHolder_out &p) // copy constructor
++  : ptr_ (ACE_const_cast (Messaging::ExceptionHolder_out&,p).ptr_)
+ {}
+ 
+ ACE_INLINE Messaging::ExceptionHolder_out &
+-Messaging::ExceptionHolder_out::operator= (const ::Messaging::ExceptionHolder_out &p)
++Messaging::ExceptionHolder_out::operator= (const Messaging::ExceptionHolder_out &p)
+ {
+-  this->ptr_ = ACE_const_cast (ExceptionHolder_out&, p).ptr_;
++  this->ptr_ = ACE_const_cast (Messaging::ExceptionHolder_out&,p).ptr_;
+   return *this;
+ }
+ 
+ ACE_INLINE Messaging::ExceptionHolder_out &
+-Messaging::ExceptionHolder_out::operator= (ExceptionHolder *p)
++Messaging::ExceptionHolder_out::operator= (const Messaging::ExceptionHolder_var &p)
++{
++  ExceptionHolder* tmp = p.ptr ();
++  CORBA::add_ref (tmp);
++  this->ptr_ = tmp;
++  return *this;
++}
++
++ACE_INLINE Messaging::ExceptionHolder_out &
++Messaging::ExceptionHolder_out::operator= (Messaging::ExceptionHolder* p)
+ {
+   this->ptr_ = p;
    return *this;
  }
  
 -ACE_INLINE 
+-Messaging::ExceptionHolder_out::operator ::Messaging::ExceptionHolder *&() // cast
 +ACE_INLINE
- Messaging::ExceptionHolder_out::operator Messaging::ExceptionHolder* &() // cast
++Messaging::ExceptionHolder_out::operator Messaging::ExceptionHolder* &() // cast
  {
    return this->ptr_;
-@@ -3572,7 +3622,7 @@
+ }
+ 
+-ACE_INLINE ::Messaging::ExceptionHolder *&
++ACE_INLINE Messaging::ExceptionHolder* &
+ Messaging::ExceptionHolder_out::ptr (void) // ptr
+ {
    return this->ptr_;
  }
  
--ACE_INLINE Messaging::ExceptionHolder* 
+-ACE_INLINE ::Messaging::ExceptionHolder *
 +ACE_INLINE Messaging::ExceptionHolder*
  Messaging::ExceptionHolder_out::operator-> (void)
  {
    return this->ptr_;
-@@ -3648,14 +3698,14 @@
+ }
+ 
+-
+ #if !defined (_MESSAGING_EXCEPTIONHOLDER__TAO_SEQ_OCTET_CI_)
+ #define _MESSAGING_EXCEPTIONHOLDER__TAO_SEQ_OCTET_CI_
+ 
+@@ -3641,20 +3710,20 @@
+   return this->ptr_;
+ }
+ 
+-ACE_INLINE 
++ACE_INLINE
+ Messaging::ExceptionHolder::_tao_seq_Octet_var::operator const ::Messaging::ExceptionHolder::_tao_seq_Octet &() const // cast
+ {
+   return *this->ptr_;
+ }
+ 
+-ACE_INLINE 
+-Messaging::ExceptionHolder::_tao_seq_Octet_var::operator ::Messaging::ExceptionHolder::_tao_seq_Octet &() // cast 
++ACE_INLINE
++Messaging::ExceptionHolder::_tao_seq_Octet_var::operator ::Messaging::ExceptionHolder::_tao_seq_Octet &() // cast
+ {
+   return *this->ptr_;
+ }
+ 
+-ACE_INLINE 
+-Messaging::ExceptionHolder::_tao_seq_Octet_var::operator ::Messaging::ExceptionHolder::_tao_seq_Octet &() const // cast 
++ACE_INLINE
++Messaging::ExceptionHolder::_tao_seq_Octet_var::operator ::Messaging::ExceptionHolder::_tao_seq_Octet &() const // cast
+ {
+   return *this->ptr_;
+ }
+@@ -3677,7 +3746,7 @@
+   return *this->ptr_;
+ }
+ 
+-// mapping for variable size 
++// mapping for variable size
+ ACE_INLINE ::Messaging::ExceptionHolder::_tao_seq_Octet *&
+ Messaging::ExceptionHolder::_tao_seq_Octet_var::out (void)
+ {
+@@ -3738,7 +3807,7 @@
+   return *this;
+ }
+ 
+-ACE_INLINE 
++ACE_INLINE
+ Messaging::ExceptionHolder::_tao_seq_Octet_out::operator ::Messaging::ExceptionHolder::_tao_seq_Octet *&() // cast
+ {
+   return this->ptr_;
+@@ -3765,6 +3834,10 @@
+ 
+ #endif /* end #if !defined */
+ 
++
++
++#endif /* end #if !defined */
++
+ ACE_INLINE
+ Messaging::ReplyHandler::ReplyHandler (void) // default constructor
+ {}
+@@ -3832,14 +3905,14 @@
    return *this;
  }
  
@@ -926,7 +1170,7 @@
  {
    return this->ptr_;
  }
-@@ -3747,7 +3797,7 @@
+@@ -3931,7 +4004,7 @@
    return *this;
  }
  
@@ -935,7 +1179,7 @@
  Messaging::ReplyHandler_out::operator ::Messaging::ReplyHandler_ptr &() // cast
  {
    return this->ptr_;
-@@ -3768,6 +3818,8 @@
+@@ -3952,6 +4025,8 @@
  
  #endif /* end #if !defined */
  
@@ -944,7 +1188,7 @@
  ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const Messaging::PriorityRange &_tao_aggregate)
  {
    if (
-@@ -3777,7 +3829,7 @@
+@@ -3961,7 +4036,7 @@
      return 1;
    else
      return 0;
@@ -953,7 +1197,7 @@
  }
  
  ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, Messaging::PriorityRange &_tao_aggregate)
-@@ -3789,7 +3841,7 @@
+@@ -3973,7 +4048,7 @@
      return 1;
    else
      return 0;
@@ -962,7 +1206,7 @@
  }
  
  ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const Messaging::RoutingTypeRange &_tao_aggregate)
-@@ -3801,7 +3853,7 @@
+@@ -3985,7 +4060,7 @@
      return 1;
    else
      return 0;
@@ -971,7 +1215,7 @@
  }
  
  ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, Messaging::RoutingTypeRange &_tao_aggregate)
-@@ -3813,7 +3865,7 @@
+@@ -3997,7 +4072,7 @@
      return 1;
    else
      return 0;
@@ -980,7 +1224,7 @@
  }
  
  
-@@ -3840,7 +3892,7 @@
+@@ -4024,7 +4099,7 @@
      return 1;
    else
      return 0;
@@ -989,7 +1233,7 @@
  }
  
  ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, Messaging::PolicyValue &_tao_aggregate)
-@@ -3852,7 +3904,7 @@
+@@ -4036,7 +4111,7 @@
      return 1;
    else
      return 0;
@@ -998,16 +1242,50 @@
  }
  
  
-@@ -3870,6 +3922,8 @@
+@@ -4054,45 +4129,48 @@
  
  #endif /* _TAO_CDR_OP_Messaging_PolicyValueSeq_I_ */
  
 +#if (TAO_HAS_AMI_CALLBACK == 1) || (TAO_HAS_AMI_POLLER == 1)
-+
- ACE_INLINE CORBA::Boolean
- operator<< (TAO_OutputCDR &strm, const Messaging::ExceptionHolder *_tao_valuetype)
+ 
+-#if !defined _TAO_CDR_OP_Messaging_ExceptionHolder__tao_seq_Octet_I_
+-#define _TAO_CDR_OP_Messaging_ExceptionHolder__tao_seq_Octet_I_
+-
+-CORBA::Boolean TAO_Export operator<< (
+-    TAO_OutputCDR &,
+-    const Messaging::ExceptionHolder::_tao_seq_Octet &
+-  );
+-CORBA::Boolean TAO_Export operator>> (
+-    TAO_InputCDR &,
+-    Messaging::ExceptionHolder::_tao_seq_Octet &
+-  );
++ACE_INLINE CORBA::Boolean
++operator<< (TAO_OutputCDR &strm, const Messaging::ExceptionHolder *_tao_valuetype)
++{
++  return CORBA_ValueBase::_tao_marshal (strm,
++    ACE_const_cast (Messaging::ExceptionHolder*, _tao_valuetype),
++    (ptr_arith_t) &Messaging::ExceptionHolder::_downcast);
++}
+ 
+-#endif /* _TAO_CDR_OP_Messaging_ExceptionHolder__tao_seq_Octet_I_ */
++ACE_INLINE CORBA::Boolean
++operator>> (TAO_InputCDR &strm, Messaging::ExceptionHolder *&_tao_valuetype)
++{
++  return Messaging::ExceptionHolder::_tao_unmarshal (strm, _tao_valuetype);
++}
+ 
+-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const Messaging::ExceptionHolder &_tao_aggregate)
++ACE_INLINE CORBA::Boolean
++OBV_Messaging::ExceptionHolder::_tao_marshal_state (TAO_OutputCDR &strm)
  {
-@@ -3895,7 +3949,7 @@
+   if (
+-    (strm << CORBA::Any::from_boolean (_tao_aggregate.is_system_exception)) &&
+-    (strm << CORBA::Any::from_boolean (_tao_aggregate.byte_order)) &&
+-    (strm << _tao_aggregate.marshaled_exception)
++    (strm << CORBA::Any::from_boolean (_pd_is_system_exception)) &&
++    (strm << CORBA::Any::from_boolean (_pd_byte_order)) &&
++    (strm << _pd_marshaled_exception)
+   )
      return 1;
    else
      return 0;
@@ -1015,8 +1293,18 @@
 +
  }
  
- ACE_INLINE CORBA::Boolean
-@@ -3909,7 +3963,7 @@
+-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, Messaging::ExceptionHolder &_tao_aggregate)
++ACE_INLINE CORBA::Boolean
++OBV_Messaging::ExceptionHolder::_tao_unmarshal_state (TAO_InputCDR &strm)
+ {
+   if (
+-    (strm >> CORBA::Any::to_boolean (_tao_aggregate.is_system_exception)) &&
+-    (strm >> CORBA::Any::to_boolean (_tao_aggregate.byte_order)) &&
+-    (strm >> _tao_aggregate.marshaled_exception)
++    (strm >> CORBA::Any::to_boolean (_pd_is_system_exception)) &&
++    (strm >> CORBA::Any::to_boolean (_pd_byte_order)) &&
++    (strm >> _pd_marshaled_exception)
+   )
      return 1;
    else
      return 0;
@@ -1025,7 +1313,7 @@
  }
  
  ACE_INLINE CORBA::Boolean
-@@ -3961,3 +4015,4 @@
+@@ -4144,3 +4222,4 @@
    return 0;
  }