valitydev/thrift
14
0
Fork 0
mirror of https://github.com/valitydev/thrift.git synced 2024-11-07 10:48:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

THRIFT-3298: thrift endian converters may conflict with other libraries

Browse Source 
Client: cpp
Patch: Xiaoshuang LU

Converts ntohll, htonll to be Thrift prefixed to avoid redefinition by other libraries (ie. zookeeper.h)
This commit is contained in:
jfarrell 2015-09-24 23:27:34 -04:00
parent a1ae93f4be
commit ad3a95527c
2 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/cpp/src/thrift/protocol/TCompactProtocol.tcc
View File

@ -255,7 +255,7 @@ uint32_t TCompactProtocolT<Transport_>::writeDouble(const double dub) {
BOOST_STATIC_ASSERT(std::numeric_limits<double>::is_iec559); BOOST_STATIC_ASSERT(std::numeric_limits<double>::is_iec559);
uint64_t bits = bitwise_cast<uint64_t>(dub); uint64_t bits = bitwise_cast<uint64_t>(dub);
bits = htolell(bits); bits = THRIFT_htolell(bits);
trans_->write((uint8_t*)&bits, 8); trans_->write((uint8_t*)&bits, 8);
return 8; return 8;
} }
@ -659,7 +659,7 @@ uint32_t TCompactProtocolT<Transport_>::readDouble(double& dub) {
uint8_t b[8]; uint8_t b[8];
} u; } u;
trans_->readAll(u.b, 8); trans_->readAll(u.b, 8);
u.bits = letohll(u.bits); u.bits = THRIFT_letohll(u.bits);
dub = bitwise_cast<double>(u.bits); dub = bitwise_cast<double>(u.bits);
return 8; return 8;
} }

42
lib/cpp/src/thrift/protocol/TProtocol.h
View File

