From 406fc7497d4c40d4ed3ed99227cf7b90b63150e5 Mon Sep 17 00:00:00 2001 From: Roger Meier Date: Thu, 8 Dec 2011 11:32:21 +0000 Subject: [PATCH] THRIFT-1325 Thrift SVN and latest GCC issue: Undefined symbols: "apache::thrift::protocol::TBinaryProtocolT::VERSION_MASK" Patch: Brandon Arp git-svn-id: https://svn.apache.org/repos/asf/thrift/trunk@1211842 13f79535-47bb-0310-9956-ffa450edef68 --- lib/cpp/src/protocol/TBinaryProtocol.h | 4 ++-- lib/cpp/src/protocol/TDenseProtocol.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/cpp/src/protocol/TBinaryProtocol.h b/lib/cpp/src/protocol/TBinaryProtocol.h index edb8834f..37d33f48 100644 --- a/lib/cpp/src/protocol/TBinaryProtocol.h +++ b/lib/cpp/src/protocol/TBinaryProtocol.h @@ -36,8 +36,8 @@ template class TBinaryProtocolT : public TVirtualProtocol< TBinaryProtocolT > { 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: diff --git a/lib/cpp/src/protocol/TDenseProtocol.h b/lib/cpp/src/protocol/TDenseProtocol.h index 438ed891..fc25cb7b 100644 --- a/lib/cpp/src/protocol/TDenseProtocol.h +++ b/lib/cpp/src/protocol/TDenseProtocol.h @@ -59,9 +59,9 @@ namespace apache { namespace thrift { namespace protocol { class TDenseProtocol : public TVirtualProtocol { 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; -- 2.17.1