* Fix merge

This commit is contained in:
2015-05-18 20:36:45 -07:00
166 changed files with 11750 additions and 7793 deletions

View File

@@ -42,21 +42,21 @@ public:
atUint64 position() const;
atUint64 length() const;
void writeBit (bool val);
void seekBit (int bit);
void writeUByte (atUint8 val);
void writeByte (atInt8 val);
void writeBit(bool val);
void seekBit(int bit);
void writeUByte(atUint8 val);
void writeByte(atInt8 val);
void writeUBytes(atUint8* data, atUint64 len);
void writeBytes (atInt8* data, atUint64 len);
void writeBytes(atInt8* data, atUint64 len);
void writeUint16(atUint16 val);
void writeInt16 (atInt16 val);
void writeInt16(atInt16 val);
void writeUint32(atUint32 val);
void writeInt32 (atInt32 val);
void writeInt32(atInt32 val);
void writeUint64(atUint64 val);
void writeInt64 (atInt64 val);
void writeInt64(atInt64 val);
void writeDouble(double val);
void writeFloat (float val);
void writeBool (bool val);
void writeFloat(float val);
void writeBool(bool val);
void writeString(const std::string& val);
void writeUnicode(const std::string& str);
void fill(atInt8 byte, atUint64 len);