ChangeLogTag: Tue Jan 16 20:43:46 2001 Jeff Parsons <parsons@cs.wustl.edu>

18 files changed, 1259 insertions, 250 deletions

diff --git a/TAO/tao/CONV_FRAMEC.i b/TAO/tao/CONV_FRAMEC.i
index 811efdeeb48..ca01549ce64 100644
--- a/TAO/tao/CONV_FRAMEC.i
+++ b/TAO/tao/CONV_FRAMEC.i
@@ -41,12 +41,27 @@ ACE_INLINE CONV_FRAME::CodeSetComponent_var &
 CONV_FRAME::CodeSetComponent_var::operator= (const CONV_FRAME::CodeSetComponent_var &p)
 {
   if (this != &p)
-  {
-    delete this->ptr_;
-    ACE_NEW_RETURN (this->ptr_,
-                    CONV_FRAME::CodeSetComponent (*p.ptr_),
-		    *this);
-  }
+    {
+      if (p.ptr_ == 0)
+        {
+          delete this->ptr_;
+          this->ptr_ = 0;
+        }
+      else
+        {
+          CONV_FRAME::CodeSetComponent *deep_copy = 
+                new CONV_FRAME::CodeSetComponent (*p.ptr_);
+          
+          if (deep_copy != 0)
+            {
+              CONV_FRAME::CodeSetComponent *tmp = deep_copy;
+              deep_copy = this->ptr_;
+              this->ptr_ = tmp;
+              delete deep_copy;
+            }
+        }
+    }
+  
   return *this;
 }
 
@@ -385,12 +400,28 @@ ACE_INLINE CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_var &
 CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_var::operator= (const CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId_var &p) // deep copy
 {
   if (this != &p)
-  {
-    delete this->ptr_;
-    ACE_NEW_RETURN (this->ptr_,
-                    CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId (*p.ptr_),
-		    *this);
-  }
+    {
+      if (p.ptr_ == 0)
+        {
+          delete this->ptr_;
+          this->ptr_ = 0;
+        }
+      else
+        {
+          CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId *deep_copy = 
+            new CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId (*p.ptr_);
+          
+          if (deep_copy != 0)
+            {
+              CONV_FRAME::CodeSetComponent::_tao_seq_CodeSetId *tmp = 
+                deep_copy;
+              deep_copy = this->ptr_;
+              this->ptr_ = tmp;
+              delete deep_copy;
+            }
+        }
+    }
+  
   return *this;
 }
 
@@ -571,12 +602,27 @@ ACE_INLINE CONV_FRAME::CodeSetComponentInfo_var &
 CONV_FRAME::CodeSetComponentInfo_var::operator= (const CONV_FRAME::CodeSetComponentInfo_var &p)
 {
   if (this != &p)
-  {
-    delete this->ptr_;
-    ACE_NEW_RETURN (this->ptr_,
-                    CONV_FRAME::CodeSetComponentInfo (*p.ptr_),
-		    *this);
-  }
+    {
+      if (p.ptr_ == 0)
+        {
+          delete this->ptr_;
+          this->ptr_ = 0;
+        }
+      else
+        {
+          CONV_FRAME::CodeSetComponentInfo *deep_copy = 
+            new CONV_FRAME::CodeSetComponentInfo (*p.ptr_);
+          
+          if (deep_copy != 0)
+            {
+              CONV_FRAME::CodeSetComponentInfo *tmp = deep_copy;
+              deep_copy = this->ptr_;
+              this->ptr_ = tmp;
+              delete deep_copy;
+            }
+        }
+    }
+  
   return *this;
 }
 
@@ -742,12 +788,27 @@ ACE_INLINE CONV_FRAME::CodeSetContext_var &
 CONV_FRAME::CodeSetContext_var::operator= (const CONV_FRAME::CodeSetContext_var &p)
 {
   if (this != &p)
-  {
-    delete this->ptr_;
-    ACE_NEW_RETURN (this->ptr_,
-                    CONV_FRAME::CodeSetContext (*p.ptr_),
-		    *this);
-  }
+    {
+      if (p.ptr_ == 0)
+        {
+          delete this->ptr_;
+          this->ptr_ = 0;
+        }
+      else
+        {
+          CONV_FRAME::CodeSetContext *deep_copy = 
+            new CONV_FRAME::CodeSetContext (*p.ptr_);
+          
+          if (deep_copy != 0)
+            {
+              CONV_FRAME::CodeSetContext *tmp = deep_copy;
+              deep_copy = this->ptr_;
+              this->ptr_ = tmp;
+              delete deep_copy;
+            }
+        }
+    }
+  
   return *this;
 }
 
diff --git a/TAO/tao/DomainC.i b/TAO/tao/DomainC.i
index 0e9d28daad3..36b36143303 100644
--- a/TAO/tao/DomainC.i
+++ b/TAO/tao/DomainC.i
@@ -605,10 +605,27 @@ ACE_INLINE CORBA_DomainManagerList_var &
 CORBA_DomainManagerList_var::operator= (const ::CORBA_DomainManagerList_var &p) // deep copy
 {
   if (this != &p)
-  {
-    delete this->ptr_;
-    ACE_NEW_RETURN (this->ptr_, ::CORBA_DomainManagerList (*p.ptr_), *this);
-  }
+    {
+      if (p.ptr_ == 0)
+        {
+          delete this->ptr_;
+          this->ptr_ = 0;
+        }
+      else
+        {
+          CORBA_DomainManagerList *deep_copy = 
+            new CORBA_DomainManagerList (*p.ptr_);
+          
+          if (deep_copy != 0)
+            {
+              CORBA_DomainManagerList *tmp = deep_copy;
+              deep_copy = this->ptr_;
+              this->ptr_ = tmp;
+              delete deep_copy;
+            }
+        }
+    }
+  
   return *this;
 }
 
diff --git a/TAO/tao/DynamicAny/DynamicAnyC.i b/TAO/tao/DynamicAny/DynamicAnyC.i
index 1ab3dd4cf57..320d8df0ce1 100644
--- a/TAO/tao/DynamicAny/DynamicAnyC.i
+++ b/TAO/tao/DynamicAny/DynamicAnyC.i
@@ -576,10 +576,27 @@ ACE_INLINE ::DynamicAny::NameValuePair_var &
 DynamicAny::NameValuePair_var::operator= (const ::DynamicAny::NameValuePair_var &p)
 {
   if (this != &p)
-  {
-    delete this->ptr_;
-    ACE_NEW_RETURN (this->ptr_, ::DynamicAny::NameValuePair (*p.ptr_), *this);
-  }
+    {
+      if (p.ptr_ == 0)
+        {
+          delete this->ptr_;
+          this->ptr_ = 0;
+        }
+      else
+        {
+          DynamicAny::NameValuePair *deep_copy = 
+            new DynamicAny::NameValuePair (*p.ptr_);
+          
+          if (deep_copy != 0)
+            {
+              DynamicAny::NameValuePair *tmp = deep_copy;
+              deep_copy = this->ptr_;
+              this->ptr_ = tmp;
+              delete deep_copy;
+            }
+        }
+    }
+  
   return *this;
 }
 
@@ -932,10 +949,27 @@ ACE_INLINE DynamicAny::NameValuePairSeq_var &
 DynamicAny::NameValuePairSeq_var::operator= (const ::DynamicAny::NameValuePairSeq_var &p) // deep copy
 {
   if (this != &p)
-  {
-    delete this->ptr_;
-    ACE_NEW_RETURN (this->ptr_, ::DynamicAny::NameValuePairSeq (*p.ptr_), *this);
-  }
+    {
+      if (p.ptr_ == 0)
+        {
+          delete this->ptr_;
+          this->ptr_ = 0;
+        }
+      else
+        {
+          DynamicAny::NameValuePairSeq *deep_copy = 
+            new DynamicAny::NameValuePairSeq (*p.ptr_);
+          
+          if (deep_copy != 0)
+            {
+              DynamicAny::NameValuePairSeq *tmp = deep_copy;
+              deep_copy = this->ptr_;
+              this->ptr_ = tmp;
+              delete deep_copy;
+            }
+        }
+    }
+  
   return *this;
 }
 
