summaryrefslogtreecommitdiff
path: root/TAO/tao/IOPC.i
diff options
context:
space:
mode:
authorparsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1999-08-30 17:50:49 +0000
committerparsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1999-08-30 17:50:49 +0000
commit6eab03d60484cc530aa40c795f8f58c070532b10 (patch)
tree11ee9b3261a3e7c5709df91bdb39bb5ac6a22042 /TAO/tao/IOPC.i
parentc636f264d41b9ce90c43fb3f4a8f977cb50d877c (diff)
downloadATCD-6eab03d60484cc530aa40c795f8f58c070532b10.tar.gz
Replaced all 'new' with 'ACE_NEW*'.
Diffstat (limited to 'TAO/tao/IOPC.i')
-rw-r--r--TAO/tao/IOPC.i42
1 files changed, 30 insertions, 12 deletions
diff --git a/TAO/tao/IOPC.i b/TAO/tao/IOPC.i
index 2e758adc062..970fb04cb64 100644
--- a/TAO/tao/IOPC.i
+++ b/TAO/tao/IOPC.i
@@ -18,7 +18,8 @@ ACE_INLINE
IOP::TaggedProfile_var::TaggedProfile_var (const IOP::TaggedProfile_var &p) // copy constructor
{
if (p.ptr_)
- this->ptr_ = new IOP::TaggedProfile(*p.ptr_);
+ ACE_NEW (this->ptr_,
+ IOP::TaggedProfile(*p.ptr_));
else
this->ptr_ = 0;
}
@@ -43,7 +44,9 @@ IOP::TaggedProfile_var::operator= (const IOP::TaggedProfile_var &p)
if (this != &p)
{
delete this->ptr_;
- this->ptr_ = new IOP::TaggedProfile (*p.ptr_);
+ ACE_NEW_RETURN (this->ptr_,
+ IOP::TaggedProfile (*p.ptr_),
+ *this);
}
return *this;
}
@@ -187,7 +190,8 @@ ACE_INLINE
IOP::IOR_var::IOR_var (const IOP::IOR_var &p) // copy constructor
{
if (p.ptr_)
- this->ptr_ = new IOP::IOR(*p.ptr_);
+ ACE_NEW (this->ptr_,
+ IOP::IOR(*p.ptr_));
else
this->ptr_ = 0;
}
@@ -212,7 +216,9 @@ IOP::IOR_var::operator= (const IOP::IOR_var &p)
if (this != &p)
{
delete this->ptr_;
- this->ptr_ = new IOP::IOR (*p.ptr_);
+ ACE_NEW_RETURN (this->ptr_,
+ IOP::IOR (*p.ptr_),
+ *this);
}
return *this;
}
@@ -356,7 +362,8 @@ ACE_INLINE
IOP::TaggedComponent_var::TaggedComponent_var (const IOP::TaggedComponent_var &p) // copy constructor
{
if (p.ptr_)
- this->ptr_ = new IOP::TaggedComponent(*p.ptr_);
+ ACE_NEW (this->ptr_,
+ IOP::TaggedComponent(*p.ptr_));
else
this->ptr_ = 0;
}
@@ -381,7 +388,9 @@ IOP::TaggedComponent_var::operator= (const IOP::TaggedComponent_var &p)
if (this != &p)
{
delete this->ptr_;
- this->ptr_ = new IOP::TaggedComponent (*p.ptr_);
+ ACE_NEW_RETURN (this->ptr_,
+ IOP::TaggedComponent (*p.ptr_),
+ *this);
}
return *this;
}
@@ -525,7 +534,8 @@ ACE_INLINE
IOP::MultipleComponentProfile_var::MultipleComponentProfile_var (const IOP::MultipleComponentProfile_var &p) // copy constructor
{
if (p.ptr_)
- this->ptr_ = new IOP::MultipleComponentProfile(*p.ptr_);
+ ACE_NEW (this->ptr_,
+ IOP::MultipleComponentProfile(*p.ptr_));
else
this->ptr_ = 0;
}
@@ -550,7 +560,9 @@ IOP::MultipleComponentProfile_var::operator= (const IOP::MultipleComponentProfil
if (this != &p)
{
delete this->ptr_;
- this->ptr_ = new IOP::MultipleComponentProfile (*p.ptr_);
+ ACE_NEW_RETURN (this->ptr_,
+ IOP::MultipleComponentProfile (*p.ptr_),
+ *this);
}
return *this;
}
@@ -706,7 +718,8 @@ ACE_INLINE
IOP::ServiceContext_var::ServiceContext_var (const IOP::ServiceContext_var &p) // copy constructor
{
if (p.ptr_)
- this->ptr_ = new IOP::ServiceContext(*p.ptr_);
+ ACE_NEW (this->ptr_,
+ IOP::ServiceContext(*p.ptr_));
else
this->ptr_ = 0;
}
@@ -731,7 +744,9 @@ IOP::ServiceContext_var::operator= (const IOP::ServiceContext_var &p)
if (this != &p)
{
delete this->ptr_;
- this->ptr_ = new IOP::ServiceContext (*p.ptr_);
+ ACE_NEW_RETURN (this->ptr_,
+ IOP::ServiceContext (*p.ptr_),
+ *this);
}
return *this;
}
@@ -875,7 +890,8 @@ ACE_INLINE
IOP::ServiceContextList_var::ServiceContextList_var (const IOP::ServiceContextList_var &p) // copy constructor
{
if (p.ptr_)
- this->ptr_ = new IOP::ServiceContextList(*p.ptr_);
+ ACE_NEW (this->ptr_,
+ IOP::ServiceContextList(*p.ptr_));
else
this->ptr_ = 0;
}
@@ -900,7 +916,9 @@ IOP::ServiceContextList_var::operator= (const IOP::ServiceContextList_var &p) //
if (this != &p)
{
delete this->ptr_;
- this->ptr_ = new IOP::ServiceContextList (*p.ptr_);
+ ACE_NEW_RETURN (this->ptr_,
+ IOP::ServiceContextList (*p.ptr_),
+ *this);
}
return *this;
}