You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@thrift.apache.org by dr...@apache.org on 2010/10/06 19:09:58 UTC
svn commit: r1005137 - in /incubator/thrift/trunk/lib/cpp/src/protocol:
TBinaryProtocol.h TCompactProtocol.h TDenseProtocol.h TJSONProtocol.h
TProtocol.h TProtocolTap.h TVirtualProtocol.h
Author: dreiss
Date: Wed Oct 6 17:09:58 2010
New Revision: 1005137
URL: http://svn.apache.org/viewvc?rev=1005137&view=rev
Log:
THRIFT-922. cpp: Fix C++ compilation when using list<bool>
The STL specializes vector<bool> to store the values as individual bits, rather
than bools. Therefore, when using a Thrift list<bool>, readBool() gets invoked
not with a bool&, but with a std::vector<bool>::reference.
TProtocol does provide a readBool(std::vector<bool>::reference) implementation.
However, almost all TProtocol subclasses defined only readBool(bool&), which
hides the other overloaded versions of readBool(). As a result, the code
worked only when accessing TProtocol objects via a "TProtocol*", and not
directly via the subclass type. When using C++ templates, protocol objects do
get invoked via pointers to the subclass type, causing compile failures when
std::vector<bool> is used.
This change updates the various TProtocol implementations to also provide
readBool(std::vector<bool>::reference).
Modified:
incubator/thrift/trunk/lib/cpp/src/protocol/TBinaryProtocol.h
incubator/thrift/trunk/lib/cpp/src/protocol/TCompactProtocol.h
incubator/thrift/trunk/lib/cpp/src/protocol/TDenseProtocol.h
incubator/thrift/trunk/lib/cpp/src/protocol/TJSONProtocol.h
incubator/thrift/trunk/lib/cpp/src/protocol/TProtocol.h
incubator/thrift/trunk/lib/cpp/src/protocol/TProtocolTap.h
incubator/thrift/trunk/lib/cpp/src/protocol/TVirtualProtocol.h
Modified: incubator/thrift/trunk/lib/cpp/src/protocol/TBinaryProtocol.h
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/cpp/src/protocol/TBinaryProtocol.h?rev=1005137&r1=1005136&r2=1005137&view=diff
==============================================================================
--- incubator/thrift/trunk/lib/cpp/src/protocol/TBinaryProtocol.h (original)
+++ incubator/thrift/trunk/lib/cpp/src/protocol/TBinaryProtocol.h Wed Oct 6 17:09:58 2010
@@ -174,6 +174,8 @@ class TBinaryProtocolT
inline uint32_t readSetEnd();
inline uint32_t readBool(bool& value);
+ // Provide the default readBool() implementation for std::vector<bool>
+ using TVirtualProtocol< TBinaryProtocolT<Transport_> >::readBool;
inline uint32_t readByte(int8_t& byte);
Modified: incubator/thrift/trunk/lib/cpp/src/protocol/TCompactProtocol.h
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/cpp/src/protocol/TCompactProtocol.h?rev=1005137&r1=1005136&r2=1005137&view=diff
==============================================================================
--- incubator/thrift/trunk/lib/cpp/src/protocol/TCompactProtocol.h (original)
+++ incubator/thrift/trunk/lib/cpp/src/protocol/TCompactProtocol.h Wed Oct 6 17:09:58 2010
@@ -192,6 +192,8 @@ class TCompactProtocolT
uint32_t& size);
uint32_t readBool(bool& value);
+ // Provide the default readBool() implementation for std::vector<bool>
+ using TVirtualProtocol< TCompactProtocolT<Transport_> >::readBool;
uint32_t readByte(int8_t& byte);
Modified: incubator/thrift/trunk/lib/cpp/src/protocol/TDenseProtocol.h
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/cpp/src/protocol/TDenseProtocol.h?rev=1005137&r1=1005136&r2=1005137&view=diff
==============================================================================
--- incubator/thrift/trunk/lib/cpp/src/protocol/TDenseProtocol.h (original)
+++ incubator/thrift/trunk/lib/cpp/src/protocol/TDenseProtocol.h Wed Oct 6 17:09:58 2010
@@ -189,6 +189,8 @@ class TDenseProtocol
uint32_t readSetEnd();
uint32_t readBool(bool& value);
+ // Provide the default readBool() implementation for std::vector<bool>
+ using TVirtualProtocol<TDenseProtocol, TBinaryProtocol>::readBool;
uint32_t readByte(int8_t& byte);
Modified: incubator/thrift/trunk/lib/cpp/src/protocol/TJSONProtocol.h
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/cpp/src/protocol/TJSONProtocol.h?rev=1005137&r1=1005136&r2=1005137&view=diff
==============================================================================
--- incubator/thrift/trunk/lib/cpp/src/protocol/TJSONProtocol.h (original)
+++ incubator/thrift/trunk/lib/cpp/src/protocol/TJSONProtocol.h Wed Oct 6 17:09:58 2010
@@ -243,6 +243,9 @@ class TJSONProtocol : public TVirtualPro
uint32_t readBool(bool& value);
+ // Provide the default readBool() implementation for std::vector<bool>
+ using TVirtualProtocol<TJSONProtocol>::readBool;
+
uint32_t readByte(int8_t& byte);
uint32_t readI16(int16_t& i16);
Modified: incubator/thrift/trunk/lib/cpp/src/protocol/TProtocol.h
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/cpp/src/protocol/TProtocol.h?rev=1005137&r1=1005136&r2=1005137&view=diff
==============================================================================
--- incubator/thrift/trunk/lib/cpp/src/protocol/TProtocol.h (original)
+++ incubator/thrift/trunk/lib/cpp/src/protocol/TProtocol.h Wed Oct 6 17:09:58 2010
@@ -30,6 +30,7 @@
#include <sys/types.h>
#include <string>
#include <map>
+#include <vector>
// Use this to get around strict aliasing rules.
@@ -493,6 +494,8 @@ class TProtocol {
virtual uint32_t readBool_virt(bool& value) = 0;
+ virtual uint32_t readBool_virt(std::vector<bool>::reference value) = 0;
+
virtual uint32_t readByte_virt(int8_t& byte) = 0;
virtual uint32_t readI16_virt(int16_t& i16) = 0;
@@ -611,11 +614,14 @@ class TProtocol {
return readBinary_virt(str);
}
- uint32_t readBool(std::vector<bool>::reference ref) {
- bool value;
- uint32_t rv = readBool(value);
- ref = value;
- return rv;
+ /*
+ * std::vector is specialized for bool, and its elements are individual bits
+ * rather than bools. We need to define a different version of readBool()
+ * to work with std::vector<bool>.
+ */
+ uint32_t readBool(std::vector<bool>::reference value) {
+ T_VIRTUAL_CALL();
+ return readBool_virt(value);
}
/**
Modified: incubator/thrift/trunk/lib/cpp/src/protocol/TProtocolTap.h
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/cpp/src/protocol/TProtocolTap.h?rev=1005137&r1=1005136&r2=1005137&view=diff
==============================================================================
--- incubator/thrift/trunk/lib/cpp/src/protocol/TProtocolTap.h (original)
+++ incubator/thrift/trunk/lib/cpp/src/protocol/TProtocolTap.h Wed Oct 6 17:09:58 2010
@@ -133,6 +133,9 @@ class TProtocolTap : public TVirtualProt
return rv;
}
+ // Provide the default readBool() implementation for std::vector<bool>
+ using TVirtualProtocol<TProtocolTap>::readBool;
+
uint32_t readByte(int8_t& byte) {
uint32_t rv = source_->readByte(byte);
sink_->writeByte(byte);
Modified: incubator/thrift/trunk/lib/cpp/src/protocol/TVirtualProtocol.h
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/cpp/src/protocol/TVirtualProtocol.h?rev=1005137&r1=1005136&r2=1005137&view=diff
==============================================================================
--- incubator/thrift/trunk/lib/cpp/src/protocol/TVirtualProtocol.h (original)
+++ incubator/thrift/trunk/lib/cpp/src/protocol/TVirtualProtocol.h Wed Oct 6 17:09:58 2010
@@ -108,6 +108,11 @@ class TProtocolDefaults : public TProtoc
"this protocol does not support reading (yet).");
}
+ uint32_t readBool(std::vector<bool>::reference value) {
+ throw TProtocolException(TProtocolException::NOT_IMPLEMENTED,
+ "this protocol does not support reading (yet).");
+ }
+
uint32_t readByte(int8_t& byte) {
throw TProtocolException(TProtocolException::NOT_IMPLEMENTED,
"this protocol does not support reading (yet).");
@@ -437,6 +442,10 @@ class TVirtualProtocol : public Super_ {
return static_cast<Protocol_*>(this)->readBool(value);
}
+ virtual uint32_t readBool_virt(std::vector<bool>::reference value) {
+ return static_cast<Protocol_*>(this)->readBool(value);
+ }
+
virtual uint32_t readByte_virt(int8_t& byte) {
return static_cast<Protocol_*>(this)->readByte(byte);
}
@@ -484,6 +493,21 @@ class TVirtualProtocol : public Super_ {
return ::apache::thrift::protocol::skip(*prot, type);
}
+ /*
+ * Provide a default readBool() implementation for use with
+ * std::vector<bool>, that behaves the same as reading into a normal bool.
+ *
+ * Subclasses can override this if desired, but there normally shouldn't
+ * be a need to.
+ */
+ uint32_t readBool(std::vector<bool>::reference value) {
+ bool b = false;
+ uint32_t ret = static_cast<Protocol_*>(this)->readBool(b);
+ value = b;
+ return ret;
+ }
+ using Super_::readBool; // so we don't hide readBool(bool&)
+
protected:
TVirtualProtocol(boost::shared_ptr<TTransport> ptrans)
: Super_(ptrans)