diff options
| author | bala <balanatarajan@users.noreply.github.com> | 2004-03-16 17:09:12 +0000 |
|---|---|---|
| committer | bala <balanatarajan@users.noreply.github.com> | 2004-03-16 17:09:12 +0000 |
| commit | 91c2b94b4eec24b58985043eee4a853dafc568a8 (patch) | |
| tree | 657b6aa8bb5fb1da00ca81e1d69770ae4a492daf | |
| parent | 11d140e12bcea12236c95aec4f12ec33b0a121af (diff) | |
| download | ATCD-91c2b94b4eec24b58985043eee4a853dafc568a8.tar.gz | |
ChangeLogTag:Tue Mar 16 10:48:48 2004 Balachandran Natarajan <bala@dre.vanderbilt.edu>
| -rw-r--r-- | ChangeLog | 15 | ||||
| -rw-r--r-- | ace/Logging_Strategy.cpp | 5 | ||||
| -rw-r--r-- | ace/Malloc_T.i | 2 | ||||
| -rw-r--r-- | ace/Strategies_T.cpp | 1 |
4 files changed, 21 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index aac2b83447d..ef1d1381b50 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,18 @@ +Tue Mar 16 10:48:48 2004 Balachandran Natarajan <bala@dre.vanderbilt.edu> + + + * ace/Logging_Strategy.cpp: + + Use std::streamoff () to get the offset instead of casting. + + * ace/Malloc_T.i: + * ace/Strategies_T.cpp: + + #included OS_NS_string.h. + + Thanks to Oliver Kellog for providing the patches. + + Tue Mar 16 09:40:36 2004 Chad Elliott <elliott_c@ociweb.com> * bin/MakeProjectCreator/modules/TemplateParser.pm: diff --git a/ace/Logging_Strategy.cpp b/ace/Logging_Strategy.cpp index 4d2e6f8effa..6117ca826f5 100644 --- a/ace/Logging_Strategy.cpp +++ b/ace/Logging_Strategy.cpp @@ -367,8 +367,9 @@ ACE_Logging_Strategy::handle_timeout (const ACE_Time_Value &, 0, SEEK_CUR) > this->max_size_) #else - if ((size_t) this->log_msg_->msg_ostream ()->tellp () - > this->max_size_) + const std::streampos pos = this->log_msg_->msg_ostream ()->tellp (); + const std::streamoff ofst = std::streamoff (pos); + if ((size_t) ofst > this->max_size_) #endif /* ACE_LACKS_IOSTREAM_TOTALLY */ { // Lock out any other logging. diff --git a/ace/Malloc_T.i b/ace/Malloc_T.i index 4dbe282ab51..4d137ac1228 100644 --- a/ace/Malloc_T.i +++ b/ace/Malloc_T.i @@ -3,6 +3,8 @@ // Malloc_T.i +#include "ace/OS_NS_string.h" + template <class T> ACE_INLINE T * ACE_Cached_Mem_Pool_Node<T>::addr (void) { diff --git a/ace/Strategies_T.cpp b/ace/Strategies_T.cpp index 03619fef95c..1c55aeb5026 100644 --- a/ace/Strategies_T.cpp +++ b/ace/Strategies_T.cpp @@ -13,6 +13,7 @@ #include "ace/WFMO_Reactor.h" #include "ace/ACE.h" #include "ace/OS_NS_dlfcn.h" +#include "ace/OS_NS_string.h" #if defined (ACE_LACKS_INLINE_FUNCTIONS) #include "ace/Strategies_T.i" |