Permalink
Browse files

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
  • Loading branch information...
1 parent 49ef658 commit 49ff8b123a0b79aa0ec5a4a1baa288e7cbfdcede @bufferoverflow bufferoverflow committed Apr 13, 2012
Showing with 800 additions and 1,496 deletions.
  1. +20 −20 LICENSE
  2. +67 −67 compiler/cpp/compiler.vcxproj
  3. +3 −3 compiler/cpp/src/generate/t_c_glib_generator.cc
  4. +16 −16 compiler/cpp/src/generate/t_cpp_generator.cc
  5. +4 −4 contrib/async-test/test-server.cpp
  6. +1 −1 contrib/fb303/TClientInfo.cpp
  7. +3 −3 contrib/fb303/TClientInfo.h
  8. +2 −2 contrib/fb303/cpp/FacebookBase.h
  9. +1 −1 contrib/fb303/cpp/ServiceTracker.cpp
  10. +1 −1 contrib/fb303/cpp/ServiceTracker.h
  11. +5 −5 contrib/thrift_dump.cpp
  12. +1 −1 contrib/zeromq/TZmqClient.h
  13. +1 −1 contrib/zeromq/TZmqServer.cpp
  14. +1 −1 contrib/zeromq/TZmqServer.h
  15. +1 −1 contrib/zeromq/test-client.cpp
  16. +1 −1 contrib/zeromq/test-sender.cpp
  17. +37 −37 lib/c_glib/Makefile.am
  18. +2 −2 lib/c_glib/src/{ → thrift}/processor/thrift_processor.c
  19. +1 −1 lib/c_glib/src/{ → thrift}/processor/thrift_processor.h
  20. +3 −3 lib/c_glib/src/{ → thrift}/protocol/thrift_binary_protocol.c
  21. +2 −2 lib/c_glib/src/{ → thrift}/protocol/thrift_binary_protocol.h
  22. +3 −3 lib/c_glib/src/{ → thrift}/protocol/thrift_binary_protocol_factory.c
  23. +1 −1 lib/c_glib/src/{ → thrift}/protocol/thrift_binary_protocol_factory.h
  24. +3 −3 lib/c_glib/src/{ → thrift}/protocol/thrift_protocol.c
  25. +1 −1 lib/c_glib/src/{ → thrift}/protocol/thrift_protocol.h
  26. +2 −2 lib/c_glib/src/{ → thrift}/protocol/thrift_protocol_factory.c
  27. +2 −2 lib/c_glib/src/{ → thrift}/protocol/thrift_protocol_factory.h
  28. +1 −1 lib/c_glib/src/{ → thrift}/server/thrift_server.c
  29. +4 −4 lib/c_glib/src/{ → thrift}/server/thrift_server.h
  30. +4 −4 lib/c_glib/src/{ → thrift}/server/thrift_simple_server.c
  31. +1 −1 lib/c_glib/src/{ → thrift}/server/thrift_simple_server.h
  32. +1 −1 lib/c_glib/src/{ → thrift}/thrift.c
  33. 0 lib/c_glib/src/{ → thrift}/thrift.h
  34. +1 −1 lib/c_glib/src/{ → thrift}/thrift_application_exception.c
  35. 0 lib/c_glib/src/{ → thrift}/thrift_application_exception.h
  36. +1 −1 lib/c_glib/src/{ → thrift}/thrift_struct.c
  37. +1 −1 lib/c_glib/src/{ → thrift}/thrift_struct.h
  38. +3 −3 lib/c_glib/src/{ → thrift}/transport/thrift_buffered_transport.c
  39. +1 −1 lib/c_glib/src/{ → thrift}/transport/thrift_buffered_transport.h
  40. +3 −3 lib/c_glib/src/{ → thrift}/transport/thrift_framed_transport.c
  41. +1 −1 lib/c_glib/src/{ → thrift}/transport/thrift_framed_transport.h
  42. +3 −3 lib/c_glib/src/{ → thrift}/transport/thrift_memory_buffer.c
  43. +1 −1 lib/c_glib/src/{ → thrift}/transport/thrift_memory_buffer.h
  44. +5 −5 lib/c_glib/src/{ → thrift}/transport/thrift_server_socket.c
  45. 0 lib/c_glib/src/{ → thrift}/transport/thrift_server_socket.h
  46. +3 −3 lib/c_glib/src/{ → thrift}/transport/thrift_server_transport.c
  47. 0 lib/c_glib/src/{ → thrift}/transport/thrift_server_transport.h
  48. +3 −3 lib/c_glib/src/{ → thrift}/transport/thrift_socket.c
  49. +1 −1 lib/c_glib/src/{ → thrift}/transport/thrift_socket.h
  50. +2 −2 lib/c_glib/src/{ → thrift}/transport/thrift_transport.c
  51. 0 lib/c_glib/src/{ → thrift}/transport/thrift_transport.h
  52. +2 −2 lib/c_glib/src/{ → thrift}/transport/thrift_transport_factory.c
  53. 0 lib/c_glib/src/{ → thrift}/transport/thrift_transport_factory.h
  54. +3 −3 lib/c_glib/test/testbinaryprotocol.c
  55. +4 −4 lib/c_glib/test/testbufferedtransport.c
  56. +4 −4 lib/c_glib/test/testframedtransport.c
  57. +4 −4 lib/c_glib/test/testmemorybuffer.c
  58. +3 −3 lib/c_glib/test/testoptionalrequired.c
  59. +4 −4 lib/c_glib/test/testsimpleserver.c
  60. +2 −2 lib/c_glib/test/testthrifttest.c
  61. +7 −7 lib/c_glib/test/testthrifttestclient.cpp
  62. +3 −3 lib/c_glib/test/testtransportsocket.c
  63. +112 −112 lib/cpp/Makefile.am
  64. +84 −84 lib/cpp/libthrift.vcxproj
  65. +75 −75 lib/cpp/libthrift.vcxproj.filters
  66. +17 −17 lib/cpp/libthriftnb.vcxproj
  67. +13 −13 lib/cpp/libthriftnb.vcxproj.filters
  68. +2 −2 lib/cpp/src/{ → thrift}/TApplicationException.cpp
  69. +1 −1 lib/cpp/src/{ → thrift}/TApplicationException.h
  70. 0 lib/cpp/src/{ → thrift}/TDispatchProcessor.h
  71. 0 lib/cpp/src/{ → thrift}/TLogging.h
  72. +1 −1 lib/cpp/src/{ → thrift}/TProcessor.h
  73. +1 −1 lib/cpp/src/{ → thrift}/TReflectionLocal.h
  74. +1 −1 lib/cpp/src/{ → thrift}/Thrift.cpp
  75. +1 −1 lib/cpp/src/{ → thrift}/Thrift.h
  76. +2 −2 lib/cpp/src/{ → thrift}/VirtualProfiling.cpp
  77. +1 −1 lib/cpp/src/{ → thrift}/async/TAsyncBufferProcessor.h
  78. +1 −1 lib/cpp/src/{ → thrift}/async/TAsyncChannel.cpp
  79. +1 −1 lib/cpp/src/{ → thrift}/async/TAsyncChannel.h
  80. 0 lib/cpp/src/{ → thrift}/async/TAsyncDispatchProcessor.h
  81. +1 −1 lib/cpp/src/{ → thrift}/async/TAsyncProcessor.h
  82. 0 lib/cpp/src/{ → thrift}/async/TAsyncProtocolProcessor.cpp
  83. +1 −1 lib/cpp/src/{ → thrift}/async/TAsyncProtocolProcessor.h
  84. +2 −2 lib/cpp/src/{ → thrift}/async/TEvhttpClientChannel.cpp
  85. 0 lib/cpp/src/{ → thrift}/async/TEvhttpClientChannel.h
  86. +1 −1 lib/cpp/src/{ → thrift}/async/TEvhttpServer.cpp
  87. 0 lib/cpp/src/{ → thrift}/async/TEvhttpServer.h
  88. 0 lib/cpp/src/{ → thrift}/concurrency/BoostMonitor.cpp
  89. 0 lib/cpp/src/{ → thrift}/concurrency/BoostMutex.cpp
  90. 0 lib/cpp/src/{ → thrift}/concurrency/BoostThreadFactory.cpp
  91. 0 lib/cpp/src/{ → thrift}/concurrency/BoostThreadFactory.h
  92. +1 −1 lib/cpp/src/{ → thrift}/concurrency/Exception.h
  93. 0 lib/cpp/src/{ → thrift}/concurrency/FunctionRunner.h
  94. 0 lib/cpp/src/{ → thrift}/concurrency/Monitor.cpp
  95. 0 lib/cpp/src/{ → thrift}/concurrency/Monitor.h
  96. 0 lib/cpp/src/{ → thrift}/concurrency/Mutex.cpp
  97. 0 lib/cpp/src/{ → thrift}/concurrency/Mutex.h
  98. +2 −2 lib/cpp/src/{ → thrift}/concurrency/PlatformThreadFactory.h
  99. 0 lib/cpp/src/{ → thrift}/concurrency/PosixThreadFactory.cpp
  100. 0 lib/cpp/src/{ → thrift}/concurrency/PosixThreadFactory.h
  101. 0 lib/cpp/src/{ → thrift}/concurrency/Thread.h
  102. 0 lib/cpp/src/{ → thrift}/concurrency/ThreadManager.cpp
  103. 0 lib/cpp/src/{ → thrift}/concurrency/ThreadManager.h
  104. 0 lib/cpp/src/{ → thrift}/concurrency/TimerManager.cpp
  105. 0 lib/cpp/src/{ → thrift}/concurrency/TimerManager.h
  106. 0 lib/cpp/src/{ → thrift}/concurrency/Util.cpp
  107. 0 lib/cpp/src/{ → thrift}/concurrency/Util.h
  108. 0 lib/cpp/src/{ → thrift}/concurrency/test/Tests.cpp
  109. +4 −4 lib/cpp/src/{ → thrift}/concurrency/test/ThreadFactoryTests.h
  110. +4 −4 lib/cpp/src/{ → thrift}/concurrency/test/ThreadManagerTests.h
  111. +4 −4 lib/cpp/src/{ → thrift}/concurrency/test/TimerManagerTests.h
  112. 0 lib/cpp/src/{ → thrift}/processor/PeekProcessor.cpp
  113. +3 −3 lib/cpp/src/{ → thrift}/processor/PeekProcessor.h
  114. +2 −2 lib/cpp/src/{ → thrift}/processor/StatsProcessor.h
  115. 0 lib/cpp/src/{ → thrift}/protocol/TBase64Utils.cpp
  116. 0 lib/cpp/src/{ → thrift}/protocol/TBase64Utils.h
  117. 0 lib/cpp/src/{ → thrift}/protocol/TBinaryProtocol.h
  118. 0 lib/cpp/src/{ → thrift}/protocol/TBinaryProtocol.tcc
  119. 0 lib/cpp/src/{ → thrift}/protocol/TCompactProtocol.h
  120. 0 lib/cpp/src/{ → thrift}/protocol/TCompactProtocol.tcc
  121. 0 lib/cpp/src/{ → thrift}/protocol/TDebugProtocol.cpp
  122. +1 −1 lib/cpp/src/{ → thrift}/protocol/TDebugProtocol.h
  123. 0 lib/cpp/src/{ → thrift}/protocol/TDenseProtocol.cpp
  124. 0 lib/cpp/src/{ → thrift}/protocol/TDenseProtocol.h
  125. +1 −1 lib/cpp/src/{ → thrift}/protocol/TJSONProtocol.cpp
  126. +1 −1 lib/cpp/src/{ → thrift}/protocol/TJSONProtocol.h
  127. +2 −2 lib/cpp/src/{ → thrift}/protocol/TProtocol.h
  128. 0 lib/cpp/src/{ → thrift}/protocol/TProtocolException.h
  129. +1 −1 lib/cpp/src/{ → thrift}/protocol/TProtocolTap.h
  130. +1 −1 lib/cpp/src/{ → thrift}/protocol/TVirtualProtocol.h
  131. +2 −2 lib/cpp/src/{ → thrift}/qt/TQIODeviceTransport.cpp
  132. +1 −1 lib/cpp/src/{ → thrift}/qt/TQIODeviceTransport.h
  133. +2 −2 lib/cpp/src/{ → thrift}/qt/TQTcpServer.cpp
  134. 0 lib/cpp/src/{ → thrift}/qt/TQTcpServer.h
  135. +3 −3 lib/cpp/src/{ → thrift}/server/TNonblockingServer.cpp
  136. +8 −8 lib/cpp/src/{ → thrift}/server/TNonblockingServer.h
  137. 0 lib/cpp/src/{ → thrift}/server/TServer.cpp
  138. +4 −4 lib/cpp/src/{ → thrift}/server/TServer.h
  139. +2 −2 lib/cpp/src/{ → thrift}/server/TSimpleServer.cpp
  140. +2 −2 lib/cpp/src/{ → thrift}/server/TSimpleServer.h
  141. +4 −4 lib/cpp/src/{ → thrift}/server/TThreadPoolServer.cpp
  142. +3 −3 lib/cpp/src/{ → thrift}/server/TThreadPoolServer.h
  143. +3 −3 lib/cpp/src/{ → thrift}/server/TThreadedServer.cpp
  144. +4 −4 lib/cpp/src/{ → thrift}/server/TThreadedServer.h
  145. +1 −1 lib/cpp/src/{ → thrift}/transport/TBufferTransports.cpp
  146. +2 −2 lib/cpp/src/{ → thrift}/transport/TBufferTransports.h
  147. +1 −1 lib/cpp/src/{ → thrift}/transport/TFDTransport.cpp
  148. 0 lib/cpp/src/{ → thrift}/transport/TFDTransport.h
  149. 0 lib/cpp/src/{ → thrift}/transport/TFileTransport.cpp
  150. +5 −5 lib/cpp/src/{ → thrift}/transport/TFileTransport.h
  151. +2 −2 lib/cpp/src/{ → thrift}/transport/THttpClient.cpp
  152. +1 −1 lib/cpp/src/{ → thrift}/transport/THttpClient.h
  153. +2 −2 lib/cpp/src/{ → thrift}/transport/THttpServer.cpp
  154. +1 −1 lib/cpp/src/{ → thrift}/transport/THttpServer.h
  155. +1 −1 lib/cpp/src/{ → thrift}/transport/THttpTransport.cpp
  156. +1 −1 lib/cpp/src/{ → thrift}/transport/THttpTransport.h
  157. 0 lib/cpp/src/{ → thrift}/transport/TSSLServerSocket.cpp
  158. 0 lib/cpp/src/{ → thrift}/transport/TSSLServerSocket.h
  159. +1 −1 lib/cpp/src/{ → thrift}/transport/TSSLSocket.cpp
  160. +1 −1 lib/cpp/src/{ → thrift}/transport/TSSLSocket.h
  161. 0 lib/cpp/src/{ → thrift}/transport/TServerSocket.cpp
  162. 0 lib/cpp/src/{ → thrift}/transport/TServerSocket.h
  163. 0 lib/cpp/src/{ → thrift}/transport/TServerTransport.h
  164. +3 −3 lib/cpp/src/{ → thrift}/transport/TShortReadTransport.h
  165. 0 lib/cpp/src/{ → thrift}/transport/TSimpleFileTransport.cpp
  166. 0 lib/cpp/src/{ → thrift}/transport/TSimpleFileTransport.h
  167. +1 −1 lib/cpp/src/{ → thrift}/transport/TSocket.cpp
  168. 0 lib/cpp/src/{ → thrift}/transport/TSocket.h
  169. 0 lib/cpp/src/{ → thrift}/transport/TSocketPool.cpp
  170. 0 lib/cpp/src/{ → thrift}/transport/TSocketPool.h
  171. +2 −2 lib/cpp/src/{ → thrift}/transport/TTransport.h
  172. +1 −1 lib/cpp/src/{ → thrift}/transport/TTransportException.cpp
  173. +1 −1 lib/cpp/src/{ → thrift}/transport/TTransportException.h
  174. +1 −1 lib/cpp/src/{ → thrift}/transport/TTransportUtils.cpp
  175. +3 −3 lib/cpp/src/{ → thrift}/transport/TTransportUtils.h
  176. +1 −1 lib/cpp/src/{ → thrift}/transport/TVirtualTransport.h
  177. +1 −1 lib/cpp/src/{ → thrift}/transport/TZlibTransport.cpp
  178. +2 −2 lib/cpp/src/{ → thrift}/transport/TZlibTransport.h
  179. 0 lib/cpp/src/{ → thrift}/windows/GetTimeOfDay.cpp
  180. 0 lib/cpp/src/{ → thrift}/windows/GetTimeOfDay.h
  181. 0 lib/cpp/src/{ → thrift}/windows/Operators.h
  182. 0 lib/cpp/src/{ → thrift}/windows/SocketPair.cpp
  183. 0 lib/cpp/src/{ → thrift}/windows/SocketPair.h
  184. 0 lib/cpp/src/{ → thrift}/windows/StdAfx.cpp
  185. 0 lib/cpp/src/{ → thrift}/windows/StdAfx.h
  186. 0 lib/cpp/src/{ → thrift}/windows/TWinsockSingleton.cpp
  187. 0 lib/cpp/src/{ → thrift}/windows/TWinsockSingleton.h
  188. 0 lib/cpp/src/{ → thrift}/windows/TargetVersion.h
  189. 0 lib/cpp/src/{ → thrift}/windows/WinFcntl.cpp
  190. 0 lib/cpp/src/{ → thrift}/windows/WinFcntl.h
  191. 0 lib/cpp/src/{ → thrift}/windows/config.h
  192. +1 −1 lib/cpp/src/{ → thrift}/windows/force_inc.h
  193. 0 lib/cpp/src/{ → thrift}/windows/tr1/functional
  194. +0 −209 lib/cpp/src/transport/TPipe.cpp
  195. +0 −89 lib/cpp/src/transport/TPipe.h
  196. +0 −313 lib/cpp/src/transport/TPipeServer.cpp
  197. +0 −85 lib/cpp/src/transport/TPipeServer.h
  198. +3 −3 lib/cpp/test/AllProtocolTests.cpp
  199. +4 −4 lib/cpp/test/AllProtocolTests.tcc
  200. +2 −2 lib/cpp/test/Benchmark.cpp
  201. +1 −1 lib/cpp/test/DebugProtoTest.cpp
  202. +2 −2 lib/cpp/test/DenseProtoTest.cpp
  203. +3 −3 lib/cpp/test/GenericHelpers.h
  204. +2 −2 lib/cpp/test/JSONProtoTest.cpp
  205. +3 −3 lib/cpp/test/OptionalRequiredTest.cpp
  206. +2 −2 lib/cpp/test/RWMutexStarveTest.cpp
  207. +2 −2 lib/cpp/test/SpecializationTest.cpp
  208. +2 −2 lib/cpp/test/TBufferBaseTest.cpp
  209. +2 −2 lib/cpp/test/TFDTransportTest.cpp
  210. +1 −1 lib/cpp/test/TFileTransportTest.cpp
  211. +2 −2 lib/cpp/test/TMemoryBufferTest.cpp
  212. +3 −3 lib/cpp/test/TPipedTransportTest.cpp
  213. +1 −1 lib/cpp/test/ThriftTest_extras.cpp
  214. +5 −5 lib/cpp/test/TransportTest.cpp
  215. +2 −2 lib/cpp/test/ZlibTest.cpp
  216. +13 −13 test/cpp/src/StressTest.cpp
  217. +14 −14 test/cpp/src/StressTestNonBlocking.cpp
  218. +8 −8 test/cpp/src/TestClient.cpp
  219. +17 −17 test/cpp/src/TestServer.cpp
  220. +7 −7 test/threads/ThreadsClient.cpp
  221. +8 −8 test/threads/ThreadsServer.cpp
  222. +3 −3 tutorial/cpp/CppClient.cpp
  223. +8 −8 tutorial/cpp/CppServer.cpp