@@ -1129,10 +1163,27 @@ ACE_INLINE ::DynamicAny::NameDynAnyPair_var &
 DynamicAny::NameDynAnyPair_var::operator= (const ::DynamicAny::NameDynAnyPair_var &p)
 {
   if (this != &p)
-  {
-    delete this->ptr_;
-    ACE_NEW_RETURN (this->ptr_, ::DynamicAny::NameDynAnyPair (*p.ptr_), *this);
-  }
+    {
+      if (p.ptr_ == 0)
+        {
+          delete this->ptr_;
+          this->ptr_ = 0;
+        }
+      else
+        {
+          DynamicAny::NameDynAnyPair *deep_copy = 
+            new DynamicAny::NameDynAnyPair (*p.ptr_);
+          
+          if (deep_copy != 0)
+            {
+              DynamicAny::NameDynAnyPair *tmp = deep_copy;
+              deep_copy = this->ptr_;
+              this->ptr_ = tmp;
+              delete deep_copy;
+            }
+        }
+    }
+  
   return *this;
 }
 
@@ -1485,10 +1536,27 @@ ACE_INLINE DynamicAny::NameDynAnyPairSeq_var &
 DynamicAny::NameDynAnyPairSeq_var::operator= (const ::DynamicAny::NameDynAnyPairSeq_var &p) // deep copy
 {
   if (this != &p)
-  {
-    delete this->ptr_;
-    ACE_NEW_RETURN (this->ptr_, ::DynamicAny::NameDynAnyPairSeq (*p.ptr_), *this);
-  }
+    {
+      if (p.ptr_ == 0)
+        {
+          delete this->ptr_;
+          this->ptr_ = 0;
+        }
+      else
+        {
+          DynamicAny::NameDynAnyPairSeq *deep_copy = 
+            new DynamicAny::NameDynAnyPairSeq (*p.ptr_);
+          
+          if (deep_copy != 0)
+            {
+              DynamicAny::NameDynAnyPairSeq *tmp = deep_copy;
+              deep_copy = this->ptr_;
+              this->ptr_ = tmp;
+              delete deep_copy;
+            }
+        }
+    }
+  
   return *this;
 }
 
@@ -2202,10 +2270,27 @@ ACE_INLINE DynamicAny::AnySeq_var &
 DynamicAny::AnySeq_var::operator= (const ::DynamicAny::AnySeq_var &p) // deep copy
 {
   if (this != &p)
-  {
-    delete this->ptr_;
-    ACE_NEW_RETURN (this->ptr_, ::DynamicAny::AnySeq (*p.ptr_), *this);
-  }
+    {
+      if (p.ptr_ == 0)
+        {
+          delete this->ptr_;
+          this->ptr_ = 0;
+        }
+      else
+        {
+          DynamicAny::AnySeq *deep_copy = 
+            new DynamicAny::AnySeq (*p.ptr_);
+          
+          if (deep_copy != 0)
+            {
+              DynamicAny::AnySeq *tmp = deep_copy;
+              deep_copy = this->ptr_;
+              this->ptr_ = tmp;
+              delete deep_copy;
+            }
+        }
+    }
+  
   return *this;
 }
 
@@ -2559,10 +2644,27 @@ ACE_INLINE DynamicAny::DynAnySeq_var &
 DynamicAny::DynAnySeq_var::operator= (const ::DynamicAny::DynAnySeq_var &p) // deep copy
 {
   if (this != &p)
-  {
-    delete this->ptr_;
-    ACE_NEW_RETURN (this->ptr_, ::DynamicAny::DynAnySeq (*p.ptr_), *this);
-  }
+    {
+      if (p.ptr_ == 0)
+        {
+          delete this->ptr_;
+          this->ptr_ = 0;
+        }
+      else
+        {
+          DynamicAny::DynAnySeq *deep_copy = 
+            new DynamicAny::DynAnySeq (*p.ptr_);
+          
+          if (deep_copy != 0)
+            {
+              DynamicAny::DynAnySeq *tmp = deep_copy;
+              deep_copy = this->ptr_;
+              this->ptr_ = tmp;
+              delete deep_copy;
+            }
+        }
+    }
+  
   return *this;
 }
 
diff --git a/TAO/tao/DynamicC.i b/TAO/tao/DynamicC.i
index fbaabf909ab..439f4e33bdc 100644
--- a/TAO/tao/DynamicC.i
+++ b/TAO/tao/DynamicC.i
@@ -60,10 +60,26 @@ ACE_INLINE ::Dynamic::Parameter_var &
 Dynamic::Parameter_var::operator= (const ::Dynamic::Parameter_var &p)
 {
   if (this != &p)
-  {
-    delete this->ptr_;
-    ACE_NEW_RETURN (this->ptr_, ::Dynamic::Parameter (*p.ptr_), *this);
-  }
+    {
+      if (p.ptr_ == 0)
+        {
+          delete this->ptr_;
+          this->ptr_ = 0;
+        }
+      else
+        {
+          Dynamic::Parameter *deep_copy = new Dynamic::Parameter (*p.ptr_);
+          
+          if (deep_copy != 0)
+            {
+              Dynamic::Parameter *tmp = deep_copy;
+              deep_copy = this->ptr_;
+              this->ptr_ = tmp;
+              delete deep_copy;
+            }
+        }
+    }
+  
   return *this;
 }
 
@@ -416,10 +432,27 @@ ACE_INLINE Dynamic::ParameterList_var &
 Dynamic::ParameterList_var::operator= (const ::Dynamic::ParameterList_var &p) // deep copy
 {
   if (this != &p)
-  {
-    delete this->ptr_;
-    ACE_NEW_RETURN (this->ptr_, ::Dynamic::ParameterList (*p.ptr_), *this);
-  }
+    {
+      if (p.ptr_ == 0)
+        {
+          delete this->ptr_;
+          this->ptr_ = 0;
+        }
+      else
+        {
+          Dynamic::ParameterList *deep_copy = 
+            new Dynamic::ParameterList (*p.ptr_);
+          
+          if (deep_copy != 0)
+            {
+              Dynamic::ParameterList *tmp = deep_copy;
+              deep_copy = this->ptr_;
+              this->ptr_ = tmp;
+              delete deep_copy;
+            }
+        }
+    }
+  
   return *this;
 }
 
@@ -773,10 +806,27 @@ ACE_INLINE Dynamic::ExceptionList_var &
 Dynamic::ExceptionList_var::operator= (const ::Dynamic::ExceptionList_var &p) // deep copy
 {
   if (this != &p)
-  {
-    delete this->ptr_;
-    ACE_NEW_RETURN (this->ptr_, ::Dynamic::ExceptionList (*p.ptr_), *this);
-  }
+    {
+      if (p.ptr_ == 0)
+        {
+          delete this->ptr_;
+          this->ptr_ = 0;
+        }
+      else
+        {
+          Dynamic::ExceptionList *deep_copy = 
+            new Dynamic::ExceptionList (*p.ptr_);
+          
+          if (deep_copy != 0)
+            {
+              Dynamic::ExceptionList *tmp = deep_copy;
+              deep_copy = this->ptr_;
+              this->ptr_ = tmp;
+              delete deep_copy;
+            }
+        }
+    }
+  
   return *this;
 }
 
diff --git a/TAO/tao/GIOPC.i b/TAO/tao/GIOPC.i
index 4391d3d1a9d..6332dcb063c 100644
--- a/TAO/tao/GIOPC.i
+++ b/TAO/tao/GIOPC.i
@@ -48,10 +48,27 @@ ACE_INLINE GIOP::IORAddressingInfo_var &
 GIOP::IORAddressingInfo_var::operator= (const GIOP::IORAddressingInfo_var &p)
 {
   if (this != &p)
-  {
-    delete this->ptr_;
-    ACE_NEW_RETURN (this->ptr_, GIOP::IORAddressingInfo (*p.ptr_), *this);
-  }
+    {
+      if (p.ptr_ == 0)
+        {
+          delete this->ptr_;
+          this->ptr_ = 0;
+        }
+      else
+        {
+          GIOP::IORAddressingInfo *deep_copy = 
+            new GIOP::IORAddressingInfo (*p.ptr_);
+          
+          if (deep_copy != 0)
+            {
+              GIOP::IORAddressingInfo *tmp = deep_copy;
+              deep_copy = this->ptr_;
+              this->ptr_ = tmp;
+              delete deep_copy;
+            }
+        }
+    }
+  
   return *this;
 }
 
