diff options
| author | Adam Mitz <mitza-oci@users.noreply.github.com> | 2009-06-11 18:21:43 +0000 |
|---|---|---|
| committer | Adam Mitz <mitza-oci@users.noreply.github.com> | 2009-06-11 18:21:43 +0000 |
| commit | a978528ef84cb9072744d890d2a33c30a49833d2 (patch) | |
| tree | 81656c5fd2d5ee68251fc4f02f2ac94b5583d10d | |
| parent | f972204ae77e96491521ceea24f07a4788381df1 (diff) | |
| download | ATCD-a978528ef84cb9072744d890d2a33c30a49833d2.tar.gz | |
ChangeLogTag: Thu Jun 11 18:19:57 UTC 2009 Adam Mitz <mitza@ociweb.com>
| -rw-r--r-- | TAO/ChangeLog | 7 | ||||
| -rw-r--r-- | TAO/utils/logWalker/Invocation.cpp | 6 |
2 files changed, 11 insertions, 2 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 7d3bc045e85..b12623bd829 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,10 @@ +Thu Jun 11 18:19:57 UTC 2009 Adam Mitz <mitza@ociweb.com> + + * utils/logWalker/Invocation.cpp: + + ACE CDR can't be used with size_t because its size varies on + different platforms. + Thu Jun 11 13:20:09 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl> * utils/logWalker/PeerProcess.cpp: diff --git a/TAO/utils/logWalker/Invocation.cpp b/TAO/utils/logWalker/Invocation.cpp index 06e03472625..1059840d0c4 100644 --- a/TAO/utils/logWalker/Invocation.cpp +++ b/TAO/utils/logWalker/Invocation.cpp @@ -231,7 +231,7 @@ Invocation::GIOP_Buffer::actual_req_id(void) const ACE_InputCDR cdr(this->octets_+giop_header_len, this->cur_size() - giop_header_len, bo, vmaj, vmin); - size_t rid; + ACE_CDR::ULong rid; cdr >> rid; return rid; } @@ -259,7 +259,9 @@ Invocation::GIOP_Buffer::target_oid(size_t &len) const ACE_InputCDR cdr(this->octets_ + target_offset, this->cur_size() - target_offset, bo, vmaj, vmin); - cdr >> len; + ACE_CDR::ULong len_ulong; + cdr >> len_ulong; + len = len_ulong; if (target_offset + len > this->cur_size()) { len = 0; |