Updated Branches: refs/heads/master 5def2f87d -> f4e6e62ea
THRIFT-2214: System header sys/param.h is included inside the Thrift namespace Client: cpp Patch: Vladimir Strisovsky Project: http://git-wip-us.apache.org/repos/asf/thrift/repo Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/f4e6e62e Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/f4e6e62e Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/f4e6e62e Branch: refs/heads/master Commit: f4e6e62ea091b94322ecc99756269dbee1c06380 Parents: 5def2f8 Author: Ben Craig <[email protected]> Authored: Tue Nov 5 19:49:12 2013 -0600 Committer: Ben Craig <[email protected]> Committed: Tue Nov 5 19:49:12 2013 -0600 ---------------------------------------------------------------------- lib/cpp/src/thrift/protocol/TProtocol.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/thrift/blob/f4e6e62e/lib/cpp/src/thrift/protocol/TProtocol.h ---------------------------------------------------------------------- diff --git a/lib/cpp/src/thrift/protocol/TProtocol.h b/lib/cpp/src/thrift/protocol/TProtocol.h index d6ecc0f..e72033a 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 <sys/param.h> #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