@@ -343,10 +360,27 @@ ACE_INLINE GIOP::TargetAddress_var &
 GIOP::TargetAddress_var::operator= (const GIOP::TargetAddress_var &p)
 {
   if (this != &p)
-  {
-    delete this->ptr_;
-    ACE_NEW_RETURN (this->ptr_, GIOP::TargetAddress (*p.ptr_), *this);
-  }
+    {
+      if (p.ptr_ == 0)
+        {
+          delete this->ptr_;
+          this->ptr_ = 0;
+        }
+      else
+        {
+          GIOP::TargetAddress *deep_copy = 
+            new GIOP::TargetAddress (*p.ptr_);
+          
+          if (deep_copy != 0)
+            {
+              GIOP::TargetAddress *tmp = deep_copy;
+              deep_copy = this->ptr_;
+              this->ptr_ = tmp;
+              delete deep_copy;
+            }
+        }
+    }
+  
   return *this;
 }
 
diff --git a/TAO/tao/IIOPC.i b/TAO/tao/IIOPC.i
index 40161661eac..df1e0b8bbcd 100644
--- a/TAO/tao/IIOPC.i
+++ b/TAO/tao/IIOPC.i
@@ -60,10 +60,27 @@ ACE_INLINE ::IIOP::ListenPoint_var &
 IIOP::ListenPoint_var::operator= (const ::IIOP::ListenPoint_var &p)
 {
   if (this != &p)
-  {
-    delete this->ptr_;
-    ACE_NEW_RETURN (this->ptr_, ::IIOP::ListenPoint (*p.ptr_), *this);
-  }
+    {
+      if (p.ptr_ == 0)
+        {
+          delete this->ptr_;
+          this->ptr_ = 0;
+        }
+      else
+        {
+          IIOP::ListenPoint *deep_copy = 
+            new IIOP::ListenPoint (*p.ptr_);
+          
+          if (deep_copy != 0)
+            {
+              IIOP::ListenPoint *tmp = deep_copy;
+              deep_copy = this->ptr_;
+              this->ptr_ = tmp;
+              delete deep_copy;
+            }
+        }
+    }
+  
   return *this;
 }
 
@@ -416,10 +433,27 @@ ACE_INLINE IIOP::ListenPointList_var &
 IIOP::ListenPointList_var::operator= (const ::IIOP::ListenPointList_var &p) // deep copy
 {
   if (this != &p)
-  {
-    delete this->ptr_;
-    ACE_NEW_RETURN (this->ptr_, ::IIOP::ListenPointList (*p.ptr_), *this);
-  }
+    {
+      if (p.ptr_ == 0)
+        {
+          delete this->ptr_;
+          this->ptr_ = 0;
+        }
+      else
+        {
+          IIOP::ListenPointList *deep_copy = 
+            new IIOP::ListenPointList (*p.ptr_);
+          
+          if (deep_copy != 0)
+            {
+              IIOP::ListenPointList *tmp = deep_copy;
+              deep_copy = this->ptr_;
+              this->ptr_ = tmp;
+              delete deep_copy;
+            }
+        }
+    }
+  
   return *this;
 }
 
@@ -613,10 +647,27 @@ ACE_INLINE ::IIOP::BiDirIIOPServiceContext_var &
 IIOP::BiDirIIOPServiceContext_var::operator= (const ::IIOP::BiDirIIOPServiceContext_var &p)
 {
   if (this != &p)
-  {
-    delete this->ptr_;
-    ACE_NEW_RETURN (this->ptr_, ::IIOP::BiDirIIOPServiceContext (*p.ptr_), *this);
-  }
+    {
+      if (p.ptr_ == 0)
+        {
+          delete this->ptr_;
+          this->ptr_ = 0;
+        }
+      else
+        {
+          IIOP::BiDirIIOPServiceContext *deep_copy = 
+            new IIOP::BiDirIIOPServiceContext (*p.ptr_);
+          
+          if (deep_copy != 0)
+            {
+              IIOP::BiDirIIOPServiceContext *tmp = deep_copy;
+              deep_copy = this->ptr_;
+              this->ptr_ = tmp;
+              delete deep_copy;
+            }
+        }
+    }
+  
   return *this;
 }
 
diff --git a/TAO/tao/IOPC.i b/TAO/tao/IOPC.i
index 138236420af..2881a39a3f6 100644
--- a/TAO/tao/IOPC.i
+++ b/TAO/tao/IOPC.i
@@ -60,10 +60,27 @@ ACE_INLINE ::IOP::TaggedProfile_var &
 IOP::TaggedProfile_var::operator= (const ::IOP::TaggedProfile_var &p)
 {
   if (this != &p)
-  {
-    delete this->ptr_;
-    ACE_NEW_RETURN (this->ptr_, ::IOP::TaggedProfile (*p.ptr_), *this);
-  }
+    {
+      if (p.ptr_ == 0)
+        {
+          delete this->ptr_;
+          this->ptr_ = 0;
+        }
+      else
+        {
+          IOP::TaggedProfile *deep_copy = 
+            new IOP::TaggedProfile (*p.ptr_);
+          
+          if (deep_copy != 0)
+            {
+              IOP::TaggedProfile *tmp = deep_copy;
+              deep_copy = this->ptr_;
+              this->ptr_ = tmp;
+              delete deep_copy;
+            }
+        }
+    }
+  
   return *this;
 }
 
@@ -247,10 +264,27 @@ ACE_INLINE IOP::TaggedProfile::_tao_seq_Octet_var &
 IOP::TaggedProfile::_tao_seq_Octet_var::operator= (const ::IOP::TaggedProfile::_tao_seq_Octet_var &p) // deep copy
 {
   if (this != &p)
-  {
-    delete this->ptr_;
-    ACE_NEW_RETURN (this->ptr_, ::IOP::TaggedProfile::_tao_seq_Octet (*p.ptr_), *this);
-  }
+    {
+      if (p.ptr_ == 0)
+        {
+          delete this->ptr_;
+          this->ptr_ = 0;
+        }
+      else
+        {
+          IOP::TaggedProfile::_tao_seq_Octet *deep_copy = 
+            new IOP::TaggedProfile::_tao_seq_Octet (*p.ptr_);
+          
+          if (deep_copy != 0)
+            {
+              IOP::TaggedProfile::_tao_seq_Octet *tmp = deep_copy;
+              deep_copy = this->ptr_;
+              this->ptr_ = tmp;
+              delete deep_copy;
+            }
+        }
+    }
+  
   return *this;
 }
 
@@ -443,10 +477,27 @@ ACE_INLINE ::IOP::IOR_var &
 IOP::IOR_var::operator= (const ::IOP::IOR_var &p)
 {
   if (this != &p)
-  {
-    delete this->ptr_;
-    ACE_NEW_RETURN (this->ptr_, ::IOP::IOR (*p.ptr_), *this);
-  }
+    {
+      if (p.ptr_ == 0)
+        {
+          delete this->ptr_;
+          this->ptr_ = 0;
+        }
+      else
+        {
+          IOP::IOR *deep_copy = 
+            new IOP::IOR (*p.ptr_);
+          
+          if (deep_copy != 0)
+            {
+              IOP::IOR *tmp = deep_copy;
+              deep_copy = this->ptr_;
+              this->ptr_ = tmp;
+              delete deep_copy;
+            }
+        }
+    }
+  
   return *this;
 }
 
