From d42a2c2bf9630cfb4d9d49cbee1fc812e5e5777d Mon Sep 17 00:00:00 2001 From: Marc Slemko Date: Thu, 10 Aug 2006 03:30:18 +0000 Subject: [PATCH] Rationalized include-directory schema git-svn-id: https://svn.apache.org/repos/asf/incubator/thrift/trunk@664747 13f79535-47bb-0310-9956-ffa450edef68 --- lib/cpp/Makefile.am | 8 ++++---- lib/cpp/configure.ac | 6 ++++++ lib/cpp/src/concurrency/Util.h | 2 +- lib/cpp/src/concurrency/test/ThreadFactoryTests.h | 1 - lib/cpp/src/protocol/TBinaryProtocol.cc | 3 ++- lib/cpp/src/protocol/TBinaryProtocol.h | 2 +- lib/cpp/src/protocol/TProtocol.h | 9 +++++++-- lib/cpp/src/transport/TBufferedTransport.h | 2 +- lib/cpp/src/transport/TChunkedTransport.h | 2 +- lib/cpp/src/transport/TNullTransport.h | 2 +- lib/cpp/src/transport/TServerSocket.cc | 4 ++-- lib/cpp/src/transport/TServerSocket.h | 2 +- lib/cpp/src/transport/TServerTransport.h | 4 ++-- lib/cpp/src/transport/TSocket.cc | 4 ++-- lib/cpp/src/transport/TSocket.h | 4 ++-- lib/cpp/src/transport/TTransport.h | 2 +- 16 files changed, 34 insertions(+), 23 deletions(-) diff --git a/lib/cpp/Makefile.am b/lib/cpp/Makefile.am index 548da760..b8560683 100644 --- a/lib/cpp/Makefile.am +++ b/lib/cpp/Makefile.am @@ -29,7 +29,7 @@ include_thrift_HEADERS = \ src/Thrift.h \ src/TProcessor.h -include_concurrencydir = $(includedir)/thrift/concurrency +include_concurrencydir = $(include_thriftdir)/concurrency include_concurrency_HEADERS = \ src/concurrency/Exception.h \ src/concurrency/Monitor.h \ @@ -38,12 +38,12 @@ include_concurrency_HEADERS = \ src/concurrency/ThreadManager.h \ src/concurrency/TimerManager.h -include_protocoldir = $(includedir)/thrift/protocol +include_protocoldir = $(include_thriftdir)/protocol include_protocol_HEADERS = \ src/protocol/TBinaryProtocol.h \ src/protocol/TProtocol.h -include_transportdir = $(includedir)/thrift/transport +include_transportdir = $(include_thriftdir)/transport include_transport_HEADERS = \ src/transport/TBufferedTransport.h \ src/transport/TChunkedTransport.h \ @@ -54,7 +54,7 @@ include_transport_HEADERS = \ src/transport/TTransport.h \ src/transport/TTransportException.h -include_serverdir = $(includedir)/thrift/server +include_serverdir = $(include_thriftdir)/server include_server_HEADERS = \ src/server/TServer.h \ src/server/TSimpleServer.h \ diff --git a/lib/cpp/configure.ac b/lib/cpp/configure.ac index ee9995e6..b854ebd9 100644 --- a/lib/cpp/configure.ac +++ b/lib/cpp/configure.ac @@ -14,6 +14,10 @@ AC_CHECK_FUNCS([memset]) AC_CHECK_FUNCS([socket]) +AC_CHECK_FUNCS([strtol]) + +AC_CHECK_FUNCS([strtoul]) + AC_CHECK_HEADERS([arpa/inet.h]) AC_CHECK_HEADERS([inttypes.h]) @@ -52,6 +56,8 @@ AC_HEADER_TIME AC_TYPE_SIZE_T +AC_TYPE_INT16_T + AC_TYPE_INT32_T AC_TYPE_INT64_T diff --git a/lib/cpp/src/concurrency/Util.h b/lib/cpp/src/concurrency/Util.h index fc24f74d..33426539 100644 --- a/lib/cpp/src/concurrency/Util.h +++ b/lib/cpp/src/concurrency/Util.h @@ -5,7 +5,7 @@ #include #include -#include +#include namespace facebook { namespace thrift { namespace concurrency { diff --git a/lib/cpp/src/concurrency/test/ThreadFactoryTests.h b/lib/cpp/src/concurrency/test/ThreadFactoryTests.h index c0191593..26e4c28f 100644 --- a/lib/cpp/src/concurrency/test/ThreadFactoryTests.h +++ b/lib/cpp/src/concurrency/test/ThreadFactoryTests.h @@ -26,7 +26,6 @@ public: public: - Task() {} void run() { diff --git a/lib/cpp/src/protocol/TBinaryProtocol.cc b/lib/cpp/src/protocol/TBinaryProtocol.cc index fef8ab48..624965b6 100644 --- a/lib/cpp/src/protocol/TBinaryProtocol.cc +++ b/lib/cpp/src/protocol/TBinaryProtocol.cc @@ -1,4 +1,5 @@ -#include "protocol/TBinaryProtocol.h" +#include "TBinaryProtocol.h" + using std::string; namespace facebook { namespace thrift { namespace protocol { diff --git a/lib/cpp/src/protocol/TBinaryProtocol.h b/lib/cpp/src/protocol/TBinaryProtocol.h index 3456abf7..db7960f8 100644 --- a/lib/cpp/src/protocol/TBinaryProtocol.h +++ b/lib/cpp/src/protocol/TBinaryProtocol.h @@ -1,7 +1,7 @@ #ifndef T_BINARY_PROTOCOL_H #define T_BINARY_PROTOCOL_H -#include +#include "TProtocol.h" #include diff --git a/lib/cpp/src/protocol/TProtocol.h b/lib/cpp/src/protocol/TProtocol.h index 33a6eb77..aa67e9c7 100644 --- a/lib/cpp/src/protocol/TProtocol.h +++ b/lib/cpp/src/protocol/TProtocol.h @@ -29,8 +29,10 @@ struct TBuf; * the end of a sequence of fields. */ enum TType { - T_STOP = 1, + T_STOP = 0, + T_BOOL = 1, T_BYTE = 2, + T_U08 = 2, T_U16 = 3, T_I16 = 4, T_U32 = 5, @@ -38,10 +40,13 @@ enum TType { T_U64 = 7, T_I64 = 8, T_STRING = 9, + T_UTF7 = 9, T_STRUCT = 10, T_MAP = 11, T_SET = 12, - T_LIST = 13 + T_LIST = 13, + T_UTF8 = 14, + T_UTF16 = 15 }; /** diff --git a/lib/cpp/src/transport/TBufferedTransport.h b/lib/cpp/src/transport/TBufferedTransport.h index 922754ea..c94d926a 100644 --- a/lib/cpp/src/transport/TBufferedTransport.h +++ b/lib/cpp/src/transport/TBufferedTransport.h @@ -1,7 +1,7 @@ #ifndef T_BUFFERED_TRANSPORT_H #define T_BUFFERED_TRANSPORT_H -#include +#include "TTransport.h" #include #include diff --git a/lib/cpp/src/transport/TChunkedTransport.h b/lib/cpp/src/transport/TChunkedTransport.h index 0fe8d75e..c6312d05 100644 --- a/lib/cpp/src/transport/TChunkedTransport.h +++ b/lib/cpp/src/transport/TChunkedTransport.h @@ -1,7 +1,7 @@ #ifndef T_CHUNKED_TRANSPORT_H #define T_CHUNKED_TRANSPORT_H -#include +#include "TTransport.h" #include #include diff --git a/lib/cpp/src/transport/TNullTransport.h b/lib/cpp/src/transport/TNullTransport.h index 25221481..8bb5bd29 100644 --- a/lib/cpp/src/transport/TNullTransport.h +++ b/lib/cpp/src/transport/TNullTransport.h @@ -1,7 +1,7 @@ #ifndef T_NULL_TRANSPORT #define T_NULL_TRANSPORT -#include "transport/TTransport.h" +#include "TTransport.h" namespace facebook { namespace thrift { namespace transport { diff --git a/lib/cpp/src/transport/TServerSocket.cc b/lib/cpp/src/transport/TServerSocket.cc index 003ddec8..75bd504d 100644 --- a/lib/cpp/src/transport/TServerSocket.cc +++ b/lib/cpp/src/transport/TServerSocket.cc @@ -2,8 +2,8 @@ #include #include -#include "transport/TSocket.h" -#include "transport/TServerSocket.h" +#include "TSocket.h" +#include "TServerSocket.h" #include namespace facebook { namespace thrift { namespace transport { diff --git a/lib/cpp/src/transport/TServerSocket.h b/lib/cpp/src/transport/TServerSocket.h index 619a3669..a7af44b1 100644 --- a/lib/cpp/src/transport/TServerSocket.h +++ b/lib/cpp/src/transport/TServerSocket.h @@ -1,7 +1,7 @@ #ifndef T_SERVER_SOCKET_H #define T_SERVER_SOCKET_H -#include +#include "TServerTransport.h" #include namespace facebook { namespace thrift { namespace transport { diff --git a/lib/cpp/src/transport/TServerTransport.h b/lib/cpp/src/transport/TServerTransport.h index f51e88c9..390fa704 100644 --- a/lib/cpp/src/transport/TServerTransport.h +++ b/lib/cpp/src/transport/TServerTransport.h @@ -1,8 +1,8 @@ #ifndef T_SERVER_TRANSPORT_H #define T_SERVER_TRANSPORT_H -#include "transport/TTransport.h" -#include "transport/TTransportException.h" +#include "TTransport.h" +#include "TTransportException.h" #include namespace facebook { namespace thrift { namespace transport { diff --git a/lib/cpp/src/transport/TSocket.cc b/lib/cpp/src/transport/TSocket.cc index a1e0327a..eef76ef8 100644 --- a/lib/cpp/src/transport/TSocket.cc +++ b/lib/cpp/src/transport/TSocket.cc @@ -7,8 +7,8 @@ #include #include -#include "transport/TSocket.h" -#include "transport/TTransportException.h" +#include "TSocket.h" +#include "TTransportException.h" namespace facebook { namespace thrift { namespace transport { diff --git a/lib/cpp/src/transport/TSocket.h b/lib/cpp/src/transport/TSocket.h index 8a6fc8fc..bf90b63a 100644 --- a/lib/cpp/src/transport/TSocket.h +++ b/lib/cpp/src/transport/TSocket.h @@ -3,8 +3,8 @@ #include -#include "transport/TTransport.h" -#include "transport/TServerSocket.h" +#include "TTransport.h" +#include "TServerSocket.h" namespace facebook { namespace thrift { namespace transport { diff --git a/lib/cpp/src/transport/TTransport.h b/lib/cpp/src/transport/TTransport.h index e9366d3c..e5e40e48 100644 --- a/lib/cpp/src/transport/TTransport.h +++ b/lib/cpp/src/transport/TTransport.h @@ -1,8 +1,8 @@ #ifndef T_TRANSPORT_H #define T_TRANSPORT_H +#include "TTransportException.h" #include -#include "transport/TTransportException.h" namespace facebook { namespace thrift { namespace transport { -- 2.17.1