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 /tutorial | |
| 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 'tutorial')
| -rw-r--r-- | tutorial/cpp/CppClient.cpp | 6 | ||||
| -rw-r--r-- | tutorial/cpp/CppServer.cpp | 16 |
2 files changed, 11 insertions, 11 deletions
diff --git a/tutorial/cpp/CppClient.cpp b/tutorial/cpp/CppClient.cpp index 4dac90c4f..6b7e97440 100644 --- a/tutorial/cpp/CppClient.cpp +++ b/tutorial/cpp/CppClient.cpp @@ -21,9 +21,9 @@ #include <unistd.h> #include <sys/time.h> -#include <protocol/TBinaryProtocol.h> -#include <transport/TSocket.h> -#include <transport/TTransportUtils.h> +#include <thrift/protocol/TBinaryProtocol.h> +#include <thrift/transport/TSocket.h> +#include <thrift/transport/TTransportUtils.h> #include "../gen-cpp/Calculator.h" diff --git a/tutorial/cpp/CppServer.cpp b/tutorial/cpp/CppServer.cpp index 860381eea..d0dbad9ff 100644 --- a/tutorial/cpp/CppServer.cpp +++ b/tutorial/cpp/CppServer.cpp @@ -17,14 +17,14 @@ * under the License. */ -#include <concurrency/ThreadManager.h> -#include <concurrency/PosixThreadFactory.h> -#include <protocol/TBinaryProtocol.h> -#include <server/TSimpleServer.h> -#include <server/TThreadPoolServer.h> -#include <server/TThreadedServer.h> -#include <transport/TServerSocket.h> -#include <transport/TTransportUtils.h> +#include <thrift/concurrency/ThreadManager.h> +#include <thrift/concurrency/PosixThreadFactory.h> +#include <thrift/protocol/TBinaryProtocol.h> +#include <thrift/server/TSimpleServer.h> +#include <thrift/server/TThreadPoolServer.h> +#include <thrift/server/TThreadedServer.h> +#include <thrift/transport/TServerSocket.h> +#include <thrift/transport/TTransportUtils.h> #include <iostream> #include <stdexcept> |