@@ -799,10 +850,27 @@ ACE_INLINE IOP::IOR::_tao_seq_TaggedProfile_var &
 IOP::IOR::_tao_seq_TaggedProfile_var::operator= (const ::IOP::IOR::_tao_seq_TaggedProfile_var &p) // deep copy
 {
   if (this != &p)
-  {
-    delete this->ptr_;
-    ACE_NEW_RETURN (this->ptr_, ::IOP::IOR::_tao_seq_TaggedProfile (*p.ptr_), *this);
-  }
+    {
+      if (p.ptr_ == 0)
+        {
+          delete this->ptr_;
+          this->ptr_ = 0;
+        }
+      else
+        {
+          IOP::IOR::_tao_seq_TaggedProfile *deep_copy = 
+            new IOP::IOR::_tao_seq_TaggedProfile (*p.ptr_);
+          
+          if (deep_copy != 0)
+            {
+              IOP::IOR::_tao_seq_TaggedProfile *tmp = deep_copy;
+              deep_copy = this->ptr_;
+              this->ptr_ = tmp;
+              delete deep_copy;
+            }
+        }
+    }
+  
   return *this;
 }
 
@@ -990,10 +1058,27 @@ ACE_INLINE ::IOP::TaggedComponent_var &
 IOP::TaggedComponent_var::operator= (const ::IOP::TaggedComponent_var &p)
 {
   if (this != &p)
-  {
-    delete this->ptr_;
-    ACE_NEW_RETURN (this->ptr_, ::IOP::TaggedComponent (*p.ptr_), *this);
-  }
+    {
+      if (p.ptr_ == 0)
+        {
+          delete this->ptr_;
+          this->ptr_ = 0;
+        }
+      else
+        {
+          IOP::TaggedComponent *deep_copy = 
+            new IOP::TaggedComponent (*p.ptr_);
+          
+          if (deep_copy != 0)
+            {
+              IOP::TaggedComponent *tmp = deep_copy;
+              deep_copy = this->ptr_;
+              this->ptr_ = tmp;
+              delete deep_copy;
+            }
+        }
+    }
+  
   return *this;
 }
 
@@ -1177,10 +1262,27 @@ ACE_INLINE IOP::TaggedComponent::_tao_seq_Octet_var &
 IOP::TaggedComponent::_tao_seq_Octet_var::operator= (const ::IOP::TaggedComponent::_tao_seq_Octet_var &p) // deep copy
 {
   if (this != &p)
-  {
-    delete this->ptr_;
-    ACE_NEW_RETURN (this->ptr_, ::IOP::TaggedComponent::_tao_seq_Octet (*p.ptr_), *this);
-  }
+    {
+      if (p.ptr_ == 0)
+        {
+          delete this->ptr_;
+          this->ptr_ = 0;
+        }
+      else
+        {
+          IOP::TaggedComponent::_tao_seq_Octet *deep_copy = 
+            new IOP::TaggedComponent::_tao_seq_Octet (*p.ptr_);
+          
+          if (deep_copy != 0)
+            {
+              IOP::TaggedComponent::_tao_seq_Octet *tmp = deep_copy;
+              deep_copy = this->ptr_;
+              this->ptr_ = tmp;
+              delete deep_copy;
+            }
+        }
+    }
+  
   return *this;
 }
 
@@ -1553,10 +1655,27 @@ ACE_INLINE IOP::MultipleComponentProfile_var &
 IOP::MultipleComponentProfile_var::operator= (const ::IOP::MultipleComponentProfile_var &p) // deep copy
 {
   if (this != &p)
-  {
-    delete this->ptr_;
-    ACE_NEW_RETURN (this->ptr_, ::IOP::MultipleComponentProfile (*p.ptr_), *this);
-  }
+    {
+      if (p.ptr_ == 0)
+        {
+          delete this->ptr_;
+          this->ptr_ = 0;
+        }
+      else
+        {
+          IOP::MultipleComponentProfile *deep_copy = 
+            new IOP::MultipleComponentProfile (*p.ptr_);
+          
+          if (deep_copy != 0)
+            {
+              IOP::MultipleComponentProfile *tmp = deep_copy;
+              deep_copy = this->ptr_;
+              this->ptr_ = tmp;
+              delete deep_copy;
+            }
+        }
+    }
+  
   return *this;
 }
 
@@ -1924,10 +2043,27 @@ ACE_INLINE IOP::TaggedComponentList_var &
 IOP::TaggedComponentList_var::operator= (const ::IOP::TaggedComponentList_var &p) // deep copy
 {
   if (this != &p)
-  {
-    delete this->ptr_;
-    ACE_NEW_RETURN (this->ptr_, ::IOP::TaggedComponentList (*p.ptr_), *this);
-  }
+    {
+      if (p.ptr_ == 0)
+        {
+          delete this->ptr_;
+          this->ptr_ = 0;
+        }
+      else
+        {
+          IOP::TaggedComponentList *deep_copy = 
+            new IOP::TaggedComponentList (*p.ptr_);
+          
+          if (deep_copy != 0)
+            {
+              IOP::TaggedComponentList *tmp = deep_copy;
+              deep_copy = this->ptr_;
+              this->ptr_ = tmp;
+              delete deep_copy;
+            }
+        }
+    }
+  
   return *this;
 }
 
@@ -2115,10 +2251,27 @@ ACE_INLINE ::IOP::ServiceContext_var &
 IOP::ServiceContext_var::operator= (const ::IOP::ServiceContext_var &p)
 {
   if (this != &p)
-  {
-    delete this->ptr_;
-    ACE_NEW_RETURN (this->ptr_, ::IOP::ServiceContext (*p.ptr_), *this);
-  }
+    {
+      if (p.ptr_ == 0)
+        {
+          delete this->ptr_;
+          this->ptr_ = 0;
+        }
+      else
+        {
+          IOP::ServiceContext *deep_copy = 
+            new IOP::ServiceContext (*p.ptr_);
+          
+          if (deep_copy != 0)
+            {
+              IOP::ServiceContext *tmp = deep_copy;
+              deep_copy = this->ptr_;
+              this->ptr_ = tmp;
+              delete deep_copy;
+            }
+        }
+    }
+  
   return *this;
 }
 
@@ -2302,10 +2455,27 @@ ACE_INLINE IOP::ServiceContext::_tao_seq_Octet_var &
 IOP::ServiceContext::_tao_seq_Octet_var::operator= (const ::IOP::ServiceContext::_tao_seq_Octet_var &p) // deep copy
 {
   if (this != &p)
-  {
-    delete this->ptr_;
-    ACE_NEW_RETURN (this->ptr_, ::IOP::ServiceContext::_tao_seq_Octet (*p.ptr_), *this);
-  }
+    {
+      if (p.ptr_ == 0)
+        {
+          delete this->ptr_;
+          this->ptr_ = 0;
+        }
+      else
+        {
+          IOP::ServiceContext::_tao_seq_Octet *deep_copy = 
+            new IOP::ServiceContext::_tao_seq_Octet (*p.ptr_);
+          
+          if (deep_copy != 0)
+            {
+              IOP::ServiceContext::_tao_seq_Octet *tmp = deep_copy;
+              deep_copy = this->ptr_;
+              this->ptr_ = tmp;
+              delete deep_copy;
+            }
+        }
+    }
+  
   return *this;
 }
 
@@ -2678,10 +2848,27 @@ ACE_INLINE IOP::ServiceContextList_var &
 IOP::ServiceContextList_var::operator= (const ::IOP::ServiceContextList_var &p) // deep copy
 {
   if (this != &p)
-  {
-    delete this->ptr_;
-    ACE_NEW_RETURN (this->ptr_, ::IOP::ServiceContextList (*p.ptr_), *this);
-  }
+    {
+      if (p.ptr_ == 0)
+        {
+          delete this->ptr_;
+          this->ptr_ = 0;
+        }
+      else
+        {
+          IOP::ServiceContextList *deep_copy = 
+            new IOP::ServiceContextList (*p.ptr_);
+          
+          if (deep_copy != 0)
+            {
+              IOP::ServiceContextList *tmp = deep_copy;
+              deep_copy = this->ptr_;
+              this->ptr_ = tmp;
+              delete deep_copy;
+            }
+        }
+    }
+  
   return *this;
 }
 
