diff options
Diffstat (limited to 'ace/Reverse_Lock_T.h')
| -rw-r--r-- | ace/Reverse_Lock_T.h | 23 |
1 files changed, 5 insertions, 18 deletions
diff --git a/ace/Reverse_Lock_T.h b/ace/Reverse_Lock_T.h index 5bd1d3a6b8f..29f23b08c08 100644 --- a/ace/Reverse_Lock_T.h +++ b/ace/Reverse_Lock_T.h @@ -22,12 +22,10 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -ACE_BEGIN_VERSIONED_NAMESPACE_DECL - /** - * @namespace ACE_Acquire_Method + * @class ACE_Acquire_Method * - * @brief An enum namespace. + * @brief An enum class. * * These enums should have been inside the reverse lock class, but * some lame compilers cannot handle enums inside template classes. @@ -40,19 +38,16 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL * represented here because we have to make sure that the release() * method on the reverse lock acquires a lock on the real lock. **/ -namespace ACE_Acquire_Method +class ACE_Acquire_Method { +public: enum METHOD_TYPE { ACE_REGULAR, ACE_READ, ACE_WRITE }; -} - -#if defined (ACE_LYNXOS_MAJOR) && (ACE_LYNXOS_MAJOR < 4) - using namespace ACE_Acquire_Method; -#endif +}; /** * @class ACE_Reverse_Lock @@ -82,14 +77,8 @@ public: // = Initialization/Finalization methods. /// Constructor. All locking requests will be forwarded to <lock>. -#if defined (ACE_LYNXOS_MAJOR) && (ACE_LYNXOS_MAJOR < 4) - // Make LynxOS 3.x buggy compiler happy - ACE_Reverse_Lock (ACE_LOCKING_MECHANISM &lock, - METHOD_TYPE acquire_method = ACE_REGULAR); -#else ACE_Reverse_Lock (ACE_LOCKING_MECHANISM &lock, ACE_Acquire_Method::METHOD_TYPE acquire_method = ACE_Acquire_Method::ACE_REGULAR); -#endif /// Destructor. If <lock_> was not passed in by the user, it will be /// deleted. @@ -131,8 +120,6 @@ private: ACE_Acquire_Method::METHOD_TYPE acquire_method_; }; -ACE_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) #include "ace/Reverse_Lock_T.inl" #endif /* __ACE_INLINE__ */ |