diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/Security/Security_Current.h')
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Security/Security_Current.h | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_Current.h b/TAO/orbsvcs/orbsvcs/Security/Security_Current.h index 118689ca9d4..693ffe05426 100644 --- a/TAO/orbsvcs/orbsvcs/Security/Security_Current.h +++ b/TAO/orbsvcs/orbsvcs/Security/Security_Current.h @@ -15,7 +15,7 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/Security/security_export.h" +#include "security_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -25,7 +25,7 @@ #include "tao/ORB_Core.h" #include "tao/LocalObject.h" -#include "orbsvcs/Security/Security_Current_Impl.h" +#include "Security_Current_Impl.h" // This is to remove "inherits via dominance" warnings from MSVC. // MSVC is being a little too paranoid. @@ -34,8 +34,6 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - /** * @class TAO_Security_Current * @@ -116,28 +114,27 @@ private: /// Prevent copying through the copy constructor and the assignment /// operator. //@{ - TAO_Security_Current (const TAO_Security_Current &); - void operator= (const TAO_Security_Current &); + ACE_UNIMPLEMENTED_FUNC ( + TAO_Security_Current (const TAO_Security_Current &)) + ACE_UNIMPLEMENTED_FUNC (void operator= (const TAO_Security_Current &)) //@} private: /// TSS slot assigned to this object. - size_t const tss_slot_; + size_t tss_slot_; /// The ORBid of the ORB with which this object is registered. CORBA::String_var orb_id_; /// Pointer to the ORB Core corresponding to the ORB with which this /// object is registered. - TAO_ORB_Core * orb_core_; + TAO_ORB_Core *orb_core_; }; -TAO_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) -# include "orbsvcs/Security/Security_Current.inl" +# include "Security_Current.inl" #endif /* __ACE_INLINE__ */ #if defined(_MSC_VER) |