diff options
| author | huangh <huangh@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2013-04-12 17:16:39 +0000 |
|---|---|---|
| committer | huangh <huangh@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2013-04-12 17:16:39 +0000 |
| commit | d2e4391fa96959861d3ce27ae5a15fee18b80fc7 (patch) | |
| tree | 31741d27be7ef3f805ca0c244ca67d8cf3e13001 /ACE/ace/Log_Category.h | |
| parent | b89c9f182b374067061715cf8e41d6e010d487d6 (diff) | |
| download | ATCD-d2e4391fa96959861d3ce27ae5a15fee18b80fc7.tar.gz | |
Fri Apr 12 16:48:00 UTC 2013 Huang-Ming Huang <huangh@ociweb.com>
Diffstat (limited to 'ACE/ace/Log_Category.h')
| -rw-r--r-- | ACE/ace/Log_Category.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/ACE/ace/Log_Category.h b/ACE/ace/Log_Category.h index f8f3e8434b5..ed53d420821 100644 --- a/ACE/ace/Log_Category.h +++ b/ACE/ace/Log_Category.h @@ -116,7 +116,7 @@ class ACE_Log_Category; class ACE_Export ACE_Log_Category_TSS { public: - ACE_Log_Category_TSS(ACE_Log_Category* category); + ACE_Log_Category_TSS(ACE_Log_Category* category, ACE_Log_Msg* logger); const char* name(); unsigned int id(); @@ -236,7 +236,6 @@ public: private: friend class ACE_Log_Category_TSS; - static void tss_destroy(void * p); // disable copying ACE_Log_Category(const ACE_Log_Category&); @@ -248,12 +247,16 @@ private: /// we couldn't directly use ACE_TSS because it would /// create circular dependency - +#if defined (ACE_HAS_THREADS) + static void tss_destroy(void * p); /// Avoid race conditions during initialization. ACE_Thread_Mutex keylock_; /// "First time in" flag. /// Key for the thread-specific error data. ACE_thread_key_t key_; +#else // defined (ACE_HAS_THREADS) + ACE_Log_Category_TSS per_thr_obj_; +#endif // defined (ACE_HAS_THREADS) }; |