From: Ben Craig Date: Wed, 6 Nov 2013 01:49:12 +0000 (-0600) Subject: THRIFT-2214: System header sys/param.h is included inside the Thrift namespace X-Git-Url: https://source.supwisdom.com/gerrit/gitweb?a=commitdiff_plain;h=f4e6e62ea091b94322ecc99756269dbee1c06380;p=common%2Fthrift.git THRIFT-2214: System header sys/param.h is included inside the Thrift namespace Client: cpp Patch: Vladimir Strisovsky --- diff --git a/lib/cpp/src/thrift/protocol/TProtocol.h b/lib/cpp/src/thrift/protocol/TProtocol.h index d6ecc0f7..e72033ac 100644 --- a/lib/cpp/src/thrift/protocol/TProtocol.h +++ b/lib/cpp/src/thrift/protocol/TProtocol.h @@ -75,10 +75,6 @@ static inline To bitwise_cast(From from) { } -namespace apache { namespace thrift { namespace protocol { - -using apache::thrift::transport::TTransport; - #ifdef HAVE_SYS_PARAM_H #include #endif @@ -140,6 +136,10 @@ using apache::thrift::transport::TTransport; # error "Can't define htonll or ntohll!" #endif +namespace apache { namespace thrift { namespace protocol { + +using apache::thrift::transport::TTransport; + /** * Enumerated definition of the types that the Thrift protocol supports. * Take special note of the T_END type which is used specifically to mark