diff --git a/TAO/tao/IORManipulation/IORC.i b/TAO/tao/IORManipulation/IORC.i
index 9faffc5cef0..e01dc172db3 100644
--- a/TAO/tao/IORManipulation/IORC.i
+++ b/TAO/tao/IORManipulation/IORC.i
@@ -398,10 +398,27 @@ ACE_INLINE TAO_IOP::TAO_IOR_Manipulation::IORList_var &
 TAO_IOP::TAO_IOR_Manipulation::IORList_var::operator= (const ::TAO_IOP::TAO_IOR_Manipulation::IORList_var &p) // deep copy
 {
   if (this != &p)
-  {
-    delete this->ptr_;
-    ACE_NEW_RETURN (this->ptr_, ::TAO_IOP::TAO_IOR_Manipulation::IORList (*p.ptr_), *this);
-  }
+    {
+      if (p.ptr_ == 0)
+        {
+          delete this->ptr_;
+          this->ptr_ = 0;
+        }
+      else
+        {
+          TAO_IOP::TAO_IOR_Manipulation::IORList *deep_copy = 
+            new TAO_IOP::TAO_IOR_Manipulation::IORList (*p.ptr_);
+          
+          if (deep_copy != 0)
+            {
+              TAO_IOP::TAO_IOR_Manipulation::IORList *tmp = deep_copy;
+              deep_copy = this->ptr_;
+              this->ptr_ = tmp;
+              delete deep_copy;
+            }
+        }
+    }
+  
   return *this;
 }
 
diff --git a/TAO/tao/MessagingC.i b/TAO/tao/MessagingC.i
index 8a3a395ccbc..408bc32eca4 100644
--- a/TAO/tao/MessagingC.i
+++ b/TAO/tao/MessagingC.i
@@ -432,10 +432,27 @@ ACE_INLINE ::Messaging::PriorityRange_var &
 Messaging::PriorityRange_var::operator= (const ::Messaging::PriorityRange_var &p)
 {
   if (this != &p)
-  {
-    delete this->ptr_;
-    ACE_NEW_RETURN (this->ptr_, ::Messaging::PriorityRange (*p.ptr_), *this);
-  }
+    {
+      if (p.ptr_ == 0)
+        {
+          delete this->ptr_;
+          this->ptr_ = 0;
+        }
+      else
+        {
+          Messaging::PriorityRange *deep_copy = 
+            new Messaging::PriorityRange (*p.ptr_);
+          
+          if (deep_copy != 0)
+            {
+              Messaging::PriorityRange *tmp = deep_copy;
+              deep_copy = this->ptr_;
+              this->ptr_ = tmp;
+              delete deep_copy;
+            }
+        }
+    }
+  
   return *this;
 }
 
@@ -2052,10 +2069,27 @@ ACE_INLINE ::Messaging::RoutingTypeRange_var &
 Messaging::RoutingTypeRange_var::operator= (const ::Messaging::RoutingTypeRange_var &p)
 {
   if (this != &p)
-  {
-    delete this->ptr_;
-    ACE_NEW_RETURN (this->ptr_, ::Messaging::RoutingTypeRange (*p.ptr_), *this);
-  }
+    {
+      if (p.ptr_ == 0)
+        {
+          delete this->ptr_;
+          this->ptr_ = 0;
+        }
+      else
+        {
+          Messaging::RoutingTypeRange *deep_copy = 
+            new Messaging::RoutingTypeRange (*p.ptr_);
+          
+          if (deep_copy != 0)
+            {
+              Messaging::RoutingTypeRange *tmp = deep_copy;
+              deep_copy = this->ptr_;
+              this->ptr_ = tmp;
+              delete deep_copy;
+            }
+        }
+    }
+  
   return *this;
 }
 
@@ -2732,10 +2766,27 @@ ACE_INLINE ::Messaging::PolicyValue_var &
 Messaging::PolicyValue_var::operator= (const ::Messaging::PolicyValue_var &p)
 {
   if (this != &p)
-  {
-    delete this->ptr_;
-    ACE_NEW_RETURN (this->ptr_, ::Messaging::PolicyValue (*p.ptr_), *this);
-  }
+    {
+      if (p.ptr_ == 0)
+        {
+          delete this->ptr_;
+          this->ptr_ = 0;
+        }
+      else
+        {
+          Messaging::PolicyValue *deep_copy = 
+            new Messaging::PolicyValue (*p.ptr_);
+          
+          if (deep_copy != 0)
+            {
+              Messaging::PolicyValue *tmp = deep_copy;
+              deep_copy = this->ptr_;
+              this->ptr_ = tmp;
+              delete deep_copy;
+            }
+        }
+    }
+  
   return *this;
 }
 
@@ -2919,10 +2970,27 @@ ACE_INLINE Messaging::PolicyValue::_tao_seq_Octet_var &
 Messaging::PolicyValue::_tao_seq_Octet_var::operator= (const ::Messaging::PolicyValue::_tao_seq_Octet_var &p) // deep copy
 {
   if (this != &p)
-  {
-    delete this->ptr_;
-    ACE_NEW_RETURN (this->ptr_, ::Messaging::PolicyValue::_tao_seq_Octet (*p.ptr_), *this);
-  }
+    {
+      if (p.ptr_ == 0)
+        {
+          delete this->ptr_;
+          this->ptr_ = 0;
+        }
+      else
+        {
+          Messaging::PolicyValue::_tao_seq_Octet *deep_copy = 
+            new Messaging::PolicyValue::_tao_seq_Octet (*p.ptr_);
+          
+          if (deep_copy != 0)
+            {
+              Messaging::PolicyValue::_tao_seq_Octet *tmp = deep_copy;
+              deep_copy = this->ptr_;
+              this->ptr_ = tmp;
+              delete deep_copy;
+            }
+        }
+    }
+  
   return *this;
 }
 
@@ -3295,10 +3363,27 @@ ACE_INLINE Messaging::PolicyValueSeq_var &
 Messaging::PolicyValueSeq_var::operator= (const ::Messaging::PolicyValueSeq_var &p) // deep copy
 {
   if (this != &p)
-  {
-    delete this->ptr_;
-    ACE_NEW_RETURN (this->ptr_, ::Messaging::PolicyValueSeq (*p.ptr_), *this);
-  }
+    {
+      if (p.ptr_ == 0)
+        {
+          delete this->ptr_;
+          this->ptr_ = 0;
+        }
+      else
+        {
+          Messaging::PolicyValueSeq *deep_copy = 
+            new Messaging::PolicyValueSeq (*p.ptr_);
+          
+          if (deep_copy != 0)
+            {
+              Messaging::PolicyValueSeq *tmp = deep_copy;
+              deep_copy = this->ptr_;
+              this->ptr_ = tmp;
+              delete deep_copy;
+            }
+        }
+    }
+  
   return *this;
 }
 
@@ -3694,10 +3779,27 @@ 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);
-  }
+    {
+      if (p.ptr_ == 0)
+        {
+          delete this->ptr_;
+          this->ptr_ = 0;
+        }
+      else
+        {
+          Messaging::ExceptionHolder::_tao_seq_Octet *deep_copy = 
+            new Messaging::ExceptionHolder::_tao_seq_Octet (*p.ptr_);
+          
+          if (deep_copy != 0)
+            {
+              Messaging::ExceptionHolder::_tao_seq_Octet *tmp = deep_copy;
+              deep_copy = this->ptr_;
+              this->ptr_ = tmp;
+              delete deep_copy;
+            }
+        }
+    }
+  
   return *this;
 }
 
diff --git a/TAO/tao/Object_KeyC.i b/TAO/tao/Object_KeyC.i
index 54fc24425fd..4f26c346930 100644
--- a/TAO/tao/Object_KeyC.i
+++ b/TAO/tao/Object_KeyC.i
@@ -89,12 +89,27 @@ ACE_INLINE TAO_ObjectKey_var &
 TAO_ObjectKey_var::operator= (const TAO_ObjectKey_var &p) // deep copy
 {
   if (this != &p)
-  {
-    delete this->ptr_;
-    ACE_NEW_RETURN (this->ptr_, 
-                    TAO_ObjectKey (*p.ptr_), 
-		    *this);
-  }
+    {
+      if (p.ptr_ == 0)
+        {
+          delete this->ptr_;
+          this->ptr_ = 0;
+        }
+      else
+        {
+          TAO_ObjectKey *deep_copy = 
+            new TAO_ObjectKey (*p.ptr_);
+          
+          if (deep_copy != 0)
+            {
+              TAO_ObjectKey *tmp = deep_copy;
+              deep_copy = this->ptr_;
+              this->ptr_ = tmp;
+              delete deep_copy;
+            }
+        }
+    }
+  
   return *this;
 }
 
