diff options
| author | huangh <huangh@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2013-04-12 19:35:21 +0000 |
|---|---|---|
| committer | huangh <huangh@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2013-04-12 19:35:21 +0000 |
| commit | 13d56162573b50a243b07f2e0947ed46586dea1f (patch) | |
| tree | 66a2f2010bf1abe52ba57cc9504e214baf08d085 | |
| parent | b0b7ac351aee9cd439e0c939f95f2caedbb1fbc9 (diff) | |
| download | ATCD-13d56162573b50a243b07f2e0947ed46586dea1f.tar.gz | |
Fri Apr 12 19:30:05 UTC 2013 Huang-Ming Huang <huangh@ociweb.com>
| -rw-r--r-- | ACE/ChangeLog | 9 | ||||
| -rw-r--r-- | ACE/ace/Log_Category.cpp | 4 | ||||
| -rw-r--r-- | ACE/ace/Log_Category.h | 1 | ||||
| -rw-r--r-- | ACE/tests/Log_Msg_Test.cpp | 3 |
4 files changed, 12 insertions, 5 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index c88f6ac3624..927d4491051 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,12 @@ +Fri Apr 12 19:30:05 UTC 2013 Huang-Ming Huang <huangh@ociweb.com> + + * ace/Log_Category.h: + * ace/Log_Category.cpp: + Fixed problem for ST build + + * tests/Log_Msg_Test.cpp: + Fixed problem for WCHAR build + Thu Apr 11 19:53:22 UTC 2013 Huang-Ming Huang <huangh@ociweb.com> * ace/Log_Category.h: diff --git a/ACE/ace/Log_Category.cpp b/ACE/ace/Log_Category.cpp index 5e5b88996c3..58dcc538ab6 100644 --- a/ACE/ace/Log_Category.cpp +++ b/ACE/ace/Log_Category.cpp @@ -29,6 +29,7 @@ ACE_Log_Category::ACE_Log_Category(const char* name) | LM_CRITICAL | LM_ALERT | LM_EMERGENCY) + , per_thr_obj_(this, 0) { } @@ -48,9 +49,6 @@ ACE_Log_Category_TSS::ACE_Log_Category_TSS(ACE_Log_Category* category, ACE_Log_M : category_(category) , logger_(logger) , priority_mask_(0) -#if !defined (ACE_HAS_THREADS) - , per_thr_obj_(this, 0) -#endif { } diff --git a/ACE/ace/Log_Category.h b/ACE/ace/Log_Category.h index ed53d420821..d5654ff877d 100644 --- a/ACE/ace/Log_Category.h +++ b/ACE/ace/Log_Category.h @@ -168,6 +168,7 @@ public: const ACE_TCHAR *text = 0); private: + friend class ACE_Log_Category; ACE_Log_Category* category_; ACE_Log_Msg* logger_; u_long priority_mask_; diff --git a/ACE/tests/Log_Msg_Test.cpp b/ACE/tests/Log_Msg_Test.cpp index 40a6a1fc589..6048d6bd1e8 100644 --- a/ACE/tests/Log_Msg_Test.cpp +++ b/ACE/tests/Log_Msg_Test.cpp @@ -243,8 +243,7 @@ test_log_msg_features (const ACE_TCHAR *program) big[ACE_Log_Record::MAXLOGMSGLEN] = ACE_TEXT ('\0'); ACE_DEBUG ((LM_INFO, ACE_TEXT ("This is too big: %s\n"), big)); - ACE_DEBUG ((LM_INFO, ACE_TEXT ("******\n"))); - ACE_HEX_DUMP((LM_INFO, big, ACE_Log_Record::MAXLOGMSGLEN )); + ACE_HEX_DUMP((LM_INFO, (const char*)big, ACE_Log_Record::MAXLOGMSGLEN )); // Exercise many different combinations of OSTREAM. |