Updated Branches: refs/heads/master 9753cde10 -> 58fe53683
THRIFT-2039 config.h --> thrift-config.h Signed-off-by: Roger Meier <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/thrift/repo Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/9be4e687 Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/9be4e687 Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/9be4e687 Branch: refs/heads/master Commit: 9be4e687c49dad1f5d90e93e3b7247be16d50287 Parents: 9753cde Author: Konrad Grochowski <[email protected]> Authored: Sat Jun 22 22:03:31 2013 +0200 Committer: Roger Meier <[email protected]> Committed: Sat Jun 22 22:03:31 2013 +0200 ---------------------------------------------------------------------- lib/cpp/src/thrift/TLogging.h | 4 +--- lib/cpp/src/thrift/Thrift.h | 6 +++--- lib/cpp/src/thrift/concurrency/BoostMonitor.cpp | 5 ++--- lib/cpp/src/thrift/concurrency/BoostMutex.cpp | 5 ++--- lib/cpp/src/thrift/concurrency/BoostThreadFactory.cpp | 5 ++--- lib/cpp/src/thrift/concurrency/Mutex.cpp | 5 ++--- lib/cpp/src/thrift/concurrency/PlatformThreadFactory.h | 2 +- lib/cpp/src/thrift/concurrency/PosixThreadFactory.cpp | 5 ++--- lib/cpp/src/thrift/concurrency/StdMonitor.cpp | 5 ++--- lib/cpp/src/thrift/concurrency/StdMutex.cpp | 5 ++--- lib/cpp/src/thrift/concurrency/StdThreadFactory.cpp | 5 ++--- lib/cpp/src/thrift/concurrency/Thread.h | 4 +--- lib/cpp/src/thrift/concurrency/ThreadManager.cpp | 4 +--- lib/cpp/src/thrift/concurrency/Util.cpp | 5 ++--- lib/cpp/src/thrift/server/TNonblockingServer.cpp | 4 +--- lib/cpp/src/thrift/server/TServer.cpp | 4 +--- lib/cpp/src/thrift/server/TThreadPoolServer.cpp | 4 +--- lib/cpp/src/thrift/transport/TFileTransport.cpp | 4 +--- lib/cpp/src/thrift/transport/TPipeServer.cpp | 4 +--- lib/cpp/src/thrift/transport/TSSLSocket.cpp | 5 ++--- lib/cpp/src/thrift/transport/TServerSocket.cpp | 5 ++--- lib/cpp/src/thrift/transport/TSimpleFileTransport.cpp | 5 ++--- lib/cpp/src/thrift/transport/TSocket.cpp | 5 ++--- lib/cpp/src/thrift/transport/TSocketPool.cpp | 4 +--- lib/cpp/src/thrift/transport/TTransportException.cpp | 5 +---- 25 files changed, 40 insertions(+), 74 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/thrift/blob/9be4e687/lib/cpp/src/thrift/TLogging.h ---------------------------------------------------------------------- diff --git a/lib/cpp/src/thrift/TLogging.h b/lib/cpp/src/thrift/TLogging.h index ff57180..4c8bddc 100644 --- a/lib/cpp/src/thrift/TLogging.h +++ b/lib/cpp/src/thrift/TLogging.h @@ -20,9 +20,7 @@ #ifndef _THRIFT_TLOGGING_H_ #define _THRIFT_TLOGGING_H_ 1 -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include <thrift/thrift-config.h> /** * Contains utility macros for debugging and logging. http://git-wip-us.apache.org/repos/asf/thrift/blob/9be4e687/lib/cpp/src/thrift/Thrift.h ---------------------------------------------------------------------- diff --git a/lib/cpp/src/thrift/Thrift.h b/lib/cpp/src/thrift/Thrift.h index 361ff6a..03caa9e 100644 --- a/lib/cpp/src/thrift/Thrift.h +++ b/lib/cpp/src/thrift/Thrift.h @@ -20,10 +20,10 @@ #ifndef _THRIFT_THRIFT_H_ #define _THRIFT_THRIFT_H_ 1 -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif #include <thrift/transport/PlatformSocket.h> + +#include <thrift/thrift-config.h> + #include <stdio.h> #include <assert.h> http://git-wip-us.apache.org/repos/asf/thrift/blob/9be4e687/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 ad33ce5..1027157 100644 --- a/lib/cpp/src/thrift/concurrency/BoostMonitor.cpp +++ b/lib/cpp/src/thrift/concurrency/BoostMonitor.cpp @@ -17,9 +17,8 @@ * under the License. */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif +#include <thrift/thrift-config.h> + #include <thrift/concurrency/Monitor.h> #include <thrift/concurrency/Exception.h> #include <thrift/concurrency/Util.h> http://git-wip-us.apache.org/repos/asf/thrift/blob/9be4e687/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 debe1b0..eb0c3c1 100644 --- a/lib/cpp/src/thrift/concurrency/BoostMutex.cpp +++ b/lib/cpp/src/thrift/concurrency/BoostMutex.cpp @@ -17,9 +17,8 @@ * under the License. */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif +#include <thrift/thrift-config.h> + #include <thrift/concurrency/Mutex.h> #include <thrift/concurrency/Util.h> http://git-wip-us.apache.org/repos/asf/thrift/blob/9be4e687/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 784ff8e..577329b 100644 --- a/lib/cpp/src/thrift/concurrency/BoostThreadFactory.cpp +++ b/lib/cpp/src/thrift/concurrency/BoostThreadFactory.cpp @@ -17,9 +17,8 @@ * under the License. */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif +#include <thrift/thrift-config.h> + #include <thrift/concurrency/BoostThreadFactory.h> #include <thrift/concurrency/Exception.h> http://git-wip-us.apache.org/repos/asf/thrift/blob/9be4e687/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 5a4bb54..3f7bb5b 100644 --- a/lib/cpp/src/thrift/concurrency/Mutex.cpp +++ b/lib/cpp/src/thrift/concurrency/Mutex.cpp @@ -17,9 +17,8 @@ * under the License. */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif +#include <thrift/thrift-config.h> + #include <thrift/Thrift.h> #include <thrift/concurrency/Mutex.h> #include <thrift/concurrency/Util.h> http://git-wip-us.apache.org/repos/asf/thrift/blob/9be4e687/lib/cpp/src/thrift/concurrency/PlatformThreadFactory.h ---------------------------------------------------------------------- diff --git a/lib/cpp/src/thrift/concurrency/PlatformThreadFactory.h b/lib/cpp/src/thrift/concurrency/PlatformThreadFactory.h index a370c49..6e46dfc 100644 --- a/lib/cpp/src/thrift/concurrency/PlatformThreadFactory.h +++ b/lib/cpp/src/thrift/concurrency/PlatformThreadFactory.h @@ -20,7 +20,7 @@ #ifndef _THRIFT_CONCURRENCY_PLATFORMTHREADFACTORY_H_ #define _THRIFT_CONCURRENCY_PLATFORMTHREADFACTORY_H_ 1 -#include <config.h> +#include <thrift/thrift-config.h> #if USE_BOOST_THREAD # include <thrift/concurrency/BoostThreadFactory.h> #elif USE_STD_THREAD http://git-wip-us.apache.org/repos/asf/thrift/blob/9be4e687/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 39dd886..52ceead 100644 --- a/lib/cpp/src/thrift/concurrency/PosixThreadFactory.cpp +++ b/lib/cpp/src/thrift/concurrency/PosixThreadFactory.cpp @@ -17,9 +17,8 @@ * under the License. */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif +#include <thrift/thrift-config.h> + #include <thrift/concurrency/PosixThreadFactory.h> #include <thrift/concurrency/Exception.h> http://git-wip-us.apache.org/repos/asf/thrift/blob/9be4e687/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 84cad66..cf257e6 100644 --- a/lib/cpp/src/thrift/concurrency/StdMonitor.cpp +++ b/lib/cpp/src/thrift/concurrency/StdMonitor.cpp @@ -17,9 +17,8 @@ * under the License. */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif +#include <thrift/thrift-config.h> + #include <thrift/concurrency/Monitor.h> #include <thrift/concurrency/Exception.h> #include <thrift/concurrency/Util.h> http://git-wip-us.apache.org/repos/asf/thrift/blob/9be4e687/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 82a495f..28f889a 100644 --- a/lib/cpp/src/thrift/concurrency/StdMutex.cpp +++ b/lib/cpp/src/thrift/concurrency/StdMutex.cpp @@ -17,9 +17,8 @@ * under the License. */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif +#include <thrift/thrift-config.h> + #include <thrift/concurrency/Mutex.h> #include <thrift/concurrency/Util.h> http://git-wip-us.apache.org/repos/asf/thrift/blob/9be4e687/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 443771d..3239bd9 100644 --- a/lib/cpp/src/thrift/concurrency/StdThreadFactory.cpp +++ b/lib/cpp/src/thrift/concurrency/StdThreadFactory.cpp @@ -17,9 +17,8 @@ * under the License. */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif +#include <thrift/thrift-config.h> + #include <thrift/concurrency/StdThreadFactory.h> #include <thrift/concurrency/Exception.h> http://git-wip-us.apache.org/repos/asf/thrift/blob/9be4e687/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 894f035..7012933 100755 --- a/lib/cpp/src/thrift/concurrency/Thread.h +++ b/lib/cpp/src/thrift/concurrency/Thread.h @@ -24,9 +24,7 @@ #include <boost/shared_ptr.hpp> #include <boost/weak_ptr.hpp> -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include <thrift/thrift-config.h> #if USE_BOOST_THREAD # include <boost/thread.hpp> http://git-wip-us.apache.org/repos/asf/thrift/blob/9be4e687/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 eb3bc64..d5373de 100644 --- a/lib/cpp/src/thrift/concurrency/ThreadManager.cpp +++ b/lib/cpp/src/thrift/concurrency/ThreadManager.cpp @@ -17,9 +17,7 @@ * under the License. */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif +#include <thrift/thrift-config.h> #include <thrift/concurrency/ThreadManager.h> #include <thrift/concurrency/Exception.h> http://git-wip-us.apache.org/repos/asf/thrift/blob/9be4e687/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 868f52f..7d9085e 100644 --- a/lib/cpp/src/thrift/concurrency/Util.cpp +++ b/lib/cpp/src/thrift/concurrency/Util.cpp @@ -17,9 +17,8 @@ * under the License. */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif +#include <thrift/thrift-config.h> + #include <thrift/Thrift.h> #include <thrift/concurrency/Util.h> http://git-wip-us.apache.org/repos/asf/thrift/blob/9be4e687/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 331198b..12b4b8f 100644 --- a/lib/cpp/src/thrift/server/TNonblockingServer.cpp +++ b/lib/cpp/src/thrift/server/TNonblockingServer.cpp @@ -19,9 +19,7 @@ #define __STDC_FORMAT_MACROS -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif +#include <thrift/thrift-config.h> #include <thrift/server/TNonblockingServer.h> #include <thrift/concurrency/Exception.h> http://git-wip-us.apache.org/repos/asf/thrift/blob/9be4e687/lib/cpp/src/thrift/server/TServer.cpp ---------------------------------------------------------------------- diff --git a/lib/cpp/src/thrift/server/TServer.cpp b/lib/cpp/src/thrift/server/TServer.cpp index a3edd6d..f4ce744 100755 --- a/lib/cpp/src/thrift/server/TServer.cpp +++ b/lib/cpp/src/thrift/server/TServer.cpp @@ -17,9 +17,7 @@ * under the License. */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif +#include <thrift/thrift-config.h> #ifdef HAVE_SYS_TIME_H #include <sys/time.h> http://git-wip-us.apache.org/repos/asf/thrift/blob/9be4e687/lib/cpp/src/thrift/server/TThreadPoolServer.cpp ---------------------------------------------------------------------- diff --git a/lib/cpp/src/thrift/server/TThreadPoolServer.cpp b/lib/cpp/src/thrift/server/TThreadPoolServer.cpp index ef1f522..6ff946b 100644 --- a/lib/cpp/src/thrift/server/TThreadPoolServer.cpp +++ b/lib/cpp/src/thrift/server/TThreadPoolServer.cpp @@ -17,9 +17,7 @@ * under the License. */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif +#include <thrift/thrift-config.h> #include <thrift/server/TThreadPoolServer.h> #include <thrift/transport/TTransportException.h> http://git-wip-us.apache.org/repos/asf/thrift/blob/9be4e687/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 258a18c..c94ecd2 100644 --- a/lib/cpp/src/thrift/transport/TFileTransport.cpp +++ b/lib/cpp/src/thrift/transport/TFileTransport.cpp @@ -17,9 +17,7 @@ * under the License. */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include <thrift/thrift-config.h> #include <thrift/transport/TFileTransport.h> #include <thrift/transport/TTransportUtils.h> http://git-wip-us.apache.org/repos/asf/thrift/blob/9be4e687/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 9c3b51b..10fc69b 100644 --- a/lib/cpp/src/thrift/transport/TPipeServer.cpp +++ b/lib/cpp/src/thrift/transport/TPipeServer.cpp @@ -17,9 +17,7 @@ * under the License. */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif +#include <thrift/thrift-config.h> #include <cstring> #include <thrift/transport/TPipe.h> http://git-wip-us.apache.org/repos/asf/thrift/blob/9be4e687/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 1af8aa7..029c541 100644 --- a/lib/cpp/src/thrift/transport/TSSLSocket.cpp +++ b/lib/cpp/src/thrift/transport/TSSLSocket.cpp @@ -17,9 +17,8 @@ * under the License. */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif +#include <thrift/thrift-config.h> + #include <errno.h> #include <string> #ifdef HAVE_ARPA_INET_H http://git-wip-us.apache.org/repos/asf/thrift/blob/9be4e687/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 4cb0fd1..dc3cb58 100644 --- a/lib/cpp/src/thrift/transport/TServerSocket.cpp +++ b/lib/cpp/src/thrift/transport/TServerSocket.cpp @@ -17,9 +17,8 @@ * under the License. */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif +#include <thrift/thrift-config.h> + #include <cstring> #include <sys/types.h> #ifdef HAVE_SYS_SOCKET_H http://git-wip-us.apache.org/repos/asf/thrift/blob/9be4e687/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 5bf571d..9af1445 100644 --- a/lib/cpp/src/thrift/transport/TSimpleFileTransport.cpp +++ b/lib/cpp/src/thrift/transport/TSimpleFileTransport.cpp @@ -17,9 +17,8 @@ * under the License. */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif +#include <thrift/thrift-config.h> + #include <thrift/transport/TSimpleFileTransport.h> #include <sys/types.h> http://git-wip-us.apache.org/repos/asf/thrift/blob/9be4e687/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 1cffa70..a9a752c 100644 --- a/lib/cpp/src/thrift/transport/TSocket.cpp +++ b/lib/cpp/src/thrift/transport/TSocket.cpp @@ -17,9 +17,8 @@ * under the License. */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif +#include <thrift/thrift-config.h> + #include <cstring> #include <sstream> #ifdef HAVE_SYS_SOCKET_H http://git-wip-us.apache.org/repos/asf/thrift/blob/9be4e687/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 fdc5493..c468fb3 100644 --- a/lib/cpp/src/thrift/transport/TSocketPool.cpp +++ b/lib/cpp/src/thrift/transport/TSocketPool.cpp @@ -17,9 +17,7 @@ * under the License. */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif +#include <thrift/thrift-config.h> #include <algorithm> #include <iostream> http://git-wip-us.apache.org/repos/asf/thrift/blob/9be4e687/lib/cpp/src/thrift/transport/TTransportException.cpp ---------------------------------------------------------------------- diff --git a/lib/cpp/src/thrift/transport/TTransportException.cpp b/lib/cpp/src/thrift/transport/TTransportException.cpp index bd4f44b..2c1f303 100644 --- a/lib/cpp/src/thrift/transport/TTransportException.cpp +++ b/lib/cpp/src/thrift/transport/TTransportException.cpp @@ -21,9 +21,7 @@ #include <boost/lexical_cast.hpp> #include <cstring> -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif +#include <thrift/thrift-config.h> using std::string; using boost::lexical_cast; @@ -31,4 +29,3 @@ using boost::lexical_cast; namespace apache { namespace thrift { namespace transport { }}} // apache::thrift::transport -