diff --git a/TAO/tao/OctetSeqC.i b/TAO/tao/OctetSeqC.i
index dd294e0a090..895518fe927 100644
--- a/TAO/tao/OctetSeqC.i
+++ b/TAO/tao/OctetSeqC.i
@@ -71,10 +71,26 @@ ACE_INLINE CORBA_OctetSeq_var &
 CORBA_OctetSeq_var::operator= (const ::CORBA_OctetSeq_var &p) // deep copy
 {
   if (this != &p)
-  {
-    delete this->ptr_;
-    ACE_NEW_RETURN (this->ptr_, ::CORBA_OctetSeq (*p.ptr_), *this);
-  }
+    {
+      if (p.ptr_ == 0)
+        {
+          delete this->ptr_;
+          this->ptr_ = 0;
+        }
+      else
+        {
+          CORBA_OctetSeq *deep_copy = new CORBA_OctetSeq (*p.ptr_);
+          
+          if (deep_copy != 0)
+            {
+              CORBA_OctetSeq *tmp = deep_copy;
+              deep_copy = this->ptr_;
+              this->ptr_ = tmp;
+              delete deep_copy;
+            }
+        }
+    }
+  
   return *this;
 }
 
diff --git a/TAO/tao/PolicyC.i b/TAO/tao/PolicyC.i
index 91a5da00563..95fa4a00726 100644
--- a/TAO/tao/PolicyC.i
+++ b/TAO/tao/PolicyC.i
@@ -243,10 +243,27 @@ ACE_INLINE CORBA_InvalidPolicies::_tao_seq_UShort_var &
 CORBA_InvalidPolicies::_tao_seq_UShort_var::operator= (const ::CORBA_InvalidPolicies::_tao_seq_UShort_var &p) // deep copy
 {
   if (this != &p)
-  {
-    delete this->ptr_;
-    ACE_NEW_RETURN (this->ptr_, ::CORBA_InvalidPolicies::_tao_seq_UShort (*p.ptr_), *this);
-  }
+    {
+      if (p.ptr_ == 0)
+        {
+          delete this->ptr_;
+          this->ptr_ = 0;
+        }
+      else
+        {
+          CORBA_InvalidPolicies::_tao_seq_UShort *deep_copy = 
+            new CORBA_InvalidPolicies::_tao_seq_UShort (*p.ptr_);
+          
+          if (deep_copy != 0)
+            {
+              CORBA_InvalidPolicies::_tao_seq_UShort *tmp = deep_copy;
+              deep_copy = this->ptr_;
+              this->ptr_ = tmp;
+              delete deep_copy;
+            }
+        }
+    }
+  
   return *this;
 }
 
@@ -774,10 +791,27 @@ ACE_INLINE CORBA_PolicyList_var &
 CORBA_PolicyList_var::operator= (const ::CORBA_PolicyList_var &p) // deep copy
 {
   if (this != &p)
-  {
-    delete this->ptr_;
-    ACE_NEW_RETURN (this->ptr_, ::CORBA_PolicyList (*p.ptr_), *this);
-  }
+    {
+      if (p.ptr_ == 0)
+        {
+          delete this->ptr_;
+          this->ptr_ = 0;
+        }
+      else
+        {
+          CORBA_PolicyList *deep_copy = 
+            new CORBA_PolicyList (*p.ptr_);
+          
+          if (deep_copy != 0)
+            {
+              CORBA_PolicyList *tmp = deep_copy;
+              deep_copy = this->ptr_;
+              this->ptr_ = tmp;
+              delete deep_copy;
+            }
+        }
+    }
+  
   return *this;
 }
 
@@ -1152,10 +1186,27 @@ ACE_INLINE CORBA_PolicyTypeSeq_var &
 CORBA_PolicyTypeSeq_var::operator= (const ::CORBA_PolicyTypeSeq_var &p) // deep copy
 {
   if (this != &p)
-  {
-    delete this->ptr_;
-    ACE_NEW_RETURN (this->ptr_, ::CORBA_PolicyTypeSeq (*p.ptr_), *this);
-  }
+    {
+      if (p.ptr_ == 0)
+        {
+          delete this->ptr_;
+          this->ptr_ = 0;
+        }
+      else
+        {
+          CORBA_PolicyTypeSeq *deep_copy = 
+            new CORBA_PolicyTypeSeq (*p.ptr_);
+          
+          if (deep_copy != 0)
+            {
+              CORBA_PolicyTypeSeq *tmp = deep_copy;
+              deep_copy = this->ptr_;
+              this->ptr_ = tmp;
+              delete deep_copy;
+            }
+        }
+    }
+  
   return *this;
 }
 
diff --git a/TAO/tao/PortableServer/ImplRepoC.i b/TAO/tao/PortableServer/ImplRepoC.i
index 51c7f2eec60..cc431bdec0f 100644
--- a/TAO/tao/PortableServer/ImplRepoC.i
+++ b/TAO/tao/PortableServer/ImplRepoC.i
@@ -236,10 +236,27 @@ ACE_INLINE ::ImplementationRepository::EnvironmentVariable_var &
 ImplementationRepository::EnvironmentVariable_var::operator= (const ::ImplementationRepository::EnvironmentVariable_var &p)
 {
   if (this != &p)
-  {
-    delete this->ptr_;
-    ACE_NEW_RETURN (this->ptr_, ::ImplementationRepository::EnvironmentVariable (*p.ptr_), *this);
-  }
+    {
+      if (p.ptr_ == 0)
+        {
+          delete this->ptr_;
+          this->ptr_ = 0;
+        }
+      else
+        {
+          ImplementationRepository::EnvironmentVariable *deep_copy = 
+            new ImplementationRepository::EnvironmentVariable (*p.ptr_);
+          
+          if (deep_copy != 0)
+            {
+              ImplementationRepository::EnvironmentVariable *tmp = deep_copy;
+              deep_copy = this->ptr_;
+              this->ptr_ = tmp;
+              delete deep_copy;
+            }
+        }
+    }
+  
   return *this;
 }
 
@@ -592,10 +609,27 @@ ACE_INLINE ImplementationRepository::EnvironmentList_var &
 ImplementationRepository::EnvironmentList_var::operator= (const ::ImplementationRepository::EnvironmentList_var &p) // deep copy
 {
   if (this != &p)
-  {
-    delete this->ptr_;
-    ACE_NEW_RETURN (this->ptr_, ::ImplementationRepository::EnvironmentList (*p.ptr_), *this);
-  }
+    {
+      if (p.ptr_ == 0)
+        {
+          delete this->ptr_;
+          this->ptr_ = 0;
+        }
+      else
+        {
+          ImplementationRepository::EnvironmentList *deep_copy = 
+            new ImplementationRepository::EnvironmentList (*p.ptr_);
+          
+          if (deep_copy != 0)
+            {
+              ImplementationRepository::EnvironmentList *tmp = deep_copy;
+              deep_copy = this->ptr_;
+              this->ptr_ = tmp;
+              delete deep_copy;
+            }
+        }
+    }
+  
   return *this;
 }
 
@@ -783,10 +817,27 @@ ACE_INLINE ::ImplementationRepository::StartupOptions_var &
 ImplementationRepository::StartupOptions_var::operator= (const ::ImplementationRepository::StartupOptions_var &p)
 {
   if (this != &p)
-  {
-    delete this->ptr_;
-    ACE_NEW_RETURN (this->ptr_, ::ImplementationRepository::StartupOptions (*p.ptr_), *this);
-  }
+    {
+      if (p.ptr_ == 0)
+        {
+          delete this->ptr_;
+          this->ptr_ = 0;
+        }
+      else
+        {
+          ImplementationRepository::StartupOptions *deep_copy = 
+            new ImplementationRepository::StartupOptions (*p.ptr_);
+          
+          if (deep_copy != 0)
+            {
+              ImplementationRepository::StartupOptions *tmp = deep_copy;
+              deep_copy = this->ptr_;
+              this->ptr_ = tmp;
+              delete deep_copy;
+            }
+        }
+    }
+  
   return *this;
 }
 
