diff options
Diffstat (limited to 'TAO/tao/diffs/PolicyC.i.diff')
| -rw-r--r-- | TAO/tao/diffs/PolicyC.i.diff | 179 |
1 files changed, 175 insertions, 4 deletions
diff --git a/TAO/tao/diffs/PolicyC.i.diff b/TAO/tao/diffs/PolicyC.i.diff index 17d5ad87e14..fea966f0588 100644 --- a/TAO/tao/diffs/PolicyC.i.diff +++ b/TAO/tao/diffs/PolicyC.i.diff @@ -1,8 +1,179 @@ -@@ -418,7 +418,2 @@ +--- PolicyC.i Tue Jul 11 00:38:13 2000 ++++ PolicyC.i.mod Tue Jul 11 00:29:58 2000 +@@ -1475,176 +1475,6 @@ + #endif /* end #if !defined */ + + +-#if !defined (_CORBA_CURRENT___VAR_CI_) +-#define _CORBA_CURRENT___VAR_CI_ +- +-// ************************************************************* +-// Inline operations for class CORBA_Current_var +-// ************************************************************* +- +-ACE_INLINE +-CORBA_Current_var::CORBA_Current_var (void) // default constructor +- : ptr_ (CORBA_Current::_nil ()) +-{} +- +-ACE_INLINE ::CORBA_Current_ptr +-CORBA_Current_var::ptr (void) const +-{ +- return this->ptr_; +-} +- +-ACE_INLINE +-CORBA_Current_var::CORBA_Current_var (const ::CORBA_Current_var &p) // copy constructor +- : TAO_Base_var (), +- ptr_ (CORBA_Current::_duplicate (p.ptr ())) +-{} +- +-ACE_INLINE +-CORBA_Current_var::~CORBA_Current_var (void) // destructor +-{ +- CORBA::release (this->ptr_); +-} +- +-ACE_INLINE CORBA_Current_var & +-CORBA_Current_var::operator= (CORBA_Current_ptr p) +-{ +- CORBA::release (this->ptr_); +- this->ptr_ = p; +- return *this; +-} +- +-ACE_INLINE CORBA_Current_var & +-CORBA_Current_var::operator= (const ::CORBA_Current_var &p) +-{ +- if (this != &p) +- { +- CORBA::release (this->ptr_); +- this->ptr_ = ::CORBA_Current::_duplicate (p.ptr ()); +- } +- return *this; +-} +- +-ACE_INLINE +-CORBA_Current_var::operator const ::CORBA_Current_ptr &() const // cast +-{ +- return this->ptr_; +-} +- +-ACE_INLINE +-CORBA_Current_var::operator ::CORBA_Current_ptr &() // cast +-{ +- return this->ptr_; +-} +- +-ACE_INLINE ::CORBA_Current_ptr +-CORBA_Current_var::operator-> (void) const +-{ +- return this->ptr_; +-} +- +-ACE_INLINE ::CORBA_Current_ptr +-CORBA_Current_var::in (void) const +-{ +- return this->ptr_; +-} +- +-ACE_INLINE ::CORBA_Current_ptr & +-CORBA_Current_var::inout (void) +-{ +- return this->ptr_; +-} +- +-ACE_INLINE ::CORBA_Current_ptr & +-CORBA_Current_var::out (void) +-{ +- CORBA::release (this->ptr_); +- this->ptr_ = ::CORBA_Current::_nil (); +- return this->ptr_; +-} +- +-ACE_INLINE ::CORBA_Current_ptr +-CORBA_Current_var::_retn (void) +-{ +- // yield ownership of managed obj reference +- ::CORBA_Current_ptr val = this->ptr_; +- this->ptr_ = ::CORBA_Current::_nil (); +- return val; +-} +- +- +-#endif /* end #if !defined */ +- +- +-#if !defined (_CORBA_CURRENT___OUT_CI_) +-#define _CORBA_CURRENT___OUT_CI_ +- +-// ************************************************************* +-// Inline operations for class CORBA_Current_out +-// ************************************************************* +- -ACE_INLINE --CORBA::Policy_var::Policy_var (Policy_ptr p) +-CORBA_Current_out::CORBA_Current_out (CORBA_Current_ptr &p) - : ptr_ (p) +-{ +- this->ptr_ = ::CORBA_Current::_nil (); +-} +- +-ACE_INLINE +-CORBA_Current_out::CORBA_Current_out (CORBA_Current_var &p) // constructor from _var +- : ptr_ (p.out ()) +-{ +- CORBA::release (this->ptr_); +- this->ptr_ = ::CORBA_Current::_nil (); +-} +- +-ACE_INLINE +-CORBA_Current_out::CORBA_Current_out (const ::CORBA_Current_out &p) // copy constructor +- : ptr_ (ACE_const_cast (CORBA_Current_out &, p).ptr_) -{} - -ACE_INLINE ::CORBA::Policy_ptr -CORBA::Policy_var::ptr (void) const +-ACE_INLINE ::CORBA_Current_out & +-CORBA_Current_out::operator= (const ::CORBA_Current_out &p) +-{ +- this->ptr_ = ACE_const_cast (CORBA_Current_out&, p).ptr_; +- return *this; +-} +- +-ACE_INLINE CORBA_Current_out & +-CORBA_Current_out::operator= (const ::CORBA_Current_var &p) +-{ +- this->ptr_ = ::CORBA_Current::_duplicate (p.ptr ()); +- return *this; +-} +- +-ACE_INLINE CORBA_Current_out & +-CORBA_Current_out::operator= (CORBA_Current_ptr p) +-{ +- this->ptr_ = p; +- return *this; +-} +- +-ACE_INLINE +-CORBA_Current_out::operator ::CORBA_Current_ptr &() // cast +-{ +- return this->ptr_; +-} +- +-ACE_INLINE ::CORBA_Current_ptr & +-CORBA_Current_out::ptr (void) // ptr +-{ +- return this->ptr_; +-} +- +-ACE_INLINE ::CORBA_Current_ptr +-CORBA_Current_out::operator-> (void) +-{ +- return this->ptr_; +-} +- +- +-#endif /* end #if !defined */ +- +- + #if !defined (_CORBA_POLICYCURRENT___VAR_CI_) + #define _CORBA_POLICYCURRENT___VAR_CI_ + |