diff options
| author | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2010-08-25 20:45:48 +0000 |
|---|---|---|
| committer | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2010-08-25 20:45:48 +0000 |
| commit | a62d62d47897f347072d2224cf399c66ef92b505 (patch) | |
| tree | eeae99d6f71093ea83495fde585da8c76883805a | |
| parent | 20c32b845acd9a64aa8dcfc9dc18f9aa939e39da (diff) | |
| download | ATCD-a62d62d47897f347072d2224cf399c66ef92b505.tar.gz | |
ChangeLogTag: Wed Aug 25 20:44:19 UTC 2010 Jeff Parsons <j.parsons@vanderbilt.edu>
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | tao/ObjectKey_Table.cpp | 8 | ||||
| -rw-r--r-- | tao/Tagged_Profile.cpp | 10 | ||||
| -rw-r--r-- | tao/Tagged_Profile.inl | 4 |
4 files changed, 27 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog index 8bdaaf85154..ab23e8c4f65 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +Wed Aug 25 20:44:19 UTC 2010 Jeff Parsons <j.parsons@vanderbilt.edu> + + * tao/Tagged_Profile.inl: + * tao/ObjectKey_Table.cpp: + * tao/Tagged_Profile.cpp: + + A few more needed changes for the alternate mapping + caught by the compiler when doing a clean build. + Wed Aug 25 19:55:18 UTC 2010 Jeff Parsons <j.parsons@vanderbilt.edu> * TAO_IDL/be/be_visitor_sequence/any_op_cs.cpp: diff --git a/tao/ObjectKey_Table.cpp b/tao/ObjectKey_Table.cpp index cd7e16d10f1..94aefcd220b 100644 --- a/tao/ObjectKey_Table.cpp +++ b/tao/ObjectKey_Table.cpp @@ -15,8 +15,8 @@ bool TAO::Less_Than_ObjectKey::operator () (const TAO::ObjectKey &lhs, const TAO::ObjectKey &rhs) const { - const CORBA::ULong rlen = rhs.length (); - const CORBA::ULong llen = lhs.length (); + const CORBA::ULong rlen = rhs.size (); + const CORBA::ULong llen = lhs.size (); if (llen < rlen) { return 1; @@ -26,8 +26,8 @@ TAO::Less_Than_ObjectKey::operator () (const TAO::ObjectKey &lhs, return 0; } - const CORBA::Octet * rhs_buff = rhs.get_buffer (); - const CORBA::Octet * lhs_buff = lhs.get_buffer (); + const CORBA::Octet * rhs_buff = rhs.get_allocator ().address (*rhs.begin ()); + const CORBA::Octet * lhs_buff = lhs.get_allocator ().address (*lhs.begin ()); const bool result = (ACE_OS::memcmp (lhs_buff, rhs_buff, rlen) < 0); return result; diff --git a/tao/Tagged_Profile.cpp b/tao/Tagged_Profile.cpp index 2555b4f113e..478ccb954af 100644 --- a/tao/Tagged_Profile.cpp +++ b/tao/Tagged_Profile.cpp @@ -96,14 +96,24 @@ TAO_Tagged_Profile::unmarshall_object_key_i (TAO_InputCDR &input) CORBA::Boolean hdr_status = (CORBA::Boolean) input.good_bit (); CORBA::Long key_length = 0; + CORBA::ULong klen = static_cast<CORBA::ULong> (key_length); hdr_status = hdr_status && input.read_long (key_length); if (hdr_status) { + this->object_key_.resize (klen); + CORBA::Octet *buf = (CORBA::Octet *) input.rd_ptr (); + + for (CORBA::ULong i = 0; i < klen; ++i) + { + this->object_key_[i] = buf[i]; + } + /* this->object_key_.replace (key_length, key_length, (CORBA::Octet*)input.rd_ptr (), 0); + */ input.skip_bytes (key_length); this->object_key_extracted_ = true; diff --git a/tao/Tagged_Profile.inl b/tao/Tagged_Profile.inl index 1591c8c4633..45e1deeebf1 100644 --- a/tao/Tagged_Profile.inl +++ b/tao/Tagged_Profile.inl @@ -29,9 +29,13 @@ TAO_Tagged_Profile::object_key (void) ACE_INLINE void TAO_Tagged_Profile::object_key (TAO::ObjectKey &object_key) { + this->object_key_ = object_key; + +/* this->object_key_.replace (object_key.length (), object_key.length (), object_key.get_buffer ()); +*/ this->object_key_extracted_ = true; } |