diff options
| author | Phil Mesnier <mesnier_p@ociweb.com> | 2009-06-12 10:27:41 +0000 |
|---|---|---|
| committer | Phil Mesnier <mesnier_p@ociweb.com> | 2009-06-12 10:27:41 +0000 |
| commit | c724946a39b9ff7c459485de02ddbfe6848e321f (patch) | |
| tree | 5f25bfaecad19ccd10cc6653124ce7575d60528f | |
| parent | 0d6139094498d9ac4f7c402b58d6f3939d7cfafe (diff) | |
| download | ATCD-c724946a39b9ff7c459485de02ddbfe6848e321f.tar.gz | |
Fri Jun 12 10:25:58 UTC 2009 Phil Mesnier <mesnier_p@ociweb.com>
* utils/logWalker/Invocation.cpp:
HPUX apparently uses something novel for either size_t or ACE_CDR::ULong.
| -rw-r--r-- | TAO/ChangeLog | 10 | ||||
| -rw-r--r-- | TAO/utils/logWalker/Invocation.cpp | 4 |
2 files changed, 10 insertions, 4 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 1e7d807a405..acf5fe3f0b5 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,8 +1,14 @@ +Fri Jun 12 10:25:58 UTC 2009 Phil Mesnier <mesnier_p@ociweb.com> + + * utils/logWalker/Invocation.cpp: + + HPUX apparently uses something novel for either size_t or ACE_CDR::ULong. + Fri Jun 12 02:05:32 UTC 2009 Phil Mesnier <mesnier_p@ociweb.com> * utils/logWalker/logWalker.cpp: - - Clean up WChar errors. + + Clean up WChar errors. Thu Jun 11 23:16:41 UTC 2009 Yan Dai <dai_y@ociweb.com> diff --git a/TAO/utils/logWalker/Invocation.cpp b/TAO/utils/logWalker/Invocation.cpp index 7f2d57bc6b7..72df2fd7ca7 100644 --- a/TAO/utils/logWalker/Invocation.cpp +++ b/TAO/utils/logWalker/Invocation.cpp @@ -233,7 +233,7 @@ Invocation::GIOP_Buffer::actual_req_id(void) const bo, vmaj, vmin); ACE_CDR::ULong rid; cdr >> rid; - return rid; + return static_cast<size_t>(rid); } size_t @@ -261,7 +261,7 @@ Invocation::GIOP_Buffer::target_oid(size_t &len) const bo, vmaj, vmin); ACE_CDR::ULong len_ulong; cdr >> len_ulong; - len = len_ulong; + len = static_cast<size_t>(len_ulong); if (target_offset + len > this->cur_size()) { len = 0; |