|
|
@ -264,19 +264,6 @@ public:
|
|
|
|
nVersion = nVersionIn;
|
|
|
|
nVersion = nVersionIn;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
CDataStream& operator+=(const CDataStream& b)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
vch.insert(vch.end(), b.begin(), b.end());
|
|
|
|
|
|
|
|
return *this;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
friend CDataStream operator+(const CDataStream& a, const CDataStream& b)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
CDataStream ret = a;
|
|
|
|
|
|
|
|
ret += b;
|
|
|
|
|
|
|
|
return (ret);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
std::string str() const
|
|
|
|
std::string str() const
|
|
|
|
{
|
|
|
|
{
|
|
|
|
return (std::string(begin(), end()));
|
|
|
|
return (std::string(begin(), end()));
|
|
|
@ -462,11 +449,6 @@ public:
|
|
|
|
return (*this);
|
|
|
|
return (*this);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void GetAndClear(CSerializeData &d) {
|
|
|
|
|
|
|
|
d.insert(d.end(), begin(), end());
|
|
|
|
|
|
|
|
clear();
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* XOR the contents of this stream with a certain key.
|
|
|
|
* XOR the contents of this stream with a certain key.
|
|
|
|
*
|
|
|
|
*
|
|
|
|