Merge branch 'master' into dev
This commit is contained in:
commit
68c9398f71
11 changed files with 58 additions and 32 deletions
|
@ -429,7 +429,7 @@ public:
|
|||
template<unsigned int C>
|
||||
inline void serializeForCache(Buffer<C> &b) const
|
||||
{
|
||||
b.append((uint8_t)1);
|
||||
b.append((uint8_t)2);
|
||||
|
||||
_id.serialize(b);
|
||||
|
||||
|
@ -457,7 +457,7 @@ public:
|
|||
{
|
||||
try {
|
||||
unsigned int ptr = 0;
|
||||
if (b[ptr++] != 1)
|
||||
if (b[ptr++] != 2)
|
||||
return SharedPtr<Peer>();
|
||||
|
||||
Identity id;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue