summaryrefslogtreecommitdiff
path: root/ace/CDR_Base.cpp
diff options
context:
space:
mode:
authorSteve Huston <shuston@riverace.com>2002-07-11 19:05:11 +0000
committerSteve Huston <shuston@riverace.com>2002-07-11 19:05:11 +0000
commit7bfd59613431e742e953d4e7fb2c073f553791c7 (patch)
tree860046080856465eb0bc7c312b3be34a0a2d218d /ace/CDR_Base.cpp
parent3502aa31b276f4cb4468dcb0d7910fecdf8c4a0a (diff)
downloadATCD-7bfd59613431e742e953d4e7fb2c073f553791c7.tar.gz
ChangeLogTag:Thu Jul 11 15:03:47 2002 Steve Huston <shuston@riverace.com>
Diffstat (limited to 'ace/CDR_Base.cpp')
-rw-r--r--ace/CDR_Base.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/ace/CDR_Base.cpp b/ace/CDR_Base.cpp
index 6130a598947..a6afa86830b 100644
--- a/ace/CDR_Base.cpp
+++ b/ace/CDR_Base.cpp
@@ -519,10 +519,10 @@ ACE_CDR::consolidate (ACE_Message_Block *dst,
// We must copy the contents of <src> into the new buffer, but
// respecting the alignment.
- ptr_arith_t srcalign =
- ptr_arith_t(src->rd_ptr ()) % ACE_CDR::MAX_ALIGNMENT;
- ptr_arith_t dstalign =
- ptr_arith_t(dst->rd_ptr ()) % ACE_CDR::MAX_ALIGNMENT;
+ ptrdiff_t srcalign =
+ ptrdiff_t(src->rd_ptr ()) % ACE_CDR::MAX_ALIGNMENT;
+ ptrdiff_t dstalign =
+ ptrdiff_t(dst->rd_ptr ()) % ACE_CDR::MAX_ALIGNMENT;
int offset = srcalign - dstalign;
if (offset < 0)
offset += ACE_CDR::MAX_ALIGNMENT;