diff options
| author | Roger Meier <roger@apache.org> | 2012-04-13 09:12:31 +0000 |
|---|---|---|
| committer | Roger Meier <roger@apache.org> | 2012-04-13 09:12:31 +0000 |
| commit | 49ff8b123a0b79aa0ec5a4a1baa288e7cbfdcede (patch) | |
| tree | f0bb816c0ec7263a05709240177bb719d9d3fbcb /contrib/fb303 | |
| parent | 49ef6587b4cb830cbe35a8e14ac4ad5a2c457923 (diff) | |
| download | thrift-49ff8b123a0b79aa0ec5a4a1baa288e7cbfdcede.tar.gz | |
THRIFT-1552 Include paths for c/c++ should be prefixed with 'thrift/'
To ensure there are no include path collisions the C and C++ header
include paths should include 'thrift' as the root leaf. This will
prevent having to place /usr/include/thrift into the compilers include
header search path, which might otherwise result in the compiler
accidentally picking up headers that it shouldn't.
e.g. #include <foo/bar.h> should be #include <thrift/foo/bar.h>
Change-Id: I48f2b0f549bda0fc81e85506ac857adc800b98a1
git-svn-id: https://svn.apache.org/repos/asf/thrift/trunk@1325674 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'contrib/fb303')
| -rw-r--r-- | contrib/fb303/TClientInfo.cpp | 2 | ||||
| -rw-r--r-- | contrib/fb303/TClientInfo.h | 6 | ||||
| -rw-r--r-- | contrib/fb303/cpp/FacebookBase.h | 4 | ||||
| -rw-r--r-- | contrib/fb303/cpp/ServiceTracker.cpp | 2 | ||||
| -rw-r--r-- | contrib/fb303/cpp/ServiceTracker.h | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/contrib/fb303/TClientInfo.cpp b/contrib/fb303/TClientInfo.cpp index e07eaa8cb..5959fb1fa 100644 --- a/contrib/fb303/TClientInfo.cpp +++ b/contrib/fb303/TClientInfo.cpp @@ -17,7 +17,7 @@ * under the License. */ -#include <server/TClientInfo.h> +#include <thrift/server/TClientInfo.h> namespace apache { namespace thrift { namespace server { diff --git a/contrib/fb303/TClientInfo.h b/contrib/fb303/TClientInfo.h index 9b2d284f2..d0a977025 100644 --- a/contrib/fb303/TClientInfo.h +++ b/contrib/fb303/TClientInfo.h @@ -22,9 +22,9 @@ // for inet_ntop -- #include <arpa/inet.h> -#include <server/TServer.h> -#include <transport/TSocket.h> -#include <concurrency/Mutex.h> +#include <thrift/server/TServer.h> +#include <thrift/transport/TSocket.h> +#include <thrift/concurrency/Mutex.h> namespace apache { namespace thrift { namespace server { diff --git a/contrib/fb303/cpp/FacebookBase.h b/contrib/fb303/cpp/FacebookBase.h index fd169e625..2159c95fd 100644 --- a/contrib/fb303/cpp/FacebookBase.h +++ b/contrib/fb303/cpp/FacebookBase.h @@ -22,8 +22,8 @@ #include "FacebookService.h" -#include "server/TServer.h" -#include "concurrency/Mutex.h" +#include <thrift/server/TServer.h> +#include <thrift/concurrency/Mutex.h> #include <time.h> #include <string> diff --git a/contrib/fb303/cpp/ServiceTracker.cpp b/contrib/fb303/cpp/ServiceTracker.cpp index c20a0683f..2914ff65a 100644 --- a/contrib/fb303/cpp/ServiceTracker.cpp +++ b/contrib/fb303/cpp/ServiceTracker.cpp @@ -21,7 +21,7 @@ #include "FacebookBase.h" #include "ServiceTracker.h" -#include "concurrency/ThreadManager.h" +#include <thrift/concurrency/ThreadManager.h> using namespace std; using namespace facebook::fb303; diff --git a/contrib/fb303/cpp/ServiceTracker.h b/contrib/fb303/cpp/ServiceTracker.h index 930438633..9a3edd8f1 100644 --- a/contrib/fb303/cpp/ServiceTracker.h +++ b/contrib/fb303/cpp/ServiceTracker.h @@ -100,7 +100,7 @@ #include <map> #include <boost/shared_ptr.hpp> -#include "concurrency/Mutex.h" +#include <thrift/concurrency/Mutex.h> namespace apache { namespace thrift { namespace concurrency { |