@@ -959,10 +1010,27 @@ ACE_INLINE ::ImplementationRepository::ServerInformation_var &
 ImplementationRepository::ServerInformation_var::operator= (const ::ImplementationRepository::ServerInformation_var &p)
 {
   if (this != &p)
-  {
-    delete this->ptr_;
-    ACE_NEW_RETURN (this->ptr_, ::ImplementationRepository::ServerInformation (*p.ptr_), *this);
-  }
+    {
+      if (p.ptr_ == 0)
+        {
+          delete this->ptr_;
+          this->ptr_ = 0;
+        }
+      else
+        {
+          ImplementationRepository::ServerInformation *deep_copy = 
+            new ImplementationRepository::ServerInformation (*p.ptr_);
+          
+          if (deep_copy != 0)
+            {
+              ImplementationRepository::ServerInformation *tmp = deep_copy;
+              deep_copy = this->ptr_;
+              this->ptr_ = tmp;
+              delete deep_copy;
+            }
+        }
+    }
+  
   return *this;
 }
 
@@ -1315,10 +1383,27 @@ ACE_INLINE ImplementationRepository::ServerInformationList_var &
 ImplementationRepository::ServerInformationList_var::operator= (const ::ImplementationRepository::ServerInformationList_var &p) // deep copy
 {
   if (this != &p)
-  {
-    delete this->ptr_;
-    ACE_NEW_RETURN (this->ptr_, ::ImplementationRepository::ServerInformationList (*p.ptr_), *this);
-  }
+    {
+      if (p.ptr_ == 0)
+        {
+          delete this->ptr_;
+          this->ptr_ = 0;
+        }
+      else
+        {
+          ImplementationRepository::ServerInformationList *deep_copy = 
+            new ImplementationRepository::ServerInformationList (*p.ptr_);
+          
+          if (deep_copy != 0)
+            {
+              ImplementationRepository::ServerInformationList *tmp = deep_copy;
+              deep_copy = this->ptr_;
+              this->ptr_ = tmp;
+              delete deep_copy;
+            }
+        }
+    }
+  
   return *this;
 }
 
diff --git a/TAO/tao/PortableServer/PortableServerC.i b/TAO/tao/PortableServer/PortableServerC.i
index abbd8cbe570..b249fd5a73e 100644
--- a/TAO/tao/PortableServer/PortableServerC.i
+++ b/TAO/tao/PortableServer/PortableServerC.i
@@ -378,10 +378,27 @@ ACE_INLINE PortableServer::POAList_var &
 PortableServer::POAList_var::operator= (const ::PortableServer::POAList_var &p) // deep copy
 {
   if (this != &p)
-  {
-    delete this->ptr_;
-    ACE_NEW_RETURN (this->ptr_, ::PortableServer::POAList (*p.ptr_), *this);
-  }
+    {
+      if (p.ptr_ == 0)
+        {
+          delete this->ptr_;
+          this->ptr_ = 0;
+        }
+      else
+        {
+          PortableServer::POAList *deep_copy = 
+            new PortableServer::POAList (*p.ptr_);
+          
+          if (deep_copy != 0)
+            {
+              PortableServer::POAList *tmp = deep_copy;
+              deep_copy = this->ptr_;
+              this->ptr_ = tmp;
+              delete deep_copy;
+            }
+        }
+    }
+  
   return *this;
 }
 
@@ -580,10 +597,27 @@ ACE_INLINE PortableServer::ObjectId_var &
 PortableServer::ObjectId_var::operator= (const ::PortableServer::ObjectId_var &p) // deep copy
 {
   if (this != &p)
-  {
-    delete this->ptr_;
-    ACE_NEW_RETURN (this->ptr_, ::PortableServer::ObjectId (*p.ptr_), *this);
-  }
+    {
+      if (p.ptr_ == 0)
+        {
+          delete this->ptr_;
+          this->ptr_ = 0;
+        }
+      else
+        {
+          PortableServer::ObjectId *deep_copy = 
+            new PortableServer::ObjectId (*p.ptr_);
+          
+          if (deep_copy != 0)
+            {
+              PortableServer::ObjectId *tmp = deep_copy;
+              deep_copy = this->ptr_;
+              this->ptr_ = tmp;
+              delete deep_copy;
+            }
+        }
+    }
+  
   return *this;
 }
 
diff --git a/TAO/tao/RTCORBAC.i b/TAO/tao/RTCORBAC.i
index a3a3446a141..207f1e4c439 100644
--- a/TAO/tao/RTCORBAC.i
+++ b/TAO/tao/RTCORBAC.i
@@ -55,10 +55,27 @@ ACE_INLINE ::RTCORBA::ThreadpoolLane_var &
 RTCORBA::ThreadpoolLane_var::operator= (const ::RTCORBA::ThreadpoolLane_var &p)
 {
   if (this != &p)
-  {
-    delete this->ptr_;
-    ACE_NEW_RETURN (this->ptr_, ::RTCORBA::ThreadpoolLane (*p.ptr_), *this);
-  }
+    {
+      if (p.ptr_ == 0)
+        {
+          delete this->ptr_;
+          this->ptr_ = 0;
+        }
+      else
+        {
+          RTCORBA::ThreadpoolLane *deep_copy = 
+            new RTCORBA::ThreadpoolLane (*p.ptr_);
+          
+          if (deep_copy != 0)
+            {
+              RTCORBA::ThreadpoolLane *tmp = deep_copy;
+              deep_copy = this->ptr_;
+              this->ptr_ = tmp;
+              delete deep_copy;
+            }
+        }
+    }
+  
   return *this;
 }
 
@@ -363,10 +380,27 @@ ACE_INLINE RTCORBA::ThreadpoolLanes_var &
 RTCORBA::ThreadpoolLanes_var::operator= (const ::RTCORBA::ThreadpoolLanes_var &p) // deep copy
 {
   if (this != &p)
-  {
-    delete this->ptr_;
-    ACE_NEW_RETURN (this->ptr_, ::RTCORBA::ThreadpoolLanes (*p.ptr_), *this);
-  }
+    {
+      if (p.ptr_ == 0)
+        {
+          delete this->ptr_;
+          this->ptr_ = 0;
+        }
+      else
+        {
+          RTCORBA::ThreadpoolLanes *deep_copy = 
+            new RTCORBA::ThreadpoolLanes (*p.ptr_);
+          
+          if (deep_copy != 0)
+            {
+              RTCORBA::ThreadpoolLanes *tmp = deep_copy;
+              deep_copy = this->ptr_;
+              this->ptr_ = tmp;
+              delete deep_copy;
+            }
+        }
+    }
+  
   return *this;
 }
 
@@ -1115,10 +1149,27 @@ ACE_INLINE ::RTCORBA::PriorityBand_var &
 RTCORBA::PriorityBand_var::operator= (const ::RTCORBA::PriorityBand_var &p)
 {
   if (this != &p)
-  {
-    delete this->ptr_;
-    ACE_NEW_RETURN (this->ptr_, ::RTCORBA::PriorityBand (*p.ptr_), *this);
-  }
+    {
+      if (p.ptr_ == 0)
+        {
+          delete this->ptr_;
+          this->ptr_ = 0;
+        }
+      else
+        {
+          RTCORBA::PriorityBand *deep_copy = 
+            new RTCORBA::PriorityBand (*p.ptr_);
+          
+          if (deep_copy != 0)
+            {
+              RTCORBA::PriorityBand *tmp = deep_copy;
+              deep_copy = this->ptr_;
+              this->ptr_ = tmp;
+              delete deep_copy;
+            }
+        }
+    }
+  
   return *this;
 }
 
