Updated Branches: refs/heads/master ed817d010 -> 4285ba29f
THRIFT-2014 Change C++ lib includes to use <namespace/> style throughout Patch: Randy Abernethy Project: http://git-wip-us.apache.org/repos/asf/thrift/repo Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/4285ba29 Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/4285ba29 Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/4285ba29 Branch: refs/heads/master Commit: 4285ba29f239edba628e9a025bacf1e73e6e8f1e Parents: ed817d0 Author: Roger Meier <[email protected]> Authored: Mon Jun 10 21:17:23 2013 +0200 Committer: Roger Meier <[email protected]> Committed: Mon Jun 10 21:17:23 2013 +0200 ---------------------------------------------------------------------- lib/cpp/src/thrift/TDispatchProcessor.h | 2 +- lib/cpp/src/thrift/Thrift.h | 4 ++-- lib/cpp/src/thrift/async/TAsyncDispatchProcessor.h | 2 +- lib/cpp/src/thrift/async/TAsyncProtocolProcessor.cpp | 2 +- lib/cpp/src/thrift/async/TAsyncProtocolProcessor.h | 4 ++-- lib/cpp/src/thrift/async/TEvhttpClientChannel.cpp | 2 +- lib/cpp/src/thrift/async/TEvhttpClientChannel.h | 2 +- lib/cpp/src/thrift/async/TEvhttpServer.cpp | 4 ++-- lib/cpp/src/thrift/concurrency/BoostMonitor.cpp | 6 +++--- lib/cpp/src/thrift/concurrency/BoostMutex.cpp | 4 ++-- lib/cpp/src/thrift/concurrency/BoostThreadFactory.cpp | 4 ++-- lib/cpp/src/thrift/concurrency/BoostThreadFactory.h | 2 +- lib/cpp/src/thrift/concurrency/Monitor.cpp | 6 +++--- lib/cpp/src/thrift/concurrency/Monitor.h | 4 ++-- lib/cpp/src/thrift/concurrency/Mutex.cpp | 4 ++-- lib/cpp/src/thrift/concurrency/PosixThreadFactory.cpp | 4 ++-- lib/cpp/src/thrift/concurrency/PosixThreadFactory.h | 2 +- lib/cpp/src/thrift/concurrency/StdMonitor.cpp | 6 +++--- lib/cpp/src/thrift/concurrency/StdMutex.cpp | 4 ++-- lib/cpp/src/thrift/concurrency/StdThreadFactory.cpp | 4 ++-- lib/cpp/src/thrift/concurrency/StdThreadFactory.h | 2 +- lib/cpp/src/thrift/concurrency/Thread.h | 2 +- lib/cpp/src/thrift/concurrency/ThreadManager.cpp | 8 ++++---- lib/cpp/src/thrift/concurrency/ThreadManager.h | 2 +- lib/cpp/src/thrift/concurrency/TimerManager.cpp | 6 +++--- lib/cpp/src/thrift/concurrency/TimerManager.h | 6 +++--- lib/cpp/src/thrift/concurrency/Util.cpp | 2 +- lib/cpp/src/thrift/processor/PeekProcessor.cpp | 2 +- lib/cpp/src/thrift/protocol/TBase64Utils.cpp | 2 +- lib/cpp/src/thrift/protocol/TBinaryProtocol.h | 6 +++--- lib/cpp/src/thrift/protocol/TBinaryProtocol.tcc | 2 +- lib/cpp/src/thrift/protocol/TCompactProtocol.h | 4 ++-- lib/cpp/src/thrift/protocol/TDebugProtocol.cpp | 2 +- lib/cpp/src/thrift/protocol/TDebugProtocol.h | 2 +- lib/cpp/src/thrift/protocol/TDenseProtocol.h | 2 +- lib/cpp/src/thrift/protocol/TJSONProtocol.cpp | 4 ++-- lib/cpp/src/thrift/protocol/TJSONProtocol.h | 2 +- lib/cpp/src/thrift/qt/TQTcpServer.cpp | 4 ++-- lib/cpp/src/thrift/server/TNonblockingServer.cpp | 2 +- lib/cpp/src/thrift/transport/TBufferTransports.h | 2 +- lib/cpp/src/thrift/transport/TFDTransport.h | 4 ++-- lib/cpp/src/thrift/transport/TFileTransport.cpp | 6 +++--- lib/cpp/src/thrift/transport/THttpTransport.h | 2 +- lib/cpp/src/thrift/transport/TPipe.cpp | 4 ++-- lib/cpp/src/thrift/transport/TPipe.h | 2 +- lib/cpp/src/thrift/transport/TPipeServer.cpp | 4 ++-- lib/cpp/src/thrift/transport/TPipeServer.h | 2 +- lib/cpp/src/thrift/transport/TSSLServerSocket.cpp | 4 ++-- lib/cpp/src/thrift/transport/TSSLServerSocket.h | 2 +- lib/cpp/src/thrift/transport/TSSLSocket.cpp | 4 ++-- lib/cpp/src/thrift/transport/TSSLSocket.h | 2 +- lib/cpp/src/thrift/transport/TServerSocket.cpp | 6 +++--- lib/cpp/src/thrift/transport/TServerSocket.h | 4 ++-- lib/cpp/src/thrift/transport/TServerTransport.h | 4 ++-- lib/cpp/src/thrift/transport/TSimpleFileTransport.cpp | 2 +- lib/cpp/src/thrift/transport/TSimpleFileTransport.h | 2 +- lib/cpp/src/thrift/transport/TSocket.cpp | 6 +++--- lib/cpp/src/thrift/transport/TSocket.h | 8 ++++---- lib/cpp/src/thrift/transport/TSocketPool.cpp | 2 +- lib/cpp/src/thrift/transport/TSocketPool.h | 2 +- lib/cpp/src/thrift/windows/GetTimeOfDay.cpp | 2 +- lib/cpp/src/thrift/windows/SocketPair.cpp | 2 +- lib/cpp/src/thrift/windows/TWinsockSingleton.cpp | 2 +- lib/cpp/src/thrift/windows/TWinsockSingleton.h | 2 +- lib/cpp/src/thrift/windows/WinFcntl.cpp | 2 +- lib/cpp/src/thrift/windows/WinFcntl.h | 2 ++ lib/cpp/src/thrift/windows/config.h | 10 +++++----- 67 files changed, 116 insertions(+), 114 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/thrift/blob/4285ba29/lib/cpp/src/thrift/TDispatchProcessor.h ---------------------------------------------------------------------- diff --git a/lib/cpp/src/thrift/TDispatchProcessor.h b/lib/cpp/src/thrift/TDispatchProcessor.h index f98751b..33ec22e 100644 --- a/lib/cpp/src/thrift/TDispatchProcessor.h +++ b/lib/cpp/src/thrift/TDispatchProcessor.h @@ -19,7 +19,7 @@ #ifndef _THRIFT_TDISPATCHPROCESSOR_H_ #define _THRIFT_TDISPATCHPROCESSOR_H_ 1 -#include "TProcessor.h" +#include <thrift/TProcessor.h> namespace apache { namespace thrift { http://git-wip-us.apache.org/repos/asf/thrift/blob/4285ba29/lib/cpp/src/thrift/Thrift.h ---------------------------------------------------------------------- diff --git a/lib/cpp/src/thrift/Thrift.h b/lib/cpp/src/thrift/Thrift.h index 8c22814..361ff6a 100644 --- a/lib/cpp/src/thrift/Thrift.h +++ b/lib/cpp/src/thrift/Thrift.h @@ -23,7 +23,7 @@ #ifdef HAVE_CONFIG_H #include "config.h" #endif -#include "transport/PlatformSocket.h" +#include <thrift/transport/PlatformSocket.h> #include <stdio.h> #include <assert.h> @@ -45,7 +45,7 @@ #include <boost/utility/enable_if.hpp> #include <boost/type_traits/is_convertible.hpp> -#include "TLogging.h" +#include <thrift/TLogging.h> /** * Helper macros to allow function overloading even when using http://git-wip-us.apache.org/repos/asf/thrift/blob/4285ba29/lib/cpp/src/thrift/async/TAsyncDispatchProcessor.h ---------------------------------------------------------------------- diff --git a/lib/cpp/src/thrift/async/TAsyncDispatchProcessor.h b/lib/cpp/src/thrift/async/TAsyncDispatchProcessor.h index 738f4b7..15b5bce 100644 --- a/lib/cpp/src/thrift/async/TAsyncDispatchProcessor.h +++ b/lib/cpp/src/thrift/async/TAsyncDispatchProcessor.h @@ -19,7 +19,7 @@ #ifndef _THRIFT_ASYNC_TASYNCDISPATCHPROCESSOR_H_ #define _THRIFT_ASYNC_TASYNCDISPATCHPROCESSOR_H_ 1 -#include "TAsyncProcessor.h" +#include <thrift/async/TAsyncProcessor.h> namespace apache { namespace thrift { namespace async { http://git-wip-us.apache.org/repos/asf/thrift/blob/4285ba29/lib/cpp/src/thrift/async/TAsyncProtocolProcessor.cpp ---------------------------------------------------------------------- diff --git a/lib/cpp/src/thrift/async/TAsyncProtocolProcessor.cpp b/lib/cpp/src/thrift/async/TAsyncProtocolProcessor.cpp index 61a3ff2..2096289 100644 --- a/lib/cpp/src/thrift/async/TAsyncProtocolProcessor.cpp +++ b/lib/cpp/src/thrift/async/TAsyncProtocolProcessor.cpp @@ -17,7 +17,7 @@ * under the License. */ -#include "TAsyncProtocolProcessor.h" +#include <thrift/async/TAsyncProtocolProcessor.h> using apache::thrift::transport::TBufferBase; using apache::thrift::protocol::TProtocol; http://git-wip-us.apache.org/repos/asf/thrift/blob/4285ba29/lib/cpp/src/thrift/async/TAsyncProtocolProcessor.h ---------------------------------------------------------------------- diff --git a/lib/cpp/src/thrift/async/TAsyncProtocolProcessor.h b/lib/cpp/src/thrift/async/TAsyncProtocolProcessor.h index f217168..840b4dd 100644 --- a/lib/cpp/src/thrift/async/TAsyncProtocolProcessor.h +++ b/lib/cpp/src/thrift/async/TAsyncProtocolProcessor.h @@ -20,8 +20,8 @@ #ifndef _THRIFT_TNAME_ME_H_ #define _THRIFT_TNAME_ME_H_ 1 -#include "TAsyncProcessor.h" -#include "TAsyncBufferProcessor.h" +#include <thrift/async/TAsyncProcessor.h> +#include <thrift/async/TAsyncBufferProcessor.h> #include <thrift/protocol/TProtocol.h> namespace apache { namespace thrift { namespace async { http://git-wip-us.apache.org/repos/asf/thrift/blob/4285ba29/lib/cpp/src/thrift/async/TEvhttpClientChannel.cpp ---------------------------------------------------------------------- diff --git a/lib/cpp/src/thrift/async/TEvhttpClientChannel.cpp b/lib/cpp/src/thrift/async/TEvhttpClientChannel.cpp index 0e74783..7ad7537 100644 --- a/lib/cpp/src/thrift/async/TEvhttpClientChannel.cpp +++ b/lib/cpp/src/thrift/async/TEvhttpClientChannel.cpp @@ -17,7 +17,7 @@ * under the License. */ -#include "TEvhttpClientChannel.h" +#include <thrift/async/TEvhttpClientChannel.h> #include <evhttp.h> #include <thrift/transport/TBufferTransports.h> #include <thrift/protocol/TProtocolException.h> http://git-wip-us.apache.org/repos/asf/thrift/blob/4285ba29/lib/cpp/src/thrift/async/TEvhttpClientChannel.h ---------------------------------------------------------------------- diff --git a/lib/cpp/src/thrift/async/TEvhttpClientChannel.h b/lib/cpp/src/thrift/async/TEvhttpClientChannel.h index d497edb..a7229e9 100644 --- a/lib/cpp/src/thrift/async/TEvhttpClientChannel.h +++ b/lib/cpp/src/thrift/async/TEvhttpClientChannel.h @@ -22,7 +22,7 @@ #include <string> #include <boost/shared_ptr.hpp> -#include "TAsyncChannel.h" +#include <thrift/async/TAsyncChannel.h> struct event_base; struct evhttp_connection; http://git-wip-us.apache.org/repos/asf/thrift/blob/4285ba29/lib/cpp/src/thrift/async/TEvhttpServer.cpp ---------------------------------------------------------------------- diff --git a/lib/cpp/src/thrift/async/TEvhttpServer.cpp b/lib/cpp/src/thrift/async/TEvhttpServer.cpp index 83fb5fa..fa8d782 100644 --- a/lib/cpp/src/thrift/async/TEvhttpServer.cpp +++ b/lib/cpp/src/thrift/async/TEvhttpServer.cpp @@ -17,8 +17,8 @@ * under the License. */ -#include "TEvhttpServer.h" -#include "TAsyncBufferProcessor.h" +#include <thrift/async/TEvhttpServer.h> +#include <thrift/async/TAsyncBufferProcessor.h> #include <thrift/transport/TBufferTransports.h> #include <evhttp.h> http://git-wip-us.apache.org/repos/asf/thrift/blob/4285ba29/lib/cpp/src/thrift/concurrency/BoostMonitor.cpp ---------------------------------------------------------------------- diff --git a/lib/cpp/src/thrift/concurrency/BoostMonitor.cpp b/lib/cpp/src/thrift/concurrency/BoostMonitor.cpp index 9487a2f..ad33ce5 100644 --- a/lib/cpp/src/thrift/concurrency/BoostMonitor.cpp +++ b/lib/cpp/src/thrift/concurrency/BoostMonitor.cpp @@ -20,9 +20,9 @@ #ifdef HAVE_CONFIG_H #include <config.h> #endif -#include "Monitor.h" -#include "Exception.h" -#include "Util.h" +#include <thrift/concurrency/Monitor.h> +#include <thrift/concurrency/Exception.h> +#include <thrift/concurrency/Util.h> #include <thrift/transport/PlatformSocket.h> #include <assert.h> http://git-wip-us.apache.org/repos/asf/thrift/blob/4285ba29/lib/cpp/src/thrift/concurrency/BoostMutex.cpp ---------------------------------------------------------------------- diff --git a/lib/cpp/src/thrift/concurrency/BoostMutex.cpp b/lib/cpp/src/thrift/concurrency/BoostMutex.cpp index a7b5c37..debe1b0 100644 --- a/lib/cpp/src/thrift/concurrency/BoostMutex.cpp +++ b/lib/cpp/src/thrift/concurrency/BoostMutex.cpp @@ -20,8 +20,8 @@ #ifdef HAVE_CONFIG_H #include <config.h> #endif -#include "Mutex.h" -#include "Util.h" +#include <thrift/concurrency/Mutex.h> +#include <thrift/concurrency/Util.h> #include <cassert> #include <boost/thread.hpp> http://git-wip-us.apache.org/repos/asf/thrift/blob/4285ba29/lib/cpp/src/thrift/concurrency/BoostThreadFactory.cpp ---------------------------------------------------------------------- diff --git a/lib/cpp/src/thrift/concurrency/BoostThreadFactory.cpp b/lib/cpp/src/thrift/concurrency/BoostThreadFactory.cpp index b473d9b..784ff8e 100644 --- a/lib/cpp/src/thrift/concurrency/BoostThreadFactory.cpp +++ b/lib/cpp/src/thrift/concurrency/BoostThreadFactory.cpp @@ -20,8 +20,8 @@ #ifdef HAVE_CONFIG_H #include <config.h> #endif -#include "BoostThreadFactory.h" -#include "Exception.h" +#include <thrift/concurrency/BoostThreadFactory.h> +#include <thrift/concurrency/Exception.h> #include <cassert> http://git-wip-us.apache.org/repos/asf/thrift/blob/4285ba29/lib/cpp/src/thrift/concurrency/BoostThreadFactory.h ---------------------------------------------------------------------- diff --git a/lib/cpp/src/thrift/concurrency/BoostThreadFactory.h b/lib/cpp/src/thrift/concurrency/BoostThreadFactory.h index a466705..6a236d3 100644 --- a/lib/cpp/src/thrift/concurrency/BoostThreadFactory.h +++ b/lib/cpp/src/thrift/concurrency/BoostThreadFactory.h @@ -20,7 +20,7 @@ #ifndef _THRIFT_CONCURRENCY_BOOSTTHREADFACTORY_H_ #define _THRIFT_CONCURRENCY_BOOSTTHREADFACTORY_H_ 1 -#include "Thread.h" +#include <thrift/concurrency/Thread.h> #include <boost/shared_ptr.hpp> http://git-wip-us.apache.org/repos/asf/thrift/blob/4285ba29/lib/cpp/src/thrift/concurrency/Monitor.cpp ---------------------------------------------------------------------- diff --git a/lib/cpp/src/thrift/concurrency/Monitor.cpp b/lib/cpp/src/thrift/concurrency/Monitor.cpp index 965029b..d94b2a4 100644 --- a/lib/cpp/src/thrift/concurrency/Monitor.cpp +++ b/lib/cpp/src/thrift/concurrency/Monitor.cpp @@ -17,9 +17,9 @@ * under the License. */ -#include "Monitor.h" -#include "Exception.h" -#include "Util.h" +#include <thrift/concurrency/Monitor.h> +#include <thrift/concurrency/Exception.h> +#include <thrift/concurrency/Util.h> #include <thrift/transport/PlatformSocket.h> #include <boost/scoped_ptr.hpp> http://git-wip-us.apache.org/repos/asf/thrift/blob/4285ba29/lib/cpp/src/thrift/concurrency/Monitor.h ---------------------------------------------------------------------- diff --git a/lib/cpp/src/thrift/concurrency/Monitor.h b/lib/cpp/src/thrift/concurrency/Monitor.h index 185e246..811e0e1 100644 --- a/lib/cpp/src/thrift/concurrency/Monitor.h +++ b/lib/cpp/src/thrift/concurrency/Monitor.h @@ -20,8 +20,8 @@ #ifndef _THRIFT_CONCURRENCY_MONITOR_H_ #define _THRIFT_CONCURRENCY_MONITOR_H_ 1 -#include "Exception.h" -#include "Mutex.h" +#include <thrift/concurrency/Exception.h> +#include <thrift/concurrency/Mutex.h> #include <boost/utility.hpp> http://git-wip-us.apache.org/repos/asf/thrift/blob/4285ba29/lib/cpp/src/thrift/concurrency/Mutex.cpp ---------------------------------------------------------------------- diff --git a/lib/cpp/src/thrift/concurrency/Mutex.cpp b/lib/cpp/src/thrift/concurrency/Mutex.cpp index 5ca4b0f..5a4bb54 100644 --- a/lib/cpp/src/thrift/concurrency/Mutex.cpp +++ b/lib/cpp/src/thrift/concurrency/Mutex.cpp @@ -21,8 +21,8 @@ #include <config.h> #endif #include <thrift/Thrift.h> -#include "Mutex.h" -#include "Util.h" +#include <thrift/concurrency/Mutex.h> +#include <thrift/concurrency/Util.h> #include <assert.h> #ifdef HAVE_PTHREAD_H http://git-wip-us.apache.org/repos/asf/thrift/blob/4285ba29/lib/cpp/src/thrift/concurrency/PosixThreadFactory.cpp ---------------------------------------------------------------------- diff --git a/lib/cpp/src/thrift/concurrency/PosixThreadFactory.cpp b/lib/cpp/src/thrift/concurrency/PosixThreadFactory.cpp index 2019353..39dd886 100644 --- a/lib/cpp/src/thrift/concurrency/PosixThreadFactory.cpp +++ b/lib/cpp/src/thrift/concurrency/PosixThreadFactory.cpp @@ -20,8 +20,8 @@ #ifdef HAVE_CONFIG_H #include <config.h> #endif -#include "PosixThreadFactory.h" -#include "Exception.h" +#include <thrift/concurrency/PosixThreadFactory.h> +#include <thrift/concurrency/Exception.h> #if GOOGLE_PERFTOOLS_REGISTER_THREAD # include <google/profiler.h> http://git-wip-us.apache.org/repos/asf/thrift/blob/4285ba29/lib/cpp/src/thrift/concurrency/PosixThreadFactory.h ---------------------------------------------------------------------- diff --git a/lib/cpp/src/thrift/concurrency/PosixThreadFactory.h b/lib/cpp/src/thrift/concurrency/PosixThreadFactory.h index d6d83a3..72368ca 100644 --- a/lib/cpp/src/thrift/concurrency/PosixThreadFactory.h +++ b/lib/cpp/src/thrift/concurrency/PosixThreadFactory.h @@ -20,7 +20,7 @@ #ifndef _THRIFT_CONCURRENCY_POSIXTHREADFACTORY_H_ #define _THRIFT_CONCURRENCY_POSIXTHREADFACTORY_H_ 1 -#include "Thread.h" +#include <thrift/concurrency/Thread.h> #include <boost/shared_ptr.hpp> http://git-wip-us.apache.org/repos/asf/thrift/blob/4285ba29/lib/cpp/src/thrift/concurrency/StdMonitor.cpp ---------------------------------------------------------------------- diff --git a/lib/cpp/src/thrift/concurrency/StdMonitor.cpp b/lib/cpp/src/thrift/concurrency/StdMonitor.cpp index af602f1..84cad66 100644 --- a/lib/cpp/src/thrift/concurrency/StdMonitor.cpp +++ b/lib/cpp/src/thrift/concurrency/StdMonitor.cpp @@ -20,9 +20,9 @@ #ifdef HAVE_CONFIG_H #include <config.h> #endif -#include "Monitor.h" -#include "Exception.h" -#include "Util.h" +#include <thrift/concurrency/Monitor.h> +#include <thrift/concurrency/Exception.h> +#include <thrift/concurrency/Util.h> #include <thrift/transport/PlatformSocket.h> #include <assert.h> http://git-wip-us.apache.org/repos/asf/thrift/blob/4285ba29/lib/cpp/src/thrift/concurrency/StdMutex.cpp ---------------------------------------------------------------------- diff --git a/lib/cpp/src/thrift/concurrency/StdMutex.cpp b/lib/cpp/src/thrift/concurrency/StdMutex.cpp index 584a581..82a495f 100644 --- a/lib/cpp/src/thrift/concurrency/StdMutex.cpp +++ b/lib/cpp/src/thrift/concurrency/StdMutex.cpp @@ -20,8 +20,8 @@ #ifdef HAVE_CONFIG_H #include <config.h> #endif -#include "Mutex.h" -#include "Util.h" +#include <thrift/concurrency/Mutex.h> +#include <thrift/concurrency/Util.h> #include <cassert> #include <chrono> http://git-wip-us.apache.org/repos/asf/thrift/blob/4285ba29/lib/cpp/src/thrift/concurrency/StdThreadFactory.cpp ---------------------------------------------------------------------- diff --git a/lib/cpp/src/thrift/concurrency/StdThreadFactory.cpp b/lib/cpp/src/thrift/concurrency/StdThreadFactory.cpp index a521f09..443771d 100644 --- a/lib/cpp/src/thrift/concurrency/StdThreadFactory.cpp +++ b/lib/cpp/src/thrift/concurrency/StdThreadFactory.cpp @@ -20,8 +20,8 @@ #ifdef HAVE_CONFIG_H #include <config.h> #endif -#include "StdThreadFactory.h" -#include "Exception.h" +#include <thrift/concurrency/StdThreadFactory.h> +#include <thrift/concurrency/Exception.h> #include <cassert> http://git-wip-us.apache.org/repos/asf/thrift/blob/4285ba29/lib/cpp/src/thrift/concurrency/StdThreadFactory.h ---------------------------------------------------------------------- diff --git a/lib/cpp/src/thrift/concurrency/StdThreadFactory.h b/lib/cpp/src/thrift/concurrency/StdThreadFactory.h index c300e0d..307f970 100644 --- a/lib/cpp/src/thrift/concurrency/StdThreadFactory.h +++ b/lib/cpp/src/thrift/concurrency/StdThreadFactory.h @@ -20,7 +20,7 @@ #ifndef _THRIFT_CONCURRENCY_STDTHREADFACTORY_H_ #define _THRIFT_CONCURRENCY_STDTHREADFACTORY_H_ 1 -#include "Thread.h" +#include <thrift/concurrency/Thread.h> #include <boost/shared_ptr.hpp> http://git-wip-us.apache.org/repos/asf/thrift/blob/4285ba29/lib/cpp/src/thrift/concurrency/Thread.h ---------------------------------------------------------------------- diff --git a/lib/cpp/src/thrift/concurrency/Thread.h b/lib/cpp/src/thrift/concurrency/Thread.h index 6be7d1d..894f035 100755 --- a/lib/cpp/src/thrift/concurrency/Thread.h +++ b/lib/cpp/src/thrift/concurrency/Thread.h @@ -25,7 +25,7 @@ #include <boost/weak_ptr.hpp> #ifdef HAVE_CONFIG_H -#include <config.h> +#include "config.h" #endif #if USE_BOOST_THREAD http://git-wip-us.apache.org/repos/asf/thrift/blob/4285ba29/lib/cpp/src/thrift/concurrency/ThreadManager.cpp ---------------------------------------------------------------------- diff --git a/lib/cpp/src/thrift/concurrency/ThreadManager.cpp b/lib/cpp/src/thrift/concurrency/ThreadManager.cpp index b756bf1..eb3bc64 100644 --- a/lib/cpp/src/thrift/concurrency/ThreadManager.cpp +++ b/lib/cpp/src/thrift/concurrency/ThreadManager.cpp @@ -21,10 +21,10 @@ #include <config.h> #endif -#include "ThreadManager.h" -#include "Exception.h" -#include "Monitor.h" -#include "Util.h" +#include <thrift/concurrency/ThreadManager.h> +#include <thrift/concurrency/Exception.h> +#include <thrift/concurrency/Monitor.h> +#include <thrift/concurrency/Util.h> #include <boost/shared_ptr.hpp> http://git-wip-us.apache.org/repos/asf/thrift/blob/4285ba29/lib/cpp/src/thrift/concurrency/ThreadManager.h ---------------------------------------------------------------------- diff --git a/lib/cpp/src/thrift/concurrency/ThreadManager.h b/lib/cpp/src/thrift/concurrency/ThreadManager.h index 41866bc..de45d56 100644 --- a/lib/cpp/src/thrift/concurrency/ThreadManager.h +++ b/lib/cpp/src/thrift/concurrency/ThreadManager.h @@ -23,7 +23,7 @@ #include <boost/shared_ptr.hpp> #include <thrift/cxxfunctional.h> #include <sys/types.h> -#include "Thread.h" +#include <thrift/concurrency/Thread.h> namespace apache { namespace thrift { namespace concurrency { http://git-wip-us.apache.org/repos/asf/thrift/blob/4285ba29/lib/cpp/src/thrift/concurrency/TimerManager.cpp ---------------------------------------------------------------------- diff --git a/lib/cpp/src/thrift/concurrency/TimerManager.cpp b/lib/cpp/src/thrift/concurrency/TimerManager.cpp index 98a4b28..b47c697 100644 --- a/lib/cpp/src/thrift/concurrency/TimerManager.cpp +++ b/lib/cpp/src/thrift/concurrency/TimerManager.cpp @@ -17,9 +17,9 @@ * under the License. */ -#include "TimerManager.h" -#include "Exception.h" -#include "Util.h" +#include <thrift/concurrency/TimerManager.h> +#include <thrift/concurrency/Exception.h> +#include <thrift/concurrency/Util.h> #include <assert.h> #include <iostream> http://git-wip-us.apache.org/repos/asf/thrift/blob/4285ba29/lib/cpp/src/thrift/concurrency/TimerManager.h ---------------------------------------------------------------------- diff --git a/lib/cpp/src/thrift/concurrency/TimerManager.h b/lib/cpp/src/thrift/concurrency/TimerManager.h index fdda263..d8200cb 100644 --- a/lib/cpp/src/thrift/concurrency/TimerManager.h +++ b/lib/cpp/src/thrift/concurrency/TimerManager.h @@ -20,9 +20,9 @@ #ifndef _THRIFT_CONCURRENCY_TIMERMANAGER_H_ #define _THRIFT_CONCURRENCY_TIMERMANAGER_H_ 1 -#include "Exception.h" -#include "Monitor.h" -#include "Thread.h" +#include <thrift/concurrency/Exception.h> +#include <thrift/concurrency/Monitor.h> +#include <thrift/concurrency/Thread.h> #include <boost/shared_ptr.hpp> #include <map> http://git-wip-us.apache.org/repos/asf/thrift/blob/4285ba29/lib/cpp/src/thrift/concurrency/Util.cpp ---------------------------------------------------------------------- diff --git a/lib/cpp/src/thrift/concurrency/Util.cpp b/lib/cpp/src/thrift/concurrency/Util.cpp index 1f291da..868f52f 100644 --- a/lib/cpp/src/thrift/concurrency/Util.cpp +++ b/lib/cpp/src/thrift/concurrency/Util.cpp @@ -21,7 +21,7 @@ #include <config.h> #endif #include <thrift/Thrift.h> -#include "Util.h" +#include <thrift/concurrency/Util.h> #if defined(HAVE_SYS_TIME_H) #include <sys/time.h> http://git-wip-us.apache.org/repos/asf/thrift/blob/4285ba29/lib/cpp/src/thrift/processor/PeekProcessor.cpp ---------------------------------------------------------------------- diff --git a/lib/cpp/src/thrift/processor/PeekProcessor.cpp b/lib/cpp/src/thrift/processor/PeekProcessor.cpp index 9a9b672..bfc4ac7 100644 --- a/lib/cpp/src/thrift/processor/PeekProcessor.cpp +++ b/lib/cpp/src/thrift/processor/PeekProcessor.cpp @@ -17,7 +17,7 @@ * under the License. */ -#include "PeekProcessor.h" +#include <thrift/processor/PeekProcessor.h> using namespace apache::thrift::transport; using namespace apache::thrift::protocol; http://git-wip-us.apache.org/repos/asf/thrift/blob/4285ba29/lib/cpp/src/thrift/protocol/TBase64Utils.cpp ---------------------------------------------------------------------- diff --git a/lib/cpp/src/thrift/protocol/TBase64Utils.cpp b/lib/cpp/src/thrift/protocol/TBase64Utils.cpp index 452985c..cd343ed 100644 --- a/lib/cpp/src/thrift/protocol/TBase64Utils.cpp +++ b/lib/cpp/src/thrift/protocol/TBase64Utils.cpp @@ -17,7 +17,7 @@ * under the License. */ -#include "TBase64Utils.h" +#include <thrift/protocol/TBase64Utils.h> #include <boost/static_assert.hpp> http://git-wip-us.apache.org/repos/asf/thrift/blob/4285ba29/lib/cpp/src/thrift/protocol/TBinaryProtocol.h ---------------------------------------------------------------------- diff --git a/lib/cpp/src/thrift/protocol/TBinaryProtocol.h b/lib/cpp/src/thrift/protocol/TBinaryProtocol.h index b762ad4..a5b19e5 100644 --- a/lib/cpp/src/thrift/protocol/TBinaryProtocol.h +++ b/lib/cpp/src/thrift/protocol/TBinaryProtocol.h @@ -20,8 +20,8 @@ #ifndef _THRIFT_PROTOCOL_TBINARYPROTOCOL_H_ #define _THRIFT_PROTOCOL_TBINARYPROTOCOL_H_ 1 -#include "TProtocol.h" -#include "TVirtualProtocol.h" +#include <thrift/protocol/TProtocol.h> +#include <thrift/protocol/TVirtualProtocol.h> #include <boost/shared_ptr.hpp> @@ -277,6 +277,6 @@ typedef TBinaryProtocolFactoryT<TTransport> TBinaryProtocolFactory; }}} // apache::thrift::protocol -#include "TBinaryProtocol.tcc" +#include <thrift/protocol/TBinaryProtocol.tcc> #endif // #ifndef _THRIFT_PROTOCOL_TBINARYPROTOCOL_H_ http://git-wip-us.apache.org/repos/asf/thrift/blob/4285ba29/lib/cpp/src/thrift/protocol/TBinaryProtocol.tcc ---------------------------------------------------------------------- diff --git a/lib/cpp/src/thrift/protocol/TBinaryProtocol.tcc b/lib/cpp/src/thrift/protocol/TBinaryProtocol.tcc index 294c831..54d79b7 100644 --- a/lib/cpp/src/thrift/protocol/TBinaryProtocol.tcc +++ b/lib/cpp/src/thrift/protocol/TBinaryProtocol.tcc @@ -20,7 +20,7 @@ #ifndef _THRIFT_PROTOCOL_TBINARYPROTOCOL_TCC_ #define _THRIFT_PROTOCOL_TBINARYPROTOCOL_TCC_ 1 -#include "TBinaryProtocol.h" +#include <thrift/protocol/TBinaryProtocol.h> #include <limits> http://git-wip-us.apache.org/repos/asf/thrift/blob/4285ba29/lib/cpp/src/thrift/protocol/TCompactProtocol.h ---------------------------------------------------------------------- diff --git a/lib/cpp/src/thrift/protocol/TCompactProtocol.h b/lib/cpp/src/thrift/protocol/TCompactProtocol.h index 0e78c36..d6da745 100644 --- a/lib/cpp/src/thrift/protocol/TCompactProtocol.h +++ b/lib/cpp/src/thrift/protocol/TCompactProtocol.h @@ -20,7 +20,7 @@ #ifndef _THRIFT_PROTOCOL_TCOMPACTPROTOCOL_H_ #define _THRIFT_PROTOCOL_TCOMPACTPROTOCOL_H_ 1 -#include "TVirtualProtocol.h" +#include <thrift/protocol/TVirtualProtocol.h> #include <stack> #include <boost/shared_ptr.hpp> @@ -284,6 +284,6 @@ typedef TCompactProtocolFactoryT<TTransport> TCompactProtocolFactory; }}} // apache::thrift::protocol -#include "TCompactProtocol.tcc" +#include <thrift/protocol/TCompactProtocol.tcc> #endif http://git-wip-us.apache.org/repos/asf/thrift/blob/4285ba29/lib/cpp/src/thrift/protocol/TDebugProtocol.cpp ---------------------------------------------------------------------- diff --git a/lib/cpp/src/thrift/protocol/TDebugProtocol.cpp b/lib/cpp/src/thrift/protocol/TDebugProtocol.cpp index 9f55245..63ea14d 100644 --- a/lib/cpp/src/thrift/protocol/TDebugProtocol.cpp +++ b/lib/cpp/src/thrift/protocol/TDebugProtocol.cpp @@ -17,7 +17,7 @@ * under the License. */ -#include "TDebugProtocol.h" +#include <thrift/protocol/TDebugProtocol.h> #include <cassert> #include <cctype> http://git-wip-us.apache.org/repos/asf/thrift/blob/4285ba29/lib/cpp/src/thrift/protocol/TDebugProtocol.h ---------------------------------------------------------------------- diff --git a/lib/cpp/src/thrift/protocol/TDebugProtocol.h b/lib/cpp/src/thrift/protocol/TDebugProtocol.h index f64928e..f85e691 100644 --- a/lib/cpp/src/thrift/protocol/TDebugProtocol.h +++ b/lib/cpp/src/thrift/protocol/TDebugProtocol.h @@ -20,7 +20,7 @@ #ifndef _THRIFT_PROTOCOL_TDEBUGPROTOCOL_H_ #define _THRIFT_PROTOCOL_TDEBUGPROTOCOL_H_ 1 -#include "TVirtualProtocol.h" +#include <thrift/protocol/TVirtualProtocol.h> #include <boost/shared_ptr.hpp> http://git-wip-us.apache.org/repos/asf/thrift/blob/4285ba29/lib/cpp/src/thrift/protocol/TDenseProtocol.h ---------------------------------------------------------------------- diff --git a/lib/cpp/src/thrift/protocol/TDenseProtocol.h b/lib/cpp/src/thrift/protocol/TDenseProtocol.h index fc25cb7..4808d79 100644 --- a/lib/cpp/src/thrift/protocol/TDenseProtocol.h +++ b/lib/cpp/src/thrift/protocol/TDenseProtocol.h @@ -20,7 +20,7 @@ #ifndef _THRIFT_PROTOCOL_TDENSEPROTOCOL_H_ #define _THRIFT_PROTOCOL_TDENSEPROTOCOL_H_ 1 -#include "TBinaryProtocol.h" +#include <thrift/protocol/TBinaryProtocol.h> namespace apache { namespace thrift { namespace protocol { http://git-wip-us.apache.org/repos/asf/thrift/blob/4285ba29/lib/cpp/src/thrift/protocol/TJSONProtocol.cpp ---------------------------------------------------------------------- diff --git a/lib/cpp/src/thrift/protocol/TJSONProtocol.cpp b/lib/cpp/src/thrift/protocol/TJSONProtocol.cpp index 0951876..a0cc8e2 100644 --- a/lib/cpp/src/thrift/protocol/TJSONProtocol.cpp +++ b/lib/cpp/src/thrift/protocol/TJSONProtocol.cpp @@ -17,11 +17,11 @@ * under the License. */ -#include "TJSONProtocol.h" +#include <thrift/protocol/TJSONProtocol.h> #include <math.h> #include <boost/lexical_cast.hpp> -#include "TBase64Utils.h" +#include <thrift/protocol/TBase64Utils.h> #include <thrift/transport/TTransportException.h> using namespace apache::thrift::transport; http://git-wip-us.apache.org/repos/asf/thrift/blob/4285ba29/lib/cpp/src/thrift/protocol/TJSONProtocol.h ---------------------------------------------------------------------- diff --git a/lib/cpp/src/thrift/protocol/TJSONProtocol.h b/lib/cpp/src/thrift/protocol/TJSONProtocol.h index 0a6f09c..edfc744 100644 --- a/lib/cpp/src/thrift/protocol/TJSONProtocol.h +++ b/lib/cpp/src/thrift/protocol/TJSONProtocol.h @@ -20,7 +20,7 @@ #ifndef _THRIFT_PROTOCOL_TJSONPROTOCOL_H_ #define _THRIFT_PROTOCOL_TJSONPROTOCOL_H_ 1 -#include "TVirtualProtocol.h" +#include <thrift/protocol/TVirtualProtocol.h> #include <stack> http://git-wip-us.apache.org/repos/asf/thrift/blob/4285ba29/lib/cpp/src/thrift/qt/TQTcpServer.cpp ---------------------------------------------------------------------- diff --git a/lib/cpp/src/thrift/qt/TQTcpServer.cpp b/lib/cpp/src/thrift/qt/TQTcpServer.cpp index 2468199..79a8c59 100644 --- a/lib/cpp/src/thrift/qt/TQTcpServer.cpp +++ b/lib/cpp/src/thrift/qt/TQTcpServer.cpp @@ -17,8 +17,8 @@ * under the License. */ -#include "TQTcpServer.h" -#include "TQIODeviceTransport.h" +#include <thrift/qt/TQTcpServer.h> +#include <thrift/qt/TQIODeviceTransport.h> #include <QTcpSocket> http://git-wip-us.apache.org/repos/asf/thrift/blob/4285ba29/lib/cpp/src/thrift/server/TNonblockingServer.cpp ---------------------------------------------------------------------- diff --git a/lib/cpp/src/thrift/server/TNonblockingServer.cpp b/lib/cpp/src/thrift/server/TNonblockingServer.cpp index 3277f5c..331198b 100644 --- a/lib/cpp/src/thrift/server/TNonblockingServer.cpp +++ b/lib/cpp/src/thrift/server/TNonblockingServer.cpp @@ -23,7 +23,7 @@ #include <config.h> #endif -#include "TNonblockingServer.h" +#include <thrift/server/TNonblockingServer.h> #include <thrift/concurrency/Exception.h> #include <thrift/transport/TSocket.h> #include <thrift/concurrency/PlatformThreadFactory.h> http://git-wip-us.apache.org/repos/asf/thrift/blob/4285ba29/lib/cpp/src/thrift/transport/TBufferTransports.h ---------------------------------------------------------------------- diff --git a/lib/cpp/src/thrift/transport/TBufferTransports.h b/lib/cpp/src/thrift/transport/TBufferTransports.h index c135229..cd6ecea 100644 --- a/lib/cpp/src/thrift/transport/TBufferTransports.h +++ b/lib/cpp/src/thrift/transport/TBufferTransports.h @@ -21,7 +21,7 @@ #define _THRIFT_TRANSPORT_TBUFFERTRANSPORTS_H_ 1 #include <cstring> -#include "boost/scoped_array.hpp" +#include <boost/scoped_array.hpp> #include <thrift/transport/TTransport.h> #include <thrift/transport/TVirtualTransport.h> http://git-wip-us.apache.org/repos/asf/thrift/blob/4285ba29/lib/cpp/src/thrift/transport/TFDTransport.h ---------------------------------------------------------------------- diff --git a/lib/cpp/src/thrift/transport/TFDTransport.h b/lib/cpp/src/thrift/transport/TFDTransport.h index 3ebad5c..cc4f9c1 100644 --- a/lib/cpp/src/thrift/transport/TFDTransport.h +++ b/lib/cpp/src/thrift/transport/TFDTransport.h @@ -25,8 +25,8 @@ #include <sys/time.h> #endif -#include "TTransport.h" -#include "TVirtualTransport.h" +#include <thrift/transport/TTransport.h> +#include <thrift/transport/TVirtualTransport.h> namespace apache { namespace thrift { namespace transport { http://git-wip-us.apache.org/repos/asf/thrift/blob/4285ba29/lib/cpp/src/thrift/transport/TFileTransport.cpp ---------------------------------------------------------------------- diff --git a/lib/cpp/src/thrift/transport/TFileTransport.cpp b/lib/cpp/src/thrift/transport/TFileTransport.cpp index 137e47d..258a18c 100644 --- a/lib/cpp/src/thrift/transport/TFileTransport.cpp +++ b/lib/cpp/src/thrift/transport/TFileTransport.cpp @@ -21,9 +21,9 @@ #include "config.h" #endif -#include "TFileTransport.h" -#include "TTransportUtils.h" -#include "PlatformSocket.h" +#include <thrift/transport/TFileTransport.h> +#include <thrift/transport/TTransportUtils.h> +#include <thrift/transport/PlatformSocket.h> #include <thrift/concurrency/FunctionRunner.h> #ifdef HAVE_SYS_TIME_H http://git-wip-us.apache.org/repos/asf/thrift/blob/4285ba29/lib/cpp/src/thrift/transport/THttpTransport.h ---------------------------------------------------------------------- diff --git a/lib/cpp/src/thrift/transport/THttpTransport.h b/lib/cpp/src/thrift/transport/THttpTransport.h index 9997c93..a2e8834 100644 --- a/lib/cpp/src/thrift/transport/THttpTransport.h +++ b/lib/cpp/src/thrift/transport/THttpTransport.h @@ -21,7 +21,7 @@ #define _THRIFT_TRANSPORT_THTTPTRANSPORT_H_ 1 #include <thrift/transport/TBufferTransports.h> -#include "TVirtualTransport.h" +#include <thrift/transport/TVirtualTransport.h> namespace apache { namespace thrift { namespace transport { http://git-wip-us.apache.org/repos/asf/thrift/blob/4285ba29/lib/cpp/src/thrift/transport/TPipe.cpp ---------------------------------------------------------------------- diff --git a/lib/cpp/src/thrift/transport/TPipe.cpp b/lib/cpp/src/thrift/transport/TPipe.cpp index 0b5080b..92e2912 100644 --- a/lib/cpp/src/thrift/transport/TPipe.cpp +++ b/lib/cpp/src/thrift/transport/TPipe.cpp @@ -17,8 +17,8 @@ * under the License. */ -#include "TTransportException.h" -#include "TPipe.h" +#include <thrift/transport/TTransportException.h> +#include <thrift/transport/TPipe.h> namespace apache { namespace thrift { namespace transport { http://git-wip-us.apache.org/repos/asf/thrift/blob/4285ba29/lib/cpp/src/thrift/transport/TPipe.h ---------------------------------------------------------------------- diff --git a/lib/cpp/src/thrift/transport/TPipe.h b/lib/cpp/src/thrift/transport/TPipe.h index 7742644..3c1755b 100644 --- a/lib/cpp/src/thrift/transport/TPipe.h +++ b/lib/cpp/src/thrift/transport/TPipe.h @@ -23,7 +23,7 @@ #include <thrift/transport/TTransport.h> #include <thrift/transport/TVirtualTransport.h> #ifndef _WIN32 -# include "TSocket.h" +# include <thrift/transport/TSocket.h> #endif namespace apache { namespace thrift { namespace transport { http://git-wip-us.apache.org/repos/asf/thrift/blob/4285ba29/lib/cpp/src/thrift/transport/TPipeServer.cpp ---------------------------------------------------------------------- diff --git a/lib/cpp/src/thrift/transport/TPipeServer.cpp b/lib/cpp/src/thrift/transport/TPipeServer.cpp index b11d22f..9c3b51b 100644 --- a/lib/cpp/src/thrift/transport/TPipeServer.cpp +++ b/lib/cpp/src/thrift/transport/TPipeServer.cpp @@ -22,8 +22,8 @@ #endif #include <cstring> -#include "TPipe.h" -#include "TPipeServer.h" +#include <thrift/transport/TPipe.h> +#include <thrift/transport/TPipeServer.h> #include <boost/shared_ptr.hpp> #ifdef _WIN32 # include <AccCtrl.h> http://git-wip-us.apache.org/repos/asf/thrift/blob/4285ba29/lib/cpp/src/thrift/transport/TPipeServer.h ---------------------------------------------------------------------- diff --git a/lib/cpp/src/thrift/transport/TPipeServer.h b/lib/cpp/src/thrift/transport/TPipeServer.h index 4c211a0..88a8b6b 100755 --- a/lib/cpp/src/thrift/transport/TPipeServer.h +++ b/lib/cpp/src/thrift/transport/TPipeServer.h @@ -20,7 +20,7 @@ #ifndef _THRIFT_TRANSPORT_TSERVERWINPIPES_H_ #define _THRIFT_TRANSPORT_TSERVERWINPIPES_H_ 1 -#include "TServerTransport.h" +#include <thrift/transport/TServerTransport.h> #include <boost/shared_ptr.hpp> #ifndef _WIN32 # include "TServerSocket.h" http://git-wip-us.apache.org/repos/asf/thrift/blob/4285ba29/lib/cpp/src/thrift/transport/TSSLServerSocket.cpp ---------------------------------------------------------------------- diff --git a/lib/cpp/src/thrift/transport/TSSLServerSocket.cpp b/lib/cpp/src/thrift/transport/TSSLServerSocket.cpp index 8e06f30..4689e4a 100644 --- a/lib/cpp/src/thrift/transport/TSSLServerSocket.cpp +++ b/lib/cpp/src/thrift/transport/TSSLServerSocket.cpp @@ -17,8 +17,8 @@ * under the License. */ -#include "TSSLServerSocket.h" -#include "TSSLSocket.h" +#include <thrift/transport/TSSLServerSocket.h> +#include <thrift/transport/TSSLSocket.h> namespace apache { namespace thrift { namespace transport { http://git-wip-us.apache.org/repos/asf/thrift/blob/4285ba29/lib/cpp/src/thrift/transport/TSSLServerSocket.h ---------------------------------------------------------------------- diff --git a/lib/cpp/src/thrift/transport/TSSLServerSocket.h b/lib/cpp/src/thrift/transport/TSSLServerSocket.h index a4e659d..6d8e657 100644 --- a/lib/cpp/src/thrift/transport/TSSLServerSocket.h +++ b/lib/cpp/src/thrift/transport/TSSLServerSocket.h @@ -21,7 +21,7 @@ #define _THRIFT_TRANSPORT_TSSLSERVERSOCKET_H_ 1 #include <boost/shared_ptr.hpp> -#include "TServerSocket.h" +#include <thrift/transport/TServerSocket.h> namespace apache { namespace thrift { namespace transport { http://git-wip-us.apache.org/repos/asf/thrift/blob/4285ba29/lib/cpp/src/thrift/transport/TSSLSocket.cpp ---------------------------------------------------------------------- diff --git a/lib/cpp/src/thrift/transport/TSSLSocket.cpp b/lib/cpp/src/thrift/transport/TSSLSocket.cpp index bf29c41..1af8aa7 100644 --- a/lib/cpp/src/thrift/transport/TSSLSocket.cpp +++ b/lib/cpp/src/thrift/transport/TSSLSocket.cpp @@ -36,8 +36,8 @@ #include <openssl/ssl.h> #include <openssl/x509v3.h> #include <thrift/concurrency/Mutex.h> -#include "TSSLSocket.h" -#include "PlatformSocket.h" +#include <thrift/transport/TSSLSocket.h> +#include <thrift/transport/PlatformSocket.h> #define OPENSSL_VERSION_NO_THREAD_ID 0x10000000L http://git-wip-us.apache.org/repos/asf/thrift/blob/4285ba29/lib/cpp/src/thrift/transport/TSSLSocket.h ---------------------------------------------------------------------- diff --git a/lib/cpp/src/thrift/transport/TSSLSocket.h b/lib/cpp/src/thrift/transport/TSSLSocket.h index d77c2f5..82a2e91 100644 --- a/lib/cpp/src/thrift/transport/TSSLSocket.h +++ b/lib/cpp/src/thrift/transport/TSSLSocket.h @@ -24,7 +24,7 @@ #include <boost/shared_ptr.hpp> #include <openssl/ssl.h> #include <thrift/concurrency/Mutex.h> -#include "TSocket.h" +#include <thrift/transport/TSocket.h> namespace apache { namespace thrift { namespace transport { http://git-wip-us.apache.org/repos/asf/thrift/blob/4285ba29/lib/cpp/src/thrift/transport/TServerSocket.cpp ---------------------------------------------------------------------- diff --git a/lib/cpp/src/thrift/transport/TServerSocket.cpp b/lib/cpp/src/thrift/transport/TServerSocket.cpp index cb3833e..4cb0fd1 100644 --- a/lib/cpp/src/thrift/transport/TServerSocket.cpp +++ b/lib/cpp/src/thrift/transport/TServerSocket.cpp @@ -43,9 +43,9 @@ #include <unistd.h> #endif -#include "TSocket.h" -#include "TServerSocket.h" -#include "PlatformSocket.h" +#include <thrift/transport/TSocket.h> +#include <thrift/transport/TServerSocket.h> +#include <thrift/transport/PlatformSocket.h> #include <boost/shared_ptr.hpp> #ifndef AF_LOCAL http://git-wip-us.apache.org/repos/asf/thrift/blob/4285ba29/lib/cpp/src/thrift/transport/TServerSocket.h ---------------------------------------------------------------------- diff --git a/lib/cpp/src/thrift/transport/TServerSocket.h b/lib/cpp/src/thrift/transport/TServerSocket.h index 17a00b6..4a8c029 100644 --- a/lib/cpp/src/thrift/transport/TServerSocket.h +++ b/lib/cpp/src/thrift/transport/TServerSocket.h @@ -20,8 +20,8 @@ #ifndef _THRIFT_TRANSPORT_TSERVERSOCKET_H_ #define _THRIFT_TRANSPORT_TSERVERSOCKET_H_ 1 -#include "TServerTransport.h" -#include "PlatformSocket.h" +#include <thrift/transport/TServerTransport.h> +#include <thrift/transport/PlatformSocket.h> #include <boost/shared_ptr.hpp> namespace apache { namespace thrift { namespace transport { http://git-wip-us.apache.org/repos/asf/thrift/blob/4285ba29/lib/cpp/src/thrift/transport/TServerTransport.h ---------------------------------------------------------------------- diff --git a/lib/cpp/src/thrift/transport/TServerTransport.h b/lib/cpp/src/thrift/transport/TServerTransport.h index 40bbc6c..d54aa62 100644 --- a/lib/cpp/src/thrift/transport/TServerTransport.h +++ b/lib/cpp/src/thrift/transport/TServerTransport.h @@ -20,8 +20,8 @@ #ifndef _THRIFT_TRANSPORT_TSERVERTRANSPORT_H_ #define _THRIFT_TRANSPORT_TSERVERTRANSPORT_H_ 1 -#include "TTransport.h" -#include "TTransportException.h" +#include <thrift/transport/TTransport.h> +#include <thrift/transport/TTransportException.h> #include <boost/shared_ptr.hpp> namespace apache { namespace thrift { namespace transport { http://git-wip-us.apache.org/repos/asf/thrift/blob/4285ba29/lib/cpp/src/thrift/transport/TSimpleFileTransport.cpp ---------------------------------------------------------------------- diff --git a/lib/cpp/src/thrift/transport/TSimpleFileTransport.cpp b/lib/cpp/src/thrift/transport/TSimpleFileTransport.cpp index b52e4d5..5bf571d 100644 --- a/lib/cpp/src/thrift/transport/TSimpleFileTransport.cpp +++ b/lib/cpp/src/thrift/transport/TSimpleFileTransport.cpp @@ -20,7 +20,7 @@ #ifdef HAVE_CONFIG_H #include <config.h> #endif -#include "TSimpleFileTransport.h" +#include <thrift/transport/TSimpleFileTransport.h> #include <sys/types.h> #ifdef HAVE_SYS_STAT_H http://git-wip-us.apache.org/repos/asf/thrift/blob/4285ba29/lib/cpp/src/thrift/transport/TSimpleFileTransport.h ---------------------------------------------------------------------- diff --git a/lib/cpp/src/thrift/transport/TSimpleFileTransport.h b/lib/cpp/src/thrift/transport/TSimpleFileTransport.h index 6cc52ea..985a1d3 100644 --- a/lib/cpp/src/thrift/transport/TSimpleFileTransport.h +++ b/lib/cpp/src/thrift/transport/TSimpleFileTransport.h @@ -20,7 +20,7 @@ #ifndef _THRIFT_TRANSPORT_TSIMPLEFILETRANSPORT_H_ #define _THRIFT_TRANSPORT_TSIMPLEFILETRANSPORT_H_ 1 -#include "TFDTransport.h" +#include <thrift/transport/TFDTransport.h> namespace apache { namespace thrift { namespace transport { http://git-wip-us.apache.org/repos/asf/thrift/blob/4285ba29/lib/cpp/src/thrift/transport/TSocket.cpp ---------------------------------------------------------------------- diff --git a/lib/cpp/src/thrift/transport/TSocket.cpp b/lib/cpp/src/thrift/transport/TSocket.cpp index ba0b1e3..1cffa70 100644 --- a/lib/cpp/src/thrift/transport/TSocket.cpp +++ b/lib/cpp/src/thrift/transport/TSocket.cpp @@ -42,9 +42,9 @@ #include <fcntl.h> #include <thrift/concurrency/Monitor.h> -#include "TSocket.h" -#include "TTransportException.h" -#include "PlatformSocket.h" +#include <thrift/transport/TSocket.h> +#include <thrift/transport/TTransportException.h> +#include <thrift/transport/PlatformSocket.h> #ifndef SOCKOPT_CAST_T # ifndef _WIN32 http://git-wip-us.apache.org/repos/asf/thrift/blob/4285ba29/lib/cpp/src/thrift/transport/TSocket.h ---------------------------------------------------------------------- diff --git a/lib/cpp/src/thrift/transport/TSocket.h b/lib/cpp/src/thrift/transport/TSocket.h index 60b5b51..fd5b961 100644 --- a/lib/cpp/src/thrift/transport/TSocket.h +++ b/lib/cpp/src/thrift/transport/TSocket.h @@ -22,10 +22,10 @@ #include <string> -#include "TTransport.h" -#include "TVirtualTransport.h" -#include "TServerSocket.h" -#include "PlatformSocket.h" +#include <thrift/transport/TTransport.h> +#include <thrift/transport/TVirtualTransport.h> +#include <thrift/transport/TServerSocket.h> +#include <thrift/transport/PlatformSocket.h> #ifdef HAVE_ARPA_INET_H #include <arpa/inet.h> http://git-wip-us.apache.org/repos/asf/thrift/blob/4285ba29/lib/cpp/src/thrift/transport/TSocketPool.cpp ---------------------------------------------------------------------- diff --git a/lib/cpp/src/thrift/transport/TSocketPool.cpp b/lib/cpp/src/thrift/transport/TSocketPool.cpp index 6bca4db..fdc5493 100644 --- a/lib/cpp/src/thrift/transport/TSocketPool.cpp +++ b/lib/cpp/src/thrift/transport/TSocketPool.cpp @@ -24,7 +24,7 @@ #include <algorithm> #include <iostream> -#include "TSocketPool.h" +#include <thrift/transport/TSocketPool.h> namespace apache { namespace thrift { namespace transport { http://git-wip-us.apache.org/repos/asf/thrift/blob/4285ba29/lib/cpp/src/thrift/transport/TSocketPool.h ---------------------------------------------------------------------- diff --git a/lib/cpp/src/thrift/transport/TSocketPool.h b/lib/cpp/src/thrift/transport/TSocketPool.h index f8c5ddc..7728257 100644 --- a/lib/cpp/src/thrift/transport/TSocketPool.h +++ b/lib/cpp/src/thrift/transport/TSocketPool.h @@ -21,7 +21,7 @@ #define _THRIFT_TRANSPORT_TSOCKETPOOL_H_ 1 #include <vector> -#include "TSocket.h" +#include <thrift/transport/TSocket.h> namespace apache { namespace thrift { namespace transport { http://git-wip-us.apache.org/repos/asf/thrift/blob/4285ba29/lib/cpp/src/thrift/windows/GetTimeOfDay.cpp ---------------------------------------------------------------------- diff --git a/lib/cpp/src/thrift/windows/GetTimeOfDay.cpp b/lib/cpp/src/thrift/windows/GetTimeOfDay.cpp index 4f0ac55..0ae9cf0 100644 --- a/lib/cpp/src/thrift/windows/GetTimeOfDay.cpp +++ b/lib/cpp/src/thrift/windows/GetTimeOfDay.cpp @@ -17,7 +17,7 @@ * under the License. */ -#include "GetTimeOfDay.h" +#include <thrift/windows/GetTimeOfDay.h> #include "config.h" // win32 http://git-wip-us.apache.org/repos/asf/thrift/blob/4285ba29/lib/cpp/src/thrift/windows/SocketPair.cpp ---------------------------------------------------------------------- diff --git a/lib/cpp/src/thrift/windows/SocketPair.cpp b/lib/cpp/src/thrift/windows/SocketPair.cpp index 45aa7e8..c5f936b 100644 --- a/lib/cpp/src/thrift/windows/SocketPair.cpp +++ b/lib/cpp/src/thrift/windows/SocketPair.cpp @@ -27,7 +27,7 @@ * under the License. */ -#include "SocketPair.h" +#include <thrift/windows/SocketPair.h> // stl #include <string.h> http://git-wip-us.apache.org/repos/asf/thrift/blob/4285ba29/lib/cpp/src/thrift/windows/TWinsockSingleton.cpp ---------------------------------------------------------------------- diff --git a/lib/cpp/src/thrift/windows/TWinsockSingleton.cpp b/lib/cpp/src/thrift/windows/TWinsockSingleton.cpp index a1c7e49..2e306c6 100644 --- a/lib/cpp/src/thrift/windows/TWinsockSingleton.cpp +++ b/lib/cpp/src/thrift/windows/TWinsockSingleton.cpp @@ -17,7 +17,7 @@ * under the License. */ -#include "TWinsockSingleton.h" +#include <thrift/windows/TWinsockSingleton.h> // boost #include <boost/assert.hpp> http://git-wip-us.apache.org/repos/asf/thrift/blob/4285ba29/lib/cpp/src/thrift/windows/TWinsockSingleton.h ---------------------------------------------------------------------- diff --git a/lib/cpp/src/thrift/windows/TWinsockSingleton.h b/lib/cpp/src/thrift/windows/TWinsockSingleton.h index f6e4b8c..7ac229e 100644 --- a/lib/cpp/src/thrift/windows/TWinsockSingleton.h +++ b/lib/cpp/src/thrift/windows/TWinsockSingleton.h @@ -28,7 +28,7 @@ #error This is a MSVC header only. #endif -#include <config.h> +#include "config.h" // boost #include <boost/noncopyable.hpp> http://git-wip-us.apache.org/repos/asf/thrift/blob/4285ba29/lib/cpp/src/thrift/windows/WinFcntl.cpp ---------------------------------------------------------------------- diff --git a/lib/cpp/src/thrift/windows/WinFcntl.cpp b/lib/cpp/src/thrift/windows/WinFcntl.cpp index 86132e9..2466400 100644 --- a/lib/cpp/src/thrift/windows/WinFcntl.cpp +++ b/lib/cpp/src/thrift/windows/WinFcntl.cpp @@ -17,7 +17,7 @@ * under the License. */ -#include "WinFcntl.h" +#include <thrift/windows/WinFcntl.h> int thrift_fcntl(THRIFT_SOCKET fd, int cmd, int flags) { http://git-wip-us.apache.org/repos/asf/thrift/blob/4285ba29/lib/cpp/src/thrift/windows/WinFcntl.h ---------------------------------------------------------------------- diff --git a/lib/cpp/src/thrift/windows/WinFcntl.h b/lib/cpp/src/thrift/windows/WinFcntl.h index 8910a14..f30c0de 100644 --- a/lib/cpp/src/thrift/windows/WinFcntl.h +++ b/lib/cpp/src/thrift/windows/WinFcntl.h @@ -40,7 +40,9 @@ struct thrift_pollfd { }; #endif +extern "C" { int thrift_fcntl(THRIFT_SOCKET fd, int cmd, int flags); int thrift_poll(THRIFT_POLLFD *fdArray, ULONG nfds, INT timeout); +} #endif // _THRIFT_WINDOWS_FCNTL_H_ http://git-wip-us.apache.org/repos/asf/thrift/blob/4285ba29/lib/cpp/src/thrift/windows/config.h ---------------------------------------------------------------------- diff --git a/lib/cpp/src/thrift/windows/config.h b/lib/cpp/src/thrift/windows/config.h index 25230c5..0555e07 100644 --- a/lib/cpp/src/thrift/windows/config.h +++ b/lib/cpp/src/thrift/windows/config.h @@ -75,11 +75,11 @@ typedef boost::uint8_t uint8_t; #endif #include <thrift/transport/PlatformSocket.h> -#include "GetTimeOfDay.h" -#include "Operators.h" -#include "TWinsockSingleton.h" -#include "WinFcntl.h" -#include "SocketPair.h" +#include <thrift/windows/GetTimeOfDay.h> +#include <thrift/windows/Operators.h> +#include <thrift/windows/TWinsockSingleton.h> +#include <thrift/windows/WinFcntl.h> +#include <thrift/windows/SocketPair.h> // windows #include <Winsock2.h>
