diff options
| author | huangh <huangh@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2013-04-15 17:48:38 +0000 |
|---|---|---|
| committer | huangh <huangh@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2013-04-15 17:48:38 +0000 |
| commit | aed9bd1d3ee7742b6bea337b07f7bdc320f85c86 (patch) | |
| tree | 341cf5962980a7d51d02d4cd05dac8d0a546b9af /ACE | |
| parent | d3525e613eeaaa4b355ed014186d72350f22cb01 (diff) | |
| download | ATCD-aed9bd1d3ee7742b6bea337b07f7bdc320f85c86.tar.gz | |
Mon Apr 15 17:46:24 UTC 2013 Huang-Ming Huang <huangh@ociweb.com>
Diffstat (limited to 'ACE')
| -rw-r--r-- | ACE/ChangeLog | 6 | ||||
| -rw-r--r-- | ACE/ace/Log_Category.inl | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 6f3e963b3b4..f01c9f75c2a 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,9 @@ +Mon Apr 15 17:46:24 UTC 2013 Huang-Ming Huang <huangh@ociweb.com> + + * ace/Log_Category.inl: + + Fixed linking problem for ST build. + Mon Apr 15 14:28:43 UTC 2013 Steve Huston <shuston@riverace.com> * ace/Dev_Poll_Reactor.cpp: Fixed single-threaded build issues. diff --git a/ACE/ace/Log_Category.inl b/ACE/ace/Log_Category.inl index 5b6993b07d9..7649da7f3b8 100644 --- a/ACE/ace/Log_Category.inl +++ b/ACE/ace/Log_Category.inl @@ -140,7 +140,6 @@ ACE_Log_Category_TSS::log_hexdump (ACE_Log_Priority priority, return logger_->log_hexdump(priority, buffer, size, text, this); } -#if defined (ACE_HAS_THREADS) /// Get the current ACE_Log_Priority mask. ACE_INLINE u_long ACE_Log_Category::priority_mask () @@ -156,6 +155,5 @@ ACE_Log_Category::priority_mask (u_long n_mask) this->priority_mask_ = n_mask; return o_mask; } -#endif ACE_END_VERSIONED_NAMESPACE_DECL |