Added read/write I16, U16 and Bool methods to TProtocol
Modified code generation to define structs and io methods for function argument lists and server process call implementations
git-svn-id: https://svn.apache.org/repos/asf/incubator/thrift/trunk@664749 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/lib/cpp/src/protocol/TBinaryProtocol.h b/lib/cpp/src/protocol/TBinaryProtocol.h
index db7960f..89f4d4a 100644
--- a/lib/cpp/src/protocol/TBinaryProtocol.h
+++ b/lib/cpp/src/protocol/TBinaryProtocol.h
@@ -15,8 +15,8 @@
*
* @author Mark Slee <mcslee@facebook.com>
*/
-class TBinaryProtocol : public TProtocol {
- public:
+ class TBinaryProtocol : public TProtocol {
+ public:
TBinaryProtocol() {}
~TBinaryProtocol() {}
@@ -28,120 +28,137 @@
const TMessageType messageType,
const uint32_t seqid) const;
- virtual uint32_t writeMessageEnd (shared_ptr<TTransport> out) const;
+ virtual uint32_t writeMessageEnd(shared_ptr<TTransport> out) const;
- uint32_t writeStructBegin (shared_ptr<TTransport> out,
- const std::string& name) const;
+ uint32_t writeStructBegin(shared_ptr<TTransport> out,
+ const std::string& name) const;
- uint32_t writeStructEnd (shared_ptr<TTransport> out) const;
+ uint32_t writeStructEnd(shared_ptr<TTransport> out) const;
- uint32_t writeFieldBegin (shared_ptr<TTransport> out,
- const std::string& name,
- const TType fieldType,
- const uint16_t fieldId) const;
+ uint32_t writeFieldBegin(shared_ptr<TTransport> out,
+ const std::string& name,
+ const TType fieldType,
+ const int16_t fieldId) const;
- uint32_t writeFieldEnd (shared_ptr<TTransport> out) const;
+ uint32_t writeFieldEnd(shared_ptr<TTransport> out) const;
- uint32_t writeFieldStop (shared_ptr<TTransport> out) const;
+ uint32_t writeFieldStop(shared_ptr<TTransport> out) const;
- uint32_t writeMapBegin (shared_ptr<TTransport> out,
- const TType keyType,
- const TType valType,
- const int32_t size) const;
+ uint32_t writeMapBegin(shared_ptr<TTransport> out,
+ const TType keyType,
+ const TType valType,
+ const int32_t size) const;
- uint32_t writeMapEnd (shared_ptr<TTransport> out) const;
+ uint32_t writeMapEnd(shared_ptr<TTransport> out) const;
- uint32_t writeListBegin (shared_ptr<TTransport> out,
- const TType elemType,
- const int32_t size) const;
+ uint32_t writeListBegin(shared_ptr<TTransport> out,
+ const TType elemType,
+ const int32_t size) const;
- uint32_t writeListEnd (shared_ptr<TTransport> out) const;
+ uint32_t writeListEnd(shared_ptr<TTransport> out) const;
- uint32_t writeSetBegin (shared_ptr<TTransport> out,
- const TType elemType,
- const int32_t size) const;
+ uint32_t writeSetBegin(shared_ptr<TTransport> out,
+ const TType elemType,
+ const int32_t size) const;
- uint32_t writeSetEnd (shared_ptr<TTransport> out) const;
+ uint32_t writeSetEnd(shared_ptr<TTransport> out) const;
- uint32_t writeByte (shared_ptr<TTransport> out,
- const uint8_t byte) const;
+ uint32_t writeBool(shared_ptr<TTransport> out,
+ const bool value) const;
- uint32_t writeU32 (shared_ptr<TTransport> out,
- const uint32_t u32) const;
+ uint32_t writeByte(shared_ptr<TTransport> out,
+ const uint8_t byte) const;
- uint32_t writeI32 (shared_ptr<TTransport> out,
- const int32_t i32) const;
+ uint32_t writeU16(shared_ptr<TTransport> out,
+ const uint16_t u16) const;
- uint32_t writeU64 (shared_ptr<TTransport> out,
- const uint64_t u64) const;
+ uint32_t writeI16(shared_ptr<TTransport> out,
+ const int16_t i16) const;
- uint32_t writeI64 (shared_ptr<TTransport> out,
- const int64_t i64) const;
+ uint32_t writeU32(shared_ptr<TTransport> out,
+ const uint32_t u32) const;
- uint32_t writeString (shared_ptr<TTransport> out,
- const std::string& str) const;
+ uint32_t writeI32(shared_ptr<TTransport> out,
+ const int32_t i32) const;
+
+ uint32_t writeU64(shared_ptr<TTransport> out,
+ const uint64_t u64) const;
+
+ uint32_t writeI64(shared_ptr<TTransport> out,
+ const int64_t i64) const;
+
+ uint32_t writeString(shared_ptr<TTransport> out,
+ const std::string& str) const;
/**
* Reading functions
*/
- uint32_t readMessasgeBegin (shared_ptr<TTransport> in,
- TMessageType& messageType,
- uint32_t& seqid) const;
+ uint32_t readMessasgeBegin(shared_ptr<TTransport> in,
+ TMessageType& messageType,
+ uint32_t& seqid) const;
- uint32_t readMessageEnd (shared_ptr<TTransport> in) const;
+ uint32_t readMessageEnd(shared_ptr<TTransport> in) const;
- uint32_t readStructBegin (shared_ptr<TTransport> in,
- std::string& name) const;
+ uint32_t readStructBegin(shared_ptr<TTransport> in,
+ std::string& name) const;
- uint32_t readStructEnd (shared_ptr<TTransport> in) const;
+ uint32_t readStructEnd(shared_ptr<TTransport> in) const;
- uint32_t readFieldBegin (shared_ptr<TTransport> in,
- std::string& name,
- TType& fieldType,
- uint16_t& fieldId) const;
+ uint32_t readFieldBegin(shared_ptr<TTransport> in,
+ std::string& name,
+ TType& fieldType,
+ int16_t& fieldId) const;
- uint32_t readFieldEnd (shared_ptr<TTransport> in) const;
+ uint32_t readFieldEnd(shared_ptr<TTransport> in) const;
- uint32_t readMapBegin (shared_ptr<TTransport> in,
- TType& keyType,
- TType& valType,
- int32_t& size) const;
+ uint32_t readMapBegin(shared_ptr<TTransport> in,
+ TType& keyType,
+ TType& valType,
+ int32_t& size) const;
- uint32_t readMapEnd (shared_ptr<TTransport> in) const;
+ uint32_t readMapEnd(shared_ptr<TTransport> in) const;
- uint32_t readListBegin (shared_ptr<TTransport> in,
- TType& elemType,
- int32_t& size) const;
+ uint32_t readListBegin(shared_ptr<TTransport> in,
+ TType& elemType,
+ int32_t& size) const;
- uint32_t readListEnd (shared_ptr<TTransport> in) const;
+ uint32_t readListEnd(shared_ptr<TTransport> in) const;
- uint32_t readSetBegin (shared_ptr<TTransport> in,
- TType& elemType,
- int32_t& size) const;
+ uint32_t readSetBegin(shared_ptr<TTransport> in,
+ TType& elemType,
+ int32_t& size) const;
- uint32_t readSetEnd (shared_ptr<TTransport> in) const;
+ uint32_t readSetEnd(shared_ptr<TTransport> in) const;
- uint32_t readByte (shared_ptr<TTransport> in,
- uint8_t& byte) const;
+ uint32_t readBool(shared_ptr<TTransport> in,
+ bool& value) const;
- uint32_t readU32 (shared_ptr<TTransport> in,
- uint32_t& u32) const;
+ uint32_t readByte(shared_ptr<TTransport> in,
+ uint8_t& byte) const;
- uint32_t readI32 (shared_ptr<TTransport> in,
- int32_t& i32) const;
+ uint32_t readU16(shared_ptr<TTransport> in,
+ uint16_t& u16) const;
- uint32_t readU64 (shared_ptr<TTransport> in,
- uint64_t& u64) const;
+ uint32_t readI16(shared_ptr<TTransport> in,
+ int16_t& i16) const;
- uint32_t readI64 (shared_ptr<TTransport> in,
- int64_t& i64) const;
+ uint32_t readU32(shared_ptr<TTransport> in,
+ uint32_t& u32) const;
- uint32_t readString (shared_ptr<TTransport> in,
- std::string& str) const;
+ uint32_t readI32(shared_ptr<TTransport> in,
+ int32_t& i32) const;
+ uint32_t readU64(shared_ptr<TTransport> in,
+ uint64_t& u64) const;
+
+ uint32_t readI64(shared_ptr<TTransport> in,
+ int64_t& i64) const;
+
+ uint32_t readString(shared_ptr<TTransport> in,
+ std::string& str) const;
};
}}} // facebook::thrift::protocol