@ -98,14 +98,14 @@ static inline To bitwise_cast(From from) {
#endif #endif
#if __THRIFT_BYTE_ORDER == __THRIFT_BIG_ENDIAN #if __THRIFT_BYTE_ORDER == __THRIFT_BIG_ENDIAN
# if !defined(ntohll) # if !defined(THRIFT_ntohll)
# define ntohll(n) (n) # define THRIFT_ntohll(n) (n)
# define htonll(n) (n) # define THRIFT_htonll(n) (n)
# endif # endif
# if defined(__GNUC__) && defined(__GLIBC__) # if defined(__GNUC__) && defined(__GLIBC__)
# include <byteswap.h> # include <byteswap.h>
# define htolell(n) bswap_64(n) # define THRIFT_htolell(n) bswap_64(n)
# define letohll(n) bswap_64(n) # define THRIFT_letohll(n) bswap_64(n)
# define THRIFT_htolel(n) bswap_32(n) # define THRIFT_htolel(n) bswap_32(n)
# define THRIFT_letohl(n) bswap_32(n) # define THRIFT_letohl(n) bswap_32(n)
# define THRIFT_htoles(n) bswap_16(n) # define THRIFT_htoles(n) bswap_16(n)
@ -128,33 +128,33 @@ static inline To bitwise_cast(From from) {
# define bswap_16(n) \ # define bswap_16(n) \
( (((n) & ((unsigned short)0xff00ul)) >> 8) \ ( (((n) & ((unsigned short)0xff00ul)) >> 8) \
| (((n) & ((unsigned short)0x00fful)) << 8) ) | (((n) & ((unsigned short)0x00fful)) << 8) )
# define htolell(n) bswap_64(n) # define THRIFT_htolell(n) bswap_64(n)
# define letohll(n) bswap_64(n) # define THRIFT_letohll(n) bswap_64(n)
# define THRIFT_htolel(n) bswap_32(n) # define THRIFT_htolel(n) bswap_32(n)
# define THRIFT_letohl(n) bswap_32(n) # define THRIFT_letohl(n) bswap_32(n)
# define THRIFT_htoles(n) bswap_16(n) # define THRIFT_htoles(n) bswap_16(n)
# define THRIFT_letohs(n) bswap_16(n) # define THRIFT_letohs(n) bswap_16(n)
# endif /* GNUC & GLIBC */ # endif /* GNUC & GLIBC */
#elif __THRIFT_BYTE_ORDER == __THRIFT_LITTLE_ENDIAN #elif __THRIFT_BYTE_ORDER == __THRIFT_LITTLE_ENDIAN
# define htolell(n) (n) # define THRIFT_htolell(n) (n)
# define letohll(n) (n) # define THRIFT_letohll(n) (n)
# define THRIFT_htolel(n) (n) # define THRIFT_htolel(n) (n)
# define THRIFT_letohl(n) (n) # define THRIFT_letohl(n) (n)
# define THRIFT_htoles(n) (n) # define THRIFT_htoles(n) (n)
# define THRIFT_letohs(n) (n) # define THRIFT_letohs(n) (n)
# if defined(__GNUC__) && defined(__GLIBC__) # if defined(__GNUC__) && defined(__GLIBC__)
# include <byteswap.h> # include <byteswap.h>
# define ntohll(n) bswap_64(n) # define THRIFT_ntohll(n) bswap_64(n)
# define htonll(n) bswap_64(n) # define THRIFT_htonll(n) bswap_64(n)
# elif defined(_MSC_VER) /* Microsoft Visual C++ */ # elif defined(_MSC_VER) /* Microsoft Visual C++ */
# define ntohll(n) ( _byteswap_uint64((uint64_t)n) ) # define THRIFT_ntohll(n) ( _byteswap_uint64((uint64_t)n) )
# define htonll(n) ( _byteswap_uint64((uint64_t)n) ) # define THRIFT_htonll(n) ( _byteswap_uint64((uint64_t)n) )
# elif !defined(ntohll) /* Not GNUC/GLIBC or MSVC */ # elif !defined(THRIFT_ntohll) /* Not GNUC/GLIBC or MSVC */
# define ntohll(n) ( (((uint64_t)ntohl((uint32_t)n)) << 32) + ntohl((uint32_t)(n >> 32)) ) # define THRIFT_ntohll(n) ( (((uint64_t)ntohl((uint32_t)n)) << 32) + ntohl((uint32_t)(n >> 32)) )
# define htonll(n) ( (((uint64_t)htonl((uint32_t)n)) << 32) + htonl((uint32_t)(n >> 32)) ) # define THRIFT_htonll(n) ( (((uint64_t)htonl((uint32_t)n)) << 32) + htonl((uint32_t)(n >> 32)) )
# endif /* GNUC/GLIBC or MSVC or something else */ # endif /* GNUC/GLIBC or MSVC or something else */
#else /* __THRIFT_BYTE_ORDER */ #else /* __THRIFT_BYTE_ORDER */
# error "Can't define htonll or ntohll!" # error "Can't define THRIFT_htonll or THRIFT_ntohll!"
#endif #endif
namespace apache { namespace apache {
@ -610,10 +610,10 @@ struct TNetworkBigEndian
{ {
static uint16_t toWire16(uint16_t x) {return htons(x);} static uint16_t toWire16(uint16_t x) {return htons(x);}
static uint32_t toWire32(uint32_t x) {return htonl(x);} static uint32_t toWire32(uint32_t x) {return htonl(x);}
static uint64_t toWire64(uint64_t x) {return htonll(x);} static uint64_t toWire64(uint64_t x) {return THRIFT_htonll(x);}
static uint16_t fromWire16(uint16_t x) {return ntohs(x);} static uint16_t fromWire16(uint16_t x) {return ntohs(x);}
static uint32_t fromWire32(uint32_t x) {return ntohl(x);} static uint32_t fromWire32(uint32_t x) {return ntohl(x);}
static uint64_t fromWire64(uint64_t x) {return ntohll(x);} static uint64_t fromWire64(uint64_t x) {return THRIFT_ntohll(x);}
}; };
// On most systems, this will be a bit faster than TNetworkBigEndian // On most systems, this will be a bit faster than TNetworkBigEndian
@ -621,10 +621,10 @@ struct TNetworkLittleEndian
{ {
static uint16_t toWire16(uint16_t x) {return THRIFT_htoles(x);} static uint16_t toWire16(uint16_t x) {return THRIFT_htoles(x);}
static uint32_t toWire32(uint32_t x) {return THRIFT_htolel(x);} static uint32_t toWire32(uint32_t x) {return THRIFT_htolel(x);}
static uint64_t toWire64(uint64_t x) {return htolell(x);} static uint64_t toWire64(uint64_t x) {return THRIFT_htolell(x);}
static uint16_t fromWire16(uint16_t x) {return THRIFT_letohs(x);} static uint16_t fromWire16(uint16_t x) {return THRIFT_letohs(x);}
static uint32_t fromWire32(uint32_t x) {return THRIFT_letohl(x);} static uint32_t fromWire32(uint32_t x) {return THRIFT_letohl(x);}
static uint64_t fromWire64(uint64_t x) {return letohll(x);} static uint64_t fromWire64(uint64_t x) {return THRIFT_letohll(x);}
}; };
struct TOutputRecursionTracker { struct TOutputRecursionTracker {