You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@thrift.apache.org by ro...@apache.org on 2011/12/08 12:32:22 UTC

svn commit: r1211842 - in /thrift/trunk/lib/cpp/src/protocol: TBinaryProtocol.h TDenseProtocol.h

Author: roger
Date: Thu Dec  8 11:32:21 2011
New Revision: 1211842

URL: http://svn.apache.org/viewvc?rev=1211842&view=rev
Log:
THRIFT-1325 Thrift SVN and latest GCC issue: Undefined symbols: "apache::thrift::protocol::TBinaryProtocolT<apache::thrift::transport::TTransport>::VERSION_MASK"
Patch: Brandon Arp

Modified:
    thrift/trunk/lib/cpp/src/protocol/TBinaryProtocol.h
    thrift/trunk/lib/cpp/src/protocol/TDenseProtocol.h

Modified: thrift/trunk/lib/cpp/src/protocol/TBinaryProtocol.h
URL: http://svn.apache.org/viewvc/thrift/trunk/lib/cpp/src/protocol/TBinaryProtocol.h?rev=1211842&r1=1211841&r2=1211842&view=diff
==============================================================================
--- thrift/trunk/lib/cpp/src/protocol/TBinaryProtocol.h (original)
+++ thrift/trunk/lib/cpp/src/protocol/TBinaryProtocol.h Thu Dec  8 11:32:21 2011
@@ -36,8 +36,8 @@ template <class Transport_>
 class TBinaryProtocolT
   : public TVirtualProtocol< TBinaryProtocolT<Transport_> > {
  protected:
-  static const int32_t VERSION_MASK = 0xffff0000;
-  static const int32_t VERSION_1 = 0x80010000;
+  static const int32_t VERSION_MASK = ((int32_t)0xffff0000);
+  static const int32_t VERSION_1 = ((int32_t)0x80010000);
   // VERSION_2 (0x80020000)  is taken by TDenseProtocol.
 
  public:

Modified: thrift/trunk/lib/cpp/src/protocol/TDenseProtocol.h
URL: http://svn.apache.org/viewvc/thrift/trunk/lib/cpp/src/protocol/TDenseProtocol.h?rev=1211842&r1=1211841&r2=1211842&view=diff
==============================================================================
--- thrift/trunk/lib/cpp/src/protocol/TDenseProtocol.h (original)
+++ thrift/trunk/lib/cpp/src/protocol/TDenseProtocol.h Thu Dec  8 11:32:21 2011
@@ -59,9 +59,9 @@ namespace apache { namespace thrift { na
 class TDenseProtocol
   : public TVirtualProtocol<TDenseProtocol, TBinaryProtocol> {
  protected:
-  static const int32_t VERSION_MASK = 0xffff0000;
+  static const int32_t VERSION_MASK = ((int32_t)0xffff0000);
   // VERSION_1 (0x80010000)  is taken by TBinaryProtocol.
-  static const int32_t VERSION_2 = 0x80020000;
+  static const int32_t VERSION_2 = ((int32_t)0x80020000);
 
  public:
   typedef apache::thrift::reflection::local::TypeSpec TypeSpec;