@@ -1423,10 +1474,27 @@ ACE_INLINE RTCORBA::PriorityBands_var &
 RTCORBA::PriorityBands_var::operator= (const ::RTCORBA::PriorityBands_var &p) // deep copy
 {
   if (this != &p)
-  {
-    delete this->ptr_;
-    ACE_NEW_RETURN (this->ptr_, ::RTCORBA::PriorityBands (*p.ptr_), *this);
-  }
+    {
+      if (p.ptr_ == 0)
+        {
+          delete this->ptr_;
+          this->ptr_ = 0;
+        }
+      else
+        {
+          RTCORBA::PriorityBands *deep_copy = 
+            new RTCORBA::PriorityBands (*p.ptr_);
+          
+          if (deep_copy != 0)
+            {
+              RTCORBA::PriorityBands *tmp = deep_copy;
+              deep_copy = this->ptr_;
+              this->ptr_ = tmp;
+              delete deep_copy;
+            }
+        }
+    }
+  
   return *this;
 }
 
@@ -2691,10 +2759,27 @@ ACE_INLINE ::RTCORBA::Protocol_var &
 RTCORBA::Protocol_var::operator= (const ::RTCORBA::Protocol_var &p)
 {
   if (this != &p)
-  {
-    delete this->ptr_;
-    ACE_NEW_RETURN (this->ptr_, ::RTCORBA::Protocol (*p.ptr_), *this);
-  }
+    {
+      if (p.ptr_ == 0)
+        {
+          delete this->ptr_;
+          this->ptr_ = 0;
+        }
+      else
+        {
+          RTCORBA::Protocol *deep_copy = 
+            new RTCORBA::Protocol (*p.ptr_);
+          
+          if (deep_copy != 0)
+            {
+              RTCORBA::Protocol *tmp = deep_copy;
+              deep_copy = this->ptr_;
+              this->ptr_ = tmp;
+              delete deep_copy;
+            }
+        }
+    }
+  
   return *this;
 }
 
@@ -3047,10 +3132,27 @@ ACE_INLINE RTCORBA::ProtocolList_var &
 RTCORBA::ProtocolList_var::operator= (const ::RTCORBA::ProtocolList_var &p) // deep copy
 {
   if (this != &p)
-  {
-    delete this->ptr_;
-    ACE_NEW_RETURN (this->ptr_, ::RTCORBA::ProtocolList (*p.ptr_), *this);
-  }
+    {
+      if (p.ptr_ == 0)
+        {
+          delete this->ptr_;
+          this->ptr_ = 0;
+        }
+      else
+        {
+          RTCORBA::ProtocolList *deep_copy = 
+            new RTCORBA::ProtocolList (*p.ptr_);
+          
+          if (deep_copy != 0)
+            {
+              RTCORBA::ProtocolList *tmp = deep_copy;
+              deep_copy = this->ptr_;
+              this->ptr_ = tmp;
+              delete deep_copy;
+            }
+        }
+    }
+  
   return *this;
 }
 
diff --git a/TAO/tao/StringSeqC.i b/TAO/tao/StringSeqC.i
index 87018d7a6b6..3a98b4454fe 100644
--- a/TAO/tao/StringSeqC.i
+++ b/TAO/tao/StringSeqC.i
@@ -64,10 +64,27 @@ ACE_INLINE CORBA_StringSeq_var &
 CORBA_StringSeq_var::operator= (const ::CORBA_StringSeq_var &p) // deep copy
 {
   if (this != &p)
-  {
-    delete this->ptr_;
-    ACE_NEW_RETURN (this->ptr_, ::CORBA_StringSeq (*p.ptr_), *this);
-  }
+    {
+      if (p.ptr_ == 0)
+        {
+          delete this->ptr_;
+          this->ptr_ = 0;
+        }
+      else
+        {
+          CORBA_StringSeq *deep_copy = 
+            new CORBA_StringSeq (*p.ptr_);
+          
+          if (deep_copy != 0)
+            {
+              CORBA_StringSeq *tmp = deep_copy;
+              deep_copy = this->ptr_;
+              this->ptr_ = tmp;
+              delete deep_copy;
+            }
+        }
+    }
+  
   return *this;
 }
 
diff --git a/TAO/tao/TAOC.i b/TAO/tao/TAOC.i
index 65075302b78..d72d46bd08f 100644
--- a/TAO/tao/TAOC.i
+++ b/TAO/tao/TAOC.i
@@ -57,10 +57,27 @@ ACE_INLINE ::TAO::PrioritySpecification_var &
 TAO::PrioritySpecification_var::operator= (const ::TAO::PrioritySpecification_var &p)
 {
   if (this != &p)
-  {
-    delete this->ptr_;
-    ACE_NEW_RETURN (this->ptr_, ::TAO::PrioritySpecification (*p.ptr_), *this);
-  }
+    {
+      if (p.ptr_ == 0)
+        {
+          delete this->ptr_;
+          this->ptr_ = 0;
+        }
+      else
+        {
+          TAO::PrioritySpecification *deep_copy = 
+            new TAO::PrioritySpecification (*p.ptr_);
+          
+          if (deep_copy != 0)
+            {
+              TAO::PrioritySpecification *tmp = deep_copy;
+              deep_copy = this->ptr_;
+              this->ptr_ = tmp;
+              delete deep_copy;
+            }
+        }
+    }
+  
   return *this;
 }
 
@@ -397,10 +414,27 @@ ACE_INLINE ::TAO::BufferingConstraint_var &
 TAO::BufferingConstraint_var::operator= (const ::TAO::BufferingConstraint_var &p)
 {
   if (this != &p)
-  {
-    delete this->ptr_;
-    ACE_NEW_RETURN (this->ptr_, ::TAO::BufferingConstraint (*p.ptr_), *this);
-  }
+    {
+      if (p.ptr_ == 0)
+        {
+          delete this->ptr_;
+          this->ptr_ = 0;
+        }
+      else
+        {
+          TAO::BufferingConstraint *deep_copy = 
+            new TAO::BufferingConstraint (*p.ptr_);
+          
+          if (deep_copy != 0)
+            {
+              TAO::BufferingConstraint *tmp = deep_copy;
+              deep_copy = this->ptr_;
+              this->ptr_ = tmp;
+              delete deep_copy;
+            }
+        }
+    }
+  
   return *this;
 }
 
diff --git a/TAO/tao/TimeBaseC.i b/TAO/tao/TimeBaseC.i
index b319880585e..12d8e477881 100644
--- a/TAO/tao/TimeBaseC.i
+++ b/TAO/tao/TimeBaseC.i
@@ -41,10 +41,27 @@ ACE_INLINE TimeBase::UtcT_var &
 TimeBase::UtcT_var::operator= (const TimeBase::UtcT_var &p)
 {
   if (this != &p)
-  {
-    delete this->ptr_;
-    this->ptr_ = new TimeBase::UtcT (*p.ptr_);
-  }
+    {
+      if (p.ptr_ == 0)
+        {
+          delete this->ptr_;
+          this->ptr_ = 0;
+        }
+      else
+        {
+          TimeBase::UtcT *deep_copy = 
+            new TimeBase::UtcT (*p.ptr_);
+          
+          if (deep_copy != 0)
+            {
+              TimeBase::UtcT *tmp = deep_copy;
+              deep_copy = this->ptr_;
+              this->ptr_ = tmp;
+              delete deep_copy;
+            }
+        }
+    }
+  
   return *this;
 }
 
@@ -150,10 +167,27 @@ ACE_INLINE TimeBase::IntervalT_var &
 TimeBase::IntervalT_var::operator= (const TimeBase::IntervalT_var &p)
 {
   if (this != &p)
-  {
-    delete this->ptr_;
-    this->ptr_ = new TimeBase::IntervalT (*p.ptr_);
-  }
+    {
+      if (p.ptr_ == 0)
+        {
+          delete this->ptr_;
+          this->ptr_ = 0;
+        }
+      else
+        {
+          TimeBase::IntervalT *deep_copy = 
+            new TimeBase::IntervalT (*p.ptr_);
+          
+          if (deep_copy != 0)
+            {
+              TimeBase::IntervalT *tmp = deep_copy;
+              deep_copy = this->ptr_;
+              this->ptr_ = tmp;
+              delete deep_copy;
+            }
+        }
+    }
+  
   return *this;
 }