diff options
| author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2005-11-03 17:38:46 +0000 |
|---|---|---|
| committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2005-11-03 17:38:46 +0000 |
| commit | f14a01b8fbabdbf58e4bbc74cc5a84d672b20dfc (patch) | |
| tree | b8adf3c7f0f24648d2298f4e62ad003dc221b1c3 /TAO/tao/RTCORBA | |
| parent | 759d626f579791e15c91b2bc847b9d4ef7adee29 (diff) | |
| download | ATCD-f14a01b8fbabdbf58e4bbc74cc5a84d672b20dfc.tar.gz | |
ChangeLogTag:Thu Nov 3 09:26:21 2005 Ossama Othman <ossama@dre.vanderbilt.edu>
Diffstat (limited to 'TAO/tao/RTCORBA')
| -rw-r--r-- | TAO/tao/RTCORBA/RT_Stub.h | 17 | ||||
| -rw-r--r-- | TAO/tao/RTCORBA/RT_Transport_Descriptor_Property.h | 6 |
2 files changed, 9 insertions, 14 deletions
diff --git a/TAO/tao/RTCORBA/RT_Stub.h b/TAO/tao/RTCORBA/RT_Stub.h index a2c18299ba6..a0b41aa7146 100644 --- a/TAO/tao/RTCORBA/RT_Stub.h +++ b/TAO/tao/RTCORBA/RT_Stub.h @@ -1,3 +1,5 @@ +// -*- C++ -*- + //============================================================================= /** * @file RT_Stub.h @@ -35,8 +37,6 @@ class TAO_PriorityBandedConnectionPolicy; class TAO_ClientProtocolPolicy; class TAO_PrivateConnectionPolicy; - - /** * @class TAO_RT_Stub * @@ -123,15 +123,10 @@ private: CORBA::Boolean are_policies_parsed_; private: - // = Disallow copy constructor and assignment operator. - ACE_UNIMPLEMENTED_FUNC (TAO_RT_Stub (const TAO_RT_Stub &)) - ACE_UNIMPLEMENTED_FUNC (TAO_RT_Stub &operator = (const TAO_RT_Stub &)) - -#if defined (__GNUG__) - // G++ (even 2.6.3) stupidly thinks instances can't be created. - // This de-warns. - friend class everyone_needs_a_friend; -#endif /* __GNUG__ */ + // = Disallow copying and assignment. + TAO_RT_Stub (const TAO_RT_Stub &); + TAO_RT_Stub &operator = (const TAO_RT_Stub &); + }; #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */ diff --git a/TAO/tao/RTCORBA/RT_Transport_Descriptor_Property.h b/TAO/tao/RTCORBA/RT_Transport_Descriptor_Property.h index b0645d68e9f..adfb279edf9 100644 --- a/TAO/tao/RTCORBA/RT_Transport_Descriptor_Property.h +++ b/TAO/tao/RTCORBA/RT_Transport_Descriptor_Property.h @@ -50,9 +50,9 @@ protected: TAO_RT_Transport_Descriptor_Property* next_; private: - // = Disallow copy constructor and assignment operator. - ACE_UNIMPLEMENTED_FUNC (TAO_RT_Transport_Descriptor_Property (const TAO_RT_Transport_Descriptor_Property &)) - ACE_UNIMPLEMENTED_FUNC (TAO_RT_Transport_Descriptor_Property &operator = (const TAO_RT_Transport_Descriptor_Property &)) + // = Disallow copying and assignment. + TAO_RT_Transport_Descriptor_Property (const TAO_RT_Transport_Descriptor_Property &); + TAO_RT_Transport_Descriptor_Property & operator= (const TAO_RT_Transport_Descriptor_Property &); }; /** |