diff options
| author | Johnny Willemsen <jwillemsen@users.noreply.github.com> | 2016-10-31 16:30:31 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-31 16:30:31 +0100 |
| commit | 8390b59170b1b66bdda62f2c0bd544fb8baf8b6b (patch) | |
| tree | 592d4c3e0feb26a13c6285ae208f272d4a660e60 /ACE/ace/Condition_Recursive_Thread_Mutex.h | |
| parent | bd5aaab0e6022781ff8fdb383ea75ae3ecc3b17d (diff) | |
| download | ATCD-8390b59170b1b66bdda62f2c0bd544fb8baf8b6b.tar.gz | |
Revert "some (bundled) minor changes (take 2)"revert-176-master
Diffstat (limited to 'ACE/ace/Condition_Recursive_Thread_Mutex.h')
| -rw-r--r-- | ACE/ace/Condition_Recursive_Thread_Mutex.h | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/ACE/ace/Condition_Recursive_Thread_Mutex.h b/ACE/ace/Condition_Recursive_Thread_Mutex.h index 8d0b277511a..a7ce9944cc5 100644 --- a/ACE/ace/Condition_Recursive_Thread_Mutex.h +++ b/ACE/ace/Condition_Recursive_Thread_Mutex.h @@ -23,16 +23,12 @@ #if !defined (ACE_HAS_THREADS) # include "ace/Null_Condition.h" #else /* ACE_HAS_THREADS */ -// ACE platform supports some form of threading. - #include "ace/Recursive_Thread_Mutex.h" #include "ace/Condition_Attributes.h" #include "ace/Condition_T.h" ACE_BEGIN_VERSIONED_NAMESPACE_DECL -class ACE_Time_Value; - /** * @brief ACE_Condition template specialization written using * @a ACE_Recursive_Thread_Mutex. This allows threads to block until @@ -90,9 +86,6 @@ public: /// Dump the state of an object. void dump (void) const; - /// Declare the dynamic allocation hooks. - ACE_ALLOC_HOOK_DECLARE; - private: // = Prevent assignment and copying. @@ -108,23 +101,11 @@ private: ACE_Recursive_Thread_Mutex &mutex_; }; -// prevent implicit instantiations by includers to relieve the linker -#if defined (ACE_HAS_CPP11_EXTERN_TEMPLATES) -# if defined (ACE_LACKS_CPP11_EXTERN_TEMPLATE_ATTRIBUTES) -extern template class ACE_Condition<ACE_Recursive_Thread_Mutex>; -# else -extern template ACE_Export class ACE_Condition<ACE_Recursive_Thread_Mutex>; -# endif /* ACE_LACKS_CPP11_EXTERN_TEMPLATE_ATTRIBUTES */ -#endif /* ACE_HAS_CPP11_EXTERN_TEMPLATES */ typedef ACE_Condition<ACE_Recursive_Thread_Mutex> ACE_Condition_Recursive_Thread_Mutex; ACE_END_VERSIONED_NAMESPACE_DECL -#if defined (__ACE_INLINE__) -#include "ace/Condition_Recursive_Thread_Mutex.inl" -#endif /* __ACE_INLINE__ */ - #endif /* !ACE_HAS_THREADS */ #include /**/ "ace/post.h" |