View
40 LICENSE
@@ -223,25 +223,25 @@ the Thrift Software License (see doc/old-thrift-license.txt), and relicensed
under the Apache 2.0 License:
compiler/cpp/Makefile.am
- compiler/cpp/src/generate/t_cocoa_generator.cc
- compiler/cpp/src/generate/t_cpp_generator.cc
- compiler/cpp/src/generate/t_csharp_generator.cc
- compiler/cpp/src/generate/t_erl_generator.cc
- compiler/cpp/src/generate/t_hs_generator.cc
- compiler/cpp/src/generate/t_java_generator.cc
- compiler/cpp/src/generate/t_ocaml_generator.cc
- compiler/cpp/src/generate/t_perl_generator.cc
- compiler/cpp/src/generate/t_php_generator.cc
- compiler/cpp/src/generate/t_py_generator.cc
- compiler/cpp/src/generate/t_rb_generator.cc
- compiler/cpp/src/generate/t_st_generator.cc
- compiler/cpp/src/generate/t_xsd_generator.cc
- compiler/cpp/src/main.cc
- compiler/cpp/src/parse/t_field.h
- compiler/cpp/src/parse/t_program.h
- compiler/cpp/src/platform.h
- compiler/cpp/src/thriftl.ll
- compiler/cpp/src/thrifty.yy
+ compiler/cpp/src/thrift/generate/t_cocoa_generator.cc
+ compiler/cpp/src/thrift/generate/t_cpp_generator.cc
+ compiler/cpp/src/thrift/generate/t_csharp_generator.cc
+ compiler/cpp/src/thrift/generate/t_erl_generator.cc
+ compiler/cpp/src/thrift/generate/t_hs_generator.cc
+ compiler/cpp/src/thrift/generate/t_java_generator.cc
+ compiler/cpp/src/thrift/generate/t_ocaml_generator.cc
+ compiler/cpp/src/thrift/generate/t_perl_generator.cc
+ compiler/cpp/src/thrift/generate/t_php_generator.cc
+ compiler/cpp/src/thrift/generate/t_py_generator.cc
+ compiler/cpp/src/thrift/generate/t_rb_generator.cc
+ compiler/cpp/src/thrift/generate/t_st_generator.cc
+ compiler/cpp/src/thrift/generate/t_xsd_generator.cc
+ compiler/cpp/src/thrift/main.cc
+ compiler/cpp/src/thrift/parse/t_field.h
+ compiler/cpp/src/thrift/parse/t_program.h
+ compiler/cpp/src/thrift/platform.h
+ compiler/cpp/src/thrift/thriftl.ll
+ compiler/cpp/src/thrift/thrifty.yy
lib/csharp/src/Protocol/TBinaryProtocol.cs
lib/csharp/src/Protocol/TField.cs
lib/csharp/src/Protocol/TList.cs
@@ -289,7 +289,7 @@ For the aclocal/ax_boost_base.m4 and contrib/fb303/aclocal/ax_boost_base.m4 comp
# the copyright notice and this notice are preserved.
--------------------------------------------------
-For the compiler/cpp/src/md5.[ch] components:
+For the compiler/cpp/src/thrift/md5.[ch] components:
/*
Copyright (C) 1999, 2000, 2002 Aladdin Enterprises. All rights reserved.
@@ -19,66 +19,66 @@
</ProjectConfiguration>
</ItemGroup>
<ItemGroup>
- <ClInclude Include="src\generate\t_generator.h" />
- <ClInclude Include="src\generate\t_generator_registry.h" />
- <ClInclude Include="src\generate\t_oop_generator.h" />
- <ClInclude Include="src\globals.h" />
- <ClInclude Include="src\main.h" />
- <ClInclude Include="src\md5.h" />
- <ClInclude Include="src\parse\t_base_type.h" />
- <ClInclude Include="src\parse\t_const.h" />
- <ClInclude Include="src\parse\t_const_value.h" />
- <ClInclude Include="src\parse\t_container.h" />
- <ClInclude Include="src\parse\t_doc.h" />
- <ClInclude Include="src\parse\t_enum.h" />
- <ClInclude Include="src\parse\t_enum_value.h" />
- <ClInclude Include="src\parse\t_field.h" />
- <ClInclude Include="src\parse\t_function.h" />
- <ClInclude Include="src\parse\t_list.h" />
- <ClInclude Include="src\parse\t_map.h" />
- <ClInclude Include="src\parse\t_program.h" />
- <ClInclude Include="src\parse\t_scope.h" />
- <ClInclude Include="src\parse\t_service.h" />
- <ClInclude Include="src\parse\t_set.h" />
- <ClInclude Include="src\parse\t_struct.h" />
- <ClInclude Include="src\parse\t_type.h" />
- <ClInclude Include="src\parse\t_typedef.h" />
- <ClInclude Include="src\platform.h" />
- <ClInclude Include="src\thrifty.h" />
- <ClInclude Include="src\windows\config.h" />
- <ClInclude Include="src\windows\version.h" />
+ <ClInclude Include="src\thrift\generate\t_generator.h" />
+ <ClInclude Include="src\thrift\generate\t_generator_registry.h" />
+ <ClInclude Include="src\thrift\generate\t_oop_generator.h" />
+ <ClInclude Include="src\thrift\globals.h" />
+ <ClInclude Include="src\thrift\main.h" />
+ <ClInclude Include="src\thrift\md5.h" />
+ <ClInclude Include="src\thrift\parse\t_base_type.h" />
+ <ClInclude Include="src\thrift\parse\t_const.h" />
+ <ClInclude Include="src\thrift\parse\t_const_value.h" />
+ <ClInclude Include="src\thrift\parse\t_container.h" />
+ <ClInclude Include="src\thrift\parse\t_doc.h" />
+ <ClInclude Include="src\thrift\parse\t_enum.h" />
+ <ClInclude Include="src\thrift\parse\t_enum_value.h" />
+ <ClInclude Include="src\thrift\parse\t_field.h" />
+ <ClInclude Include="src\thrift\parse\t_function.h" />
+ <ClInclude Include="src\thrift\parse\t_list.h" />
+ <ClInclude Include="src\thrift\parse\t_map.h" />
+ <ClInclude Include="src\thrift\parse\t_program.h" />
+ <ClInclude Include="src\thrift\parse\t_scope.h" />
+ <ClInclude Include="src\thrift\parse\t_service.h" />
+ <ClInclude Include="src\thrift\parse\t_set.h" />
+ <ClInclude Include="src\thrift\parse\t_struct.h" />
+ <ClInclude Include="src\thrift\parse\t_type.h" />
+ <ClInclude Include="src\thrift\parse\t_typedef.h" />
+ <ClInclude Include="src\thrift\platform.h" />
+ <ClInclude Include="src\thrift\thrifty.h" />
+ <ClInclude Include="src\thrift\windows\config.h" />
+ <ClInclude Include="src\thrift\windows\version.h" />
</ItemGroup>
<ItemGroup>
- <ClCompile Include="src\generate\t_as3_generator.cc" />
- <ClCompile Include="src\generate\t_cocoa_generator.cc" />
- <ClCompile Include="src\generate\t_cpp_generator.cc" />
- <ClCompile Include="src\generate\t_csharp_generator.cc" />
- <ClCompile Include="src\generate\t_c_glib_generator.cc" />
- <ClCompile Include="src\generate\t_erl_generator.cc" />
- <ClCompile Include="src\generate\t_generator.cc" />
- <ClCompile Include="src\generate\t_go_generator.cc" />
- <ClCompile Include="src\generate\t_hs_generator.cc" />
- <ClCompile Include="src\generate\t_html_generator.cc" />
- <ClCompile Include="src\generate\t_javame_generator.cc" />
- <ClCompile Include="src\generate\t_java_generator.cc" />
- <ClCompile Include="src\generate\t_js_generator.cc" />
- <ClCompile Include="src\generate\t_ocaml_generator.cc" />
- <ClCompile Include="src\generate\t_perl_generator.cc" />
- <ClCompile Include="src\generate\t_php_generator.cc" />
- <ClCompile Include="src\generate\t_py_generator.cc" />
- <ClCompile Include="src\generate\t_rb_generator.cc" />
- <ClCompile Include="src\generate\t_st_generator.cc" />
- <ClCompile Include="src\generate\t_xsd_generator.cc" />
- <ClCompile Include="src\main.cc" />
- <ClCompile Include="src\md5.c" />
- <ClCompile Include="src\parse\parse.cc" />
- <ClCompile Include="src\thriftl.cc" />
- <ClCompile Include="src\thrifty.cc" />
+ <ClCompile Include="src\thrift\generate\t_as3_generator.cc" />
+ <ClCompile Include="src\thrift\generate\t_cocoa_generator.cc" />
+ <ClCompile Include="src\thrift\generate\t_cpp_generator.cc" />
+ <ClCompile Include="src\thrift\generate\t_csharp_generator.cc" />
+ <ClCompile Include="src\thrift\generate\t_c_glib_generator.cc" />
+ <ClCompile Include="src\thrift\generate\t_erl_generator.cc" />
+ <ClCompile Include="src\thrift\generate\t_generator.cc" />
+ <ClCompile Include="src\thrift\generate\t_go_generator.cc" />
+ <ClCompile Include="src\thrift\generate\t_hs_generator.cc" />
+ <ClCompile Include="src\thrift\generate\t_html_generator.cc" />
+ <ClCompile Include="src\thrift\generate\t_javame_generator.cc" />
+ <ClCompile Include="src\thrift\generate\t_java_generator.cc" />
+ <ClCompile Include="src\thrift\generate\t_js_generator.cc" />
+ <ClCompile Include="src\thrift\generate\t_ocaml_generator.cc" />
+ <ClCompile Include="src\thrift\generate\t_perl_generator.cc" />
+ <ClCompile Include="src\thrift\generate\t_php_generator.cc" />
+ <ClCompile Include="src\thrift\generate\t_py_generator.cc" />
+ <ClCompile Include="src\thrift\generate\t_rb_generator.cc" />
+ <ClCompile Include="src\thrift\generate\t_st_generator.cc" />
+ <ClCompile Include="src\thrift\generate\t_xsd_generator.cc" />
+ <ClCompile Include="src\thrift\main.cc" />
+ <ClCompile Include="src\thrift\md5.c" />
+ <ClCompile Include="src\thrift\parse\parse.cc" />
+ <ClCompile Include="src\thrift\thriftl.cc" />
+ <ClCompile Include="src\thrift\thrifty.cc" />
</ItemGroup>
<ItemGroup>
<None Include="README_WINDOWS" />
- <None Include="src\thriftl.ll" />
- <None Include="src\thrifty.yy" />
+ <None Include="src\thrift\thriftl.ll" />
+ <None Include="src\thrift\thrifty.yy" />
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{89975A1A-F799-4556-98B8-64E30AB39A90}</ProjectGuid>
@@ -126,25 +126,25 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>true</LinkIncremental>
- <IncludePath>$(ProjectDir)\src\;$(ProjectDir)\src\windows\;$(IncludePath)</IncludePath>
+ <IncludePath>$(ProjectDir)\src\thrift\;$(ProjectDir)\src\windows\;$(IncludePath)</IncludePath>
<TargetName>thrift</TargetName>
<ExecutablePath>$(ExecutablePath);C:\Program Files (x86)\Git\bin</ExecutablePath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<LinkIncremental>true</LinkIncremental>
- <IncludePath>$(ProjectDir)\src\;$(ProjectDir)\src\windows\;$(IncludePath)</IncludePath>
+ <IncludePath>$(ProjectDir)\src\thrift\;$(ProjectDir)\src\windows\;$(IncludePath)</IncludePath>
<TargetName>thrift</TargetName>
<ExecutablePath>$(ExecutablePath);C:\Program Files (x86)\Git\bin</ExecutablePath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
- <IncludePath>$(ProjectDir)\src\;$(ProjectDir)\src\windows\;$(IncludePath)</IncludePath>
+ <IncludePath>$(ProjectDir)\src\thrift\;$(ProjectDir)\src\windows\;$(IncludePath)</IncludePath>
<TargetName>thrift</TargetName>
<ExecutablePath>$(ExecutablePath);C:\Program Files (x86)\Git\bin</ExecutablePath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<LinkIncremental>false</LinkIncremental>
- <IncludePath>$(ProjectDir)\src\;$(ProjectDir)\src\windows\;$(IncludePath)</IncludePath>
+ <IncludePath>$(ProjectDir)\src\thrift\;$(ProjectDir)\src\windows\;$(IncludePath)</IncludePath>
<TargetName>thrift</TargetName>
<ExecutablePath>$(ExecutablePath);C:\Program Files (x86)\Git\bin</ExecutablePath>
</PropertyGroup>
@@ -163,8 +163,8 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
<PreBuildEvent>
- <Command>flex -o "src/thriftl.cc" src/thriftl.ll
-bison -y -o "src/thrifty.cc" --defines="src/thrifty.h" src/thrifty.yy</Command>
+ <Command>flex -o "src\thrift\thriftl.cc" src/thriftl.ll
+bison -y -o "src\thrift\thrifty.cc" --defines="src/thrifty.h" src/thrifty.yy</Command>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -182,8 +182,8 @@ bison -y -o "src/thrifty.cc" --defines="src/thrifty.h" src/thrifty.yy</Command>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
<PreBuildEvent>
- <Command>flex -o "src/thriftl.cc" src/thriftl.ll
-bison -y -o "src/thrifty.cc" --defines="src/thrifty.h" src/thrifty.yy</Command>
+ <Command>flex -o "src\thrift\thriftl.cc" src/thriftl.ll
+bison -y -o "src\thrift\thrifty.cc" --defines="src/thrifty.h" src/thrifty.yy</Command>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -205,8 +205,8 @@ bison -y -o "src/thrifty.cc" --defines="src/thrifty.h" src/thrifty.yy</Command>
<OptimizeReferences>true</OptimizeReferences>
</Link>
<PreBuildEvent>
- <Command>flex -o "src/thriftl.cc" src/thriftl.ll
-bison -y -o "src/thrifty.cc" --defines="src/thrifty.h" src/thrifty.yy</Command>
+ <Command>flex -o "src\thrift\thriftl.cc" src/thriftl.ll
+bison -y -o "src\thrift\thrifty.cc" --defines="src/thrifty.h" src/thrifty.yy</Command>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -228,8 +228,8 @@ bison -y -o "src/thrifty.cc" --defines="src/thrifty.h" src/thrifty.yy</Command>
<OptimizeReferences>true</OptimizeReferences>
</Link>
<PreBuildEvent>
- <Command>flex -o "src/thriftl.cc" src/thriftl.ll
-bison -y -o "src/thrifty.cc" --defines="src/thrifty.h" src/thrifty.yy</Command>
+ <Command>flex -o "src\thrift\thriftl.cc" src/thriftl.ll
+bison -y -o "src\thrift\thrifty.cc" --defines="src/thrifty.h" src/thrifty.yy</Command>
</PreBuildEvent>
</ItemDefinitionGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
@@ -186,7 +186,7 @@ void t_c_glib_generator::init_generator() {
"/* base includes */" << endl <<
"#include <glib-object.h>" << endl <<
"#include <thrift_struct.h>" << endl <<
- "#include <protocol/thrift_protocol.h>" << endl;
+ "#include <thrift/protocol/thrift_protocol.h>" << endl;
/* include other thrift includes */
const vector<t_program *> &includes = program_->get_includes();
@@ -217,7 +217,7 @@ void t_c_glib_generator::init_generator() {
endl <<
"#include \"" << this->nspace_lc << program_name_u <<
"_types.h\"" << endl <<
- "#include <thrift.h>" << endl <<
+ "#include <thrift/thrift.h>" << endl <<
endl;
f_types_ <<
@@ -410,7 +410,7 @@ void t_c_glib_generator::generate_service (t_service *tservice) {
// include the headers
f_service_ <<
"#include <string.h>" << endl <<
- "#include <thrift.h>" << endl <<
+ "#include <thrift/thrift.h>" << endl <<
"#include <thrift_application_exception.h>" << endl <<
"#include \"" << filename << ".h\"" << endl <<
endl;
@@ -343,10 +343,10 @@ void t_cpp_generator::init_generator() {
// Include base types
f_types_ <<
- "#include <Thrift.h>" << endl <<
- "#include <TApplicationException.h>" << endl <<
- "#include <protocol/TProtocol.h>" << endl <<
- "#include <transport/TTransport.h>" << endl <<
+ "#include <thrift/Thrift.h>" << endl <<
+ "#include <thrift/TApplicationException.h>" << endl <<
+ "#include <thrift/protocol/TProtocol.h>" << endl <<
+ "#include <thrift/transport/TTransport.h>" << endl <<
endl;
// Include other Thrift includes
@@ -392,7 +392,7 @@ void t_cpp_generator::init_generator() {
// the definition of TypeSpec.
if (gen_dense_) {
f_types_impl_ <<
- "#include <TReflectionLocal.h>" << endl <<
+ "#include <thrift/TReflectionLocal.h>" << endl <<
endl;
}
@@ -1571,17 +1571,17 @@ void t_cpp_generator::generate_service(t_service* tservice) {
endl;
if (gen_cob_style_) {
f_header_ <<
- "#include <transport/TBufferTransports.h>" << endl << // TMemoryBuffer
+ "#include <thrift/transport/TBufferTransports.h>" << endl << // TMemoryBuffer
"#include <tr1/functional>" << endl <<
"namespace apache { namespace thrift { namespace async {" << endl <<
"class TAsyncChannel;" << endl <<
"}}}" << endl;
}
f_header_ <<
- "#include <TDispatchProcessor.h>" << endl;
+ "#include <thrift/TDispatchProcessor.h>" << endl;
if (gen_cob_style_) {
f_header_ <<
- "#include <async/TAsyncDispatchProcessor.h>" << endl;
+ "#include <thrift/async/TAsyncDispatchProcessor.h>" << endl;
}
f_header_ <<
"#include \"" << get_include_prefix(*get_program()) << program_name_ <<
@@ -1608,7 +1608,7 @@ void t_cpp_generator::generate_service(t_service* tservice) {
"#include \"" << get_include_prefix(*get_program()) << svcname << ".h\"" << endl;
if (gen_cob_style_) {
f_service_ <<
- "#include \"async/TAsyncChannel.h\"" << endl;
+ "#include \"thrift/async/TAsyncChannel.h\"" << endl;
}
if (gen_templates_) {
f_service_ <<
@@ -1630,7 +1630,7 @@ void t_cpp_generator::generate_service(t_service* tservice) {
if (gen_cob_style_) {
f_service_tcc_ <<
- "#include \"async/TAsyncChannel.h\"" << endl;
+ "#include \"thrift/async/TAsyncChannel.h\"" << endl;
}
}
@@ -1974,8 +1974,8 @@ void t_cpp_generator::generate_service_async_skeleton(t_service* tservice) {
"// that would otherwise introduce unwanted latency." << endl <<
endl <<
"#include \"" << get_include_prefix(*get_program()) << svcname << ".h\"" << endl <<
- "#include <protocol/TBinaryProtocol.h>" << endl <<
- "#include <async/TEventServer.h>" << endl <<
+ "#include <thrift/protocol/TBinaryProtocol.h>" << endl <<
+ "#include <thrift/async/TEventServer.h>" << endl <<
endl <<
"using namespace ::apache::thrift;" << endl <<
"using namespace ::apache::thrift::protocol;" << endl <<
@@ -3703,10 +3703,10 @@ void t_cpp_generator::generate_service_skeleton(t_service* tservice) {
"// You should copy it to another filename to avoid overwriting it." << endl <<
endl <<
"#include \"" << get_include_prefix(*get_program()) << svcname << ".h\"" << endl <<
- "#include <protocol/TBinaryProtocol.h>" << endl <<
- "#include <server/TSimpleServer.h>" << endl <<
- "#include <transport/TServerSocket.h>" << endl <<
- "#include <transport/TBufferTransports.h>" << endl <<
+ "#include <thrift/protocol/TBinaryProtocol.h>" << endl <<
+ "#include <thrift/server/TSimpleServer.h>" << endl <<
+ "#include <thrift/transport/TServerSocket.h>" << endl <<
+ "#include <thrift/transport/TBufferTransports.h>" << endl <<
endl <<
"using namespace ::apache::thrift;" << endl <<
"using namespace ::apache::thrift::protocol;" << endl <<
@@ -1,8 +1,8 @@
#include <tr1/functional>
-#include "protocol/TBinaryProtocol.h"
-#include "async/TAsyncProtocolProcessor.h"
-#include "async/TEvhttpServer.h"
-#include "async/TEvhttpClientChannel.h"
+#include <thrift/protocol/TBinaryProtocol.h>
+#include <thrift/async/TAsyncProtocolProcessor.h>
+#include <thrift/async/TEvhttpServer.h>
+#include <thrift/async/TEvhttpClientChannel.h>
#include "Aggr.h"
using std::tr1::bind;
@@ -17,7 +17,7 @@
* under the License.
*/
-#include <server/TClientInfo.h>
+#include <thrift/server/TClientInfo.h>
namespace apache { namespace thrift { namespace server {
Oops, something went wrong.

0 comments on commit 49ff8b1

Please sign in to comment.