44a45,46
> using namespace std;
>
136,164d137
<
< /** delete the data pointed to in the data pointer. Ok to call to matter how
< * data was allocted. */
< void
< Packet::deleteData()
< {
< assert(staticData || dynamicData);
< if (staticData)
< return;
<
< if (arrayData)
< delete [] data;
< else
< delete data;
< }
<
< /** If there isn't data in the packet, allocate some. */
< void
< Packet::allocate()
< {
< if (data)
< return;
< assert(!staticData);
< dynamicData = true;
< arrayData = true;
< data = new uint8_t[getSize()];
< }
<
<
196c169
< std::memcpy(getPtr<uint8_t>(), data + offset, getSize());
---
> memcpy(getPtr<uint8_t>(), data + offset, getSize());
211,215c184,189
< std::memcpy(data + offset, getPtr<uint8_t>(),
< (std::min(func_end, val_end) - func_start) + 1);
< } else { // val_start > func_start
< std::memcpy(data, getPtr<uint8_t>() - offset,
< (std::min(func_end, val_end) - val_start) + 1);
---
> memcpy(data + offset, getPtr<uint8_t>(),
> (min(func_end, val_end) - func_start) + 1);
> } else {
> // val_start > func_start
> memcpy(data, getPtr<uint8_t>() - offset,
> (min(func_end, val_end) - val_start) + 1);
225d198
<
227,228c200
< Packet::print(std::ostream &o, const int verbosity,
< const std::string &prefix) const
---
> Packet::print(ostream &o, const int verbosity, const string &prefix) const
234,236c206,207
<
< Packet::PrintReqState::PrintReqState(std::ostream &_os, int _verbosity)
< : curPrefixPtr(new std::string("")), os(_os), verbosity(_verbosity)
---
> Packet::PrintReqState::PrintReqState(ostream &_os, int _verbosity)
> : curPrefixPtr(new string("")), os(_os), verbosity(_verbosity)
241d211
<
249d218
<
251,252c220
< LabelStackEntry::LabelStackEntry(const std::string &_label,
< std::string *_prefix)
---
> LabelStackEntry::LabelStackEntry(const string &_label, string *_prefix)
257d224
<
259,260c226
< Packet::PrintReqState::pushLabel(const std::string &lbl,
< const std::string &prefix)
---
> Packet::PrintReqState::pushLabel(const string &lbl, const string &prefix)
263c229
< curPrefixPtr = new std::string(*curPrefixPtr);
---
> curPrefixPtr = new string(*curPrefixPtr);