diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2006-10-02 11:26:46 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2006-10-02 11:26:46 +0000 |
| commit | 8281d1ccb90de9968f21e3ecdc61da71691ef2a2 (patch) | |
| tree | 1a9bc74decaae7ecf66c99fae35fdc9dec9f5d58 | |
| parent | 60d0964bbd76110ea9ee39ba84b8da3217cdc86c (diff) | |
| download | ATCD-8281d1ccb90de9968f21e3ecdc61da71691ef2a2.tar.gz | |
Mon Oct 2 11:26:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | ACE/ChangeLog | 5 | ||||
| -rw-r--r-- | ACE/ace/Log_Msg.cpp | 8 | ||||
| -rw-r--r-- | ACE/ace/Log_Msg.h | 2 |
3 files changed, 10 insertions, 5 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index af1fd5c7760..a76cf305a4d 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,8 @@ +Mon Oct 2 11:26:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/Log_Msg.{h,cpp}: + Changed is_set_ conditional values member to bool + Sat Sep 30 14:00:33 UTC 2006 Steve Huston <shuston@riverace.com> * tests/Cached_Allocator_Test.cpp: diff --git a/ACE/ace/Log_Msg.cpp b/ACE/ace/Log_Msg.cpp index 5d092917ab6..68067886d5f 100644 --- a/ACE/ace/Log_Msg.cpp +++ b/ACE/ace/Log_Msg.cpp @@ -675,7 +675,7 @@ ACE_Log_Msg::ACE_Log_Msg (void) ACE_Log_Msg::sync_hook, ACE_Log_Msg::thr_desc_hook); - this->conditional_values_.is_set_ = 0; + this->conditional_values_.is_set_ = false; char *timestamp = ACE_OS::getenv ("ACE_LOG_TIMESTAMP"); if (timestamp != 0) @@ -983,10 +983,10 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str, typedef void (*PTF)(...); // Check if there were any conditional values set. - int conditional_values = this->conditional_values_.is_set_; + bool const conditional_values = this->conditional_values_.is_set_; // Reset conditional values. - this->conditional_values_.is_set_ = 0; + this->conditional_values_.is_set_ = false; // Only print the message if <priority_mask_> hasn't been reset to // exclude this logging priority. @@ -2243,7 +2243,7 @@ ACE_Log_Msg::conditional_set (const char *filename, int status, int err) { - this->conditional_values_.is_set_ = 1; + this->conditional_values_.is_set_ = true; this->conditional_values_.file_ = filename; this->conditional_values_.line_ = line; this->conditional_values_.op_status_ = status; diff --git a/ACE/ace/Log_Msg.h b/ACE/ace/Log_Msg.h index 95b065e72ea..7b8a1ecd4b6 100644 --- a/ACE/ace/Log_Msg.h +++ b/ACE/ace/Log_Msg.h @@ -665,7 +665,7 @@ private: /// calling log() if the log priority is correct. struct { - int is_set_; + bool is_set_; const char *file_; int line_; int op_status_; |