Index: src/processor/binarystream.h |
=================================================================== |
--- a/src/processor/binarystream.h |
+++ b/src/processor/binarystream.h |
@@ -51,27 +51,27 @@ class binarystream { |
explicit binarystream(const string &str, |
ios_base::openmode which = ios_base::out|ios_base::in) |
: stream_(str, which) {} |
explicit binarystream(const char *str, size_t size, |
ios_base::openmode which = ios_base::out|ios_base::in) |
: stream_(string(str, size), which) {} |
binarystream &operator>>(string &str); |
- binarystream &operator>>(u_int8_t &u8); |
- binarystream &operator>>(u_int16_t &u16); |
- binarystream &operator>>(u_int32_t &u32); |
- binarystream &operator>>(u_int64_t &u64); |
+ binarystream &operator>>(uint8_t &u8); |
+ binarystream &operator>>(uint16_t &u16); |
+ binarystream &operator>>(uint32_t &u32); |
+ binarystream &operator>>(uint64_t &u64); |
// Note: strings are truncated at 65535 characters |
binarystream &operator<<(const string &str); |
- binarystream &operator<<(u_int8_t u8); |
- binarystream &operator<<(u_int16_t u16); |
- binarystream &operator<<(u_int32_t u32); |
- binarystream &operator<<(u_int64_t u64); |
+ binarystream &operator<<(uint8_t u8); |
+ binarystream &operator<<(uint16_t u16); |
+ binarystream &operator<<(uint32_t u32); |
+ binarystream &operator<<(uint64_t u64); |
// Forward a few methods directly from the stream object |
bool eof() const { return stream_.eof(); } |
void clear() { stream_.clear(); } |
string str() const { return stream_.str(); } |
void str(const string &s) { stream_.str(s); } |
// Seek both read and write pointers to the beginning of the stream. |