Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 06:38:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Removing the "uint8*" methods from SerializationFormat.

Browse source 
They conflict with the "char" version, so that other classes would now
pick the wrong one. Added a bit of casting to HLL to use the "char"
versions instead.
This commit is contained in:
Robin Sommer 2013-08-31 11:03:40 -07:00
parent a8ac7d8a5b
commit de5bb65ff7
4 changed files with 4 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/SerializationFormat.h
View file

@ -23,7 +23,6 @@ public:
virtual void EndRead();
virtual bool Read(int* v, const char* tag) = 0;
virtual bool Read(uint8* v, const char* tag) = 0;
virtual bool Read(uint16* v, const char* tag) = 0;
virtual bool Read(uint32* v, const char* tag) = 0;
virtual bool Read(int64* v, const char* tag) = 0;
@ -48,7 +47,6 @@ public:
virtual uint32 EndWrite(char** data); // passes ownership
virtual bool Write(int v, const char* tag) = 0;
virtual bool Write(uint8 v, const char* tag) = 0;
virtual bool Write(uint16 v, const char* tag) = 0;
virtual bool Write(uint32 v, const char* tag) = 0;
virtual bool Write(int64 v, const char* tag) = 0;
@ -94,7 +92,6 @@ public:
virtual ~BinarySerializationFormat();
virtual bool Read(int* v, const char* tag);
virtual bool Read(uint8* v, const char* tag);
virtual bool Read(uint16* v, const char* tag);
virtual bool Read(uint32* v, const char* tag);
virtual bool Read(int64* v, const char* tag);
@ -109,7 +106,6 @@ public:
virtual bool Read(struct in_addr* addr, const char* tag);
virtual bool Read(struct in6_addr* addr, const char* tag);
virtual bool Write(int v, const char* tag);
virtual bool Write(uint8 v, const char* tag);
virtual bool Write(uint16 v, const char* tag);
virtual bool Write(uint32 v, const char* tag);
virtual bool Write(int64 v, const char* tag);
@ -136,7 +132,6 @@ public:
// We don't write anything if tag is nil.
virtual bool Write(int v, const char* tag);
virtual bool Write(uint8 v, const char* tag);
virtual bool Write(uint16 v, const char* tag);
virtual bool Write(uint32 v, const char* tag);
virtual bool Write(int64 v, const char* tag);
@ -157,7 +152,6 @@ public:
// Not implemented.
virtual bool Read(int* v, const char* tag);
virtual bool Read(uint8* v, const char* tag);
virtual bool Read(uint16* v, const char* tag);
virtual bool Read(uint32* v, const char* tag);
virtual bool Read(int64* v, const char* tag);