Merge branch 'trunk' of https://github.com/benoitdion/thrift into trunk
git-svn-id: https://svn.apache.org/repos/asf/thrift/trunk@1326086 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/lib/cpp/libthrift.vcxproj b/lib/cpp/libthrift.vcxproj
index 4a28573..bc5f0be 100644
--- a/lib/cpp/libthrift.vcxproj
+++ b/lib/cpp/libthrift.vcxproj
@@ -19,192 +19,192 @@
</ProjectConfiguration>
</ItemGroup>
<ItemGroup>
- <ClCompile Include="src\thrift\thrift\async\TAsyncChannel.cpp">
+ <ClCompile Include="src\thrift\async\TAsyncChannel.cpp">
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="src\thrift\thrift\concurrency\BoostMonitor.cpp" />
- <ClCompile Include="src\thrift\thrift\concurrency\BoostMutex.cpp" />
- <ClCompile Include="src\thrift\thrift\concurrency\BoostThreadFactory.cpp" />
- <ClCompile Include="src\thrift\thrift\concurrency\ThreadManager.cpp">
+ <ClCompile Include="src\thrift\concurrency\BoostMonitor.cpp" />
+ <ClCompile Include="src\thrift\concurrency\BoostMutex.cpp" />
+ <ClCompile Include="src\thrift\concurrency\BoostThreadFactory.cpp" />
+ <ClCompile Include="src\thrift\concurrency\ThreadManager.cpp">
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="src\thrift\thrift\concurrency\TimerManager.cpp">
+ <ClCompile Include="src\thrift\concurrency\TimerManager.cpp">
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="src\thrift\thrift\concurrency\Util.cpp">
+ <ClCompile Include="src\thrift\concurrency\Util.cpp">
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="src\thrift\thrift\processor\PeekProcessor.cpp">
+ <ClCompile Include="src\thrift\processor\PeekProcessor.cpp">
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="src\thrift\thrift\protocol\TBase64Utils.cpp" />
- <ClCompile Include="src\thrift\thrift\protocol\TDebugProtocol.cpp">
+ <ClCompile Include="src\thrift\protocol\TBase64Utils.cpp" />
+ <ClCompile Include="src\thrift\protocol\TDebugProtocol.cpp">
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="src\thrift\thrift\protocol\TDenseProtocol.cpp">
+ <ClCompile Include="src\thrift\protocol\TDenseProtocol.cpp">
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="src\thrift\thrift\protocol\TJSONProtocol.cpp">
+ <ClCompile Include="src\thrift\protocol\TJSONProtocol.cpp">
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="src\thrift\thrift\server\TSimpleServer.cpp">
+ <ClCompile Include="src\thrift\server\TSimpleServer.cpp">
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="src\thrift\thrift\server\TThreadPoolServer.cpp">
+ <ClCompile Include="src\thrift\server\TThreadPoolServer.cpp">
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="src\thrift\thrift\TApplicationException.cpp">
+ <ClCompile Include="src\thrift\TApplicationException.cpp">
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="src\thrift\thrift\Thrift.cpp">
+ <ClCompile Include="src\thrift\Thrift.cpp">
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="src\thrift\thrift\transport\TBufferTransports.cpp">
+ <ClCompile Include="src\thrift\transport\TBufferTransports.cpp">
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="src\thrift\thrift\transport\TFDTransport.cpp" />
- <ClCompile Include="src\thrift\thrift\transport\TFileTransport.cpp">
+ <ClCompile Include="src\thrift\transport\TFDTransport.cpp" />
+ <ClCompile Include="src\thrift\transport\TFileTransport.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile>
- <ClCompile Include="src\thrift\thrift\transport\THttpClient.cpp" />
- <ClCompile Include="src\thrift\thrift\transport\THttpServer.cpp" />
- <ClCompile Include="src\thrift\thrift\transport\THttpTransport.cpp">
+ <ClCompile Include="src\thrift\transport\THttpClient.cpp" />
+ <ClCompile Include="src\thrift\transport\THttpServer.cpp" />
+ <ClCompile Include="src\thrift\transport\THttpTransport.cpp">
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="src\thrift\thrift\transport\TPipe.cpp" />
- <ClCompile Include="src\thrift\thrift\transport\TPipeServer.cpp" />
- <ClCompile Include="src\thrift\thrift\transport\TServerSocket.cpp">
+ <ClCompile Include="src\thrift\transport\TPipe.cpp" />
+ <ClCompile Include="src\thrift\transport\TPipeServer.cpp" />
+ <ClCompile Include="src\thrift\transport\TServerSocket.cpp">
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="src\thrift\thrift\transport\TSimpleFileTransport.cpp" />
- <ClCompile Include="src\thrift\thrift\transport\TSocket.cpp">
+ <ClCompile Include="src\thrift\transport\TSimpleFileTransport.cpp" />
+ <ClCompile Include="src\thrift\transport\TSocket.cpp">
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="src\thrift\thrift\transport\TSSLSocket.cpp">
+ <ClCompile Include="src\thrift\transport\TSSLSocket.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile>
- <ClCompile Include="src\thrift\thrift\transport\TTransportException.cpp">
+ <ClCompile Include="src\thrift\transport\TTransportException.cpp">
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="src\thrift\thrift\transport\TTransportUtils.cpp">
+ <ClCompile Include="src\thrift\transport\TTransportUtils.cpp">
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <ClCompile Include="src\thrift\thrift\windows\GetTimeOfDay.cpp" />
- <ClCompile Include="src\thrift\thrift\windows\SocketPair.cpp" />
- <ClCompile Include="src\thrift\thrift\windows\StdAfx.cpp">
+ <ClCompile Include="src\thrift\windows\GetTimeOfDay.cpp" />
+ <ClCompile Include="src\thrift\windows\SocketPair.cpp" />
+ <ClCompile Include="src\thrift\windows\StdAfx.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
</ClCompile>
- <ClCompile Include="src\thrift\thrift\windows\TWinsockSingleton.cpp" />
- <ClCompile Include="src\thrift\thrift\windows\WinFcntl.cpp" />
+ <ClCompile Include="src\thrift\windows\TWinsockSingleton.cpp" />
+ <ClCompile Include="src\thrift\windows\WinFcntl.cpp" />
</ItemGroup>
<ItemGroup>
- <ClInclude Include="src\thrift\thrift\async\TAsyncChannel.h" />
- <ClInclude Include="src\thrift\thrift\concurrency\BoostThreadFactory.h" />
- <ClInclude Include="src\thrift\thrift\concurrency\Exception.h" />
- <ClInclude Include="src\thrift\thrift\concurrency\PlatformThreadFactory.h" />
- <ClInclude Include="src\thrift\thrift\processor\PeekProcessor.h" />
- <ClInclude Include="src\thrift\thrift\protocol\TBinaryProtocol.h" />
- <ClInclude Include="src\thrift\thrift\protocol\TDebugProtocol.h" />
- <ClInclude Include="src\thrift\thrift\protocol\TDenseProtocol.h" />
- <ClInclude Include="src\thrift\thrift\protocol\TJSONProtocol.h" />
- <ClInclude Include="src\thrift\thrift\protocol\TProtocol.h" />
- <ClInclude Include="src\thrift\thrift\protocol\TVirtualProtocol.h" />
- <ClInclude Include="src\thrift\thrift\server\TServer.h" />
- <ClInclude Include="src\thrift\thrift\server\TSimpleServer.h" />
- <ClInclude Include="src\thrift\thrift\server\TThreadPoolServer.h" />
- <ClInclude Include="src\thrift\thrift\TApplicationException.h" />
- <ClInclude Include="src\thrift\thrift\Thrift.h" />
- <ClInclude Include="src\thrift\thrift\TProcessor.h" />
- <ClInclude Include="src\thrift\thrift\transport\TBufferTransports.h" />
- <ClInclude Include="src\thrift\thrift\transport\TFDTransport.h" />
- <ClInclude Include="src\thrift\thrift\transport\TFileTransport.h" />
- <ClInclude Include="src\thrift\thrift\transport\THttpClient.h" />
- <ClInclude Include="src\thrift\thrift\transport\THttpServer.h" />
- <ClInclude Include="src\thrift\thrift\transport\TPipe.h" />
- <ClInclude Include="src\thrift\thrift\transport\TPipeServer.h" />
- <ClInclude Include="src\thrift\thrift\transport\TServerSocket.h" />
- <ClInclude Include="src\thrift\thrift\transport\TServerTransport.h" />
- <ClInclude Include="src\thrift\thrift\transport\TSimpleFileTransport.h" />
- <ClInclude Include="src\thrift\thrift\transport\TSocket.h" />
- <ClInclude Include="src\thrift\thrift\transport\TSSLSocket.h" />
- <ClInclude Include="src\thrift\thrift\transport\TTransport.h" />
- <ClInclude Include="src\thrift\thrift\transport\TTransportException.h" />
- <ClInclude Include="src\thrift\thrift\transport\TTransportUtils.h" />
- <ClInclude Include="src\thrift\thrift\transport\TVirtualTransport.h" />
- <ClInclude Include="src\thrift\thrift\windows\config.h" />
- <ClInclude Include="src\thrift\thrift\windows\force_inc.h" />
- <ClInclude Include="src\thrift\thrift\windows\GetTimeOfDay.h" />
- <ClInclude Include="src\thrift\thrift\windows\Operators.h" />
- <ClInclude Include="src\thrift\thrift\windows\SocketPair.h" />
- <ClInclude Include="src\thrift\thrift\windows\StdAfx.h" />
- <ClInclude Include="src\thrift\thrift\windows\TargetVersion.h" />
- <ClInclude Include="src\thrift\thrift\windows\TWinsockSingleton.h" />
- <ClInclude Include="src\thrift\thrift\windows\WinFcntl.h" />
+ <ClInclude Include="src\thrift\async\TAsyncChannel.h" />
+ <ClInclude Include="src\thrift\concurrency\BoostThreadFactory.h" />
+ <ClInclude Include="src\thrift\concurrency\Exception.h" />
+ <ClInclude Include="src\thrift\concurrency\PlatformThreadFactory.h" />
+ <ClInclude Include="src\thrift\processor\PeekProcessor.h" />
+ <ClInclude Include="src\thrift\protocol\TBinaryProtocol.h" />
+ <ClInclude Include="src\thrift\protocol\TDebugProtocol.h" />
+ <ClInclude Include="src\thrift\protocol\TDenseProtocol.h" />
+ <ClInclude Include="src\thrift\protocol\TJSONProtocol.h" />
+ <ClInclude Include="src\thrift\protocol\TProtocol.h" />
+ <ClInclude Include="src\thrift\protocol\TVirtualProtocol.h" />
+ <ClInclude Include="src\thrift\server\TServer.h" />
+ <ClInclude Include="src\thrift\server\TSimpleServer.h" />
+ <ClInclude Include="src\thrift\server\TThreadPoolServer.h" />
+ <ClInclude Include="src\thrift\TApplicationException.h" />
+ <ClInclude Include="src\thrift\Thrift.h" />
+ <ClInclude Include="src\thrift\TProcessor.h" />
+ <ClInclude Include="src\thrift\transport\TBufferTransports.h" />
+ <ClInclude Include="src\thrift\transport\TFDTransport.h" />
+ <ClInclude Include="src\thrift\transport\TFileTransport.h" />
+ <ClInclude Include="src\thrift\transport\THttpClient.h" />
+ <ClInclude Include="src\thrift\transport\THttpServer.h" />
+ <ClInclude Include="src\thrift\transport\TPipe.h" />
+ <ClInclude Include="src\thrift\transport\TPipeServer.h" />
+ <ClInclude Include="src\thrift\transport\TServerSocket.h" />
+ <ClInclude Include="src\thrift\transport\TServerTransport.h" />
+ <ClInclude Include="src\thrift\transport\TSimpleFileTransport.h" />
+ <ClInclude Include="src\thrift\transport\TSocket.h" />
+ <ClInclude Include="src\thrift\transport\TSSLSocket.h" />
+ <ClInclude Include="src\thrift\transport\TTransport.h" />
+ <ClInclude Include="src\thrift\transport\TTransportException.h" />
+ <ClInclude Include="src\thrift\transport\TTransportUtils.h" />
+ <ClInclude Include="src\thrift\transport\TVirtualTransport.h" />
+ <ClInclude Include="src\thrift\windows\config.h" />
+ <ClInclude Include="src\thrift\windows\force_inc.h" />
+ <ClInclude Include="src\thrift\windows\GetTimeOfDay.h" />
+ <ClInclude Include="src\thrift\windows\Operators.h" />
+ <ClInclude Include="src\thrift\windows\SocketPair.h" />
+ <ClInclude Include="src\thrift\windows\StdAfx.h" />
+ <ClInclude Include="src\thrift\windows\TargetVersion.h" />
+ <ClInclude Include="src\thrift\windows\TWinsockSingleton.h" />
+ <ClInclude Include="src\thrift\windows\WinFcntl.h" />
</ItemGroup>
<ItemGroup>
- <None Include="src\thrift\thrift\protocol\TBinaryProtocol.tcc" />
- <None Include="src\thrift\thrift\windows\tr1\functional" />
+ <None Include="src\thrift\protocol\TBinaryProtocol.tcc" />
+ <None Include="src\thrift\windows\tr1\functional" />
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{DD26F57E-60F2-4F37-A616-D219A9BF338F}</ProjectGuid>
@@ -252,16 +252,16 @@
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <IncludePath>$(ProjectDir)\src\thrift\;$(ProjectDir)\src\windows\;$(ProjectDir)\src\transport\;$(THIRD_PARTY)\boost\boost_1_47_0\include;$(THIRD_PARTY)\boost\boost_1_47_0\;$(THIRD_PARTY)\openssl\OpenSSL-Win32\include\;..\..\..\..\boost;..\..\..\..\boost\boost;$(IncludePath)</IncludePath>
+ <IncludePath>$(ProjectDir)\src\;$(THIRD_PARTY)\boost\boost_1_47_0\include;$(THIRD_PARTY)\boost\boost_1_47_0\;$(THIRD_PARTY)\openssl\OpenSSL-Win32\include\;$(IncludePath)</IncludePath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <IncludePath>$(ProjectDir)\src\thrift\;$(ProjectDir)\src\windows\;$(ProjectDir)\src\transport\;$(THIRD_PARTY)\boost\boost_1_47_0\include;$(THIRD_PARTY)\boost\boost_1_47_0\;$(THIRD_PARTY)\openssl\OpenSSL-Win32\include\;$(IncludePath)</IncludePath>
+ <IncludePath>$(ProjectDir)\src\;$(THIRD_PARTY)\boost\boost_1_47_0\include;$(THIRD_PARTY)\boost\boost_1_47_0\;$(THIRD_PARTY)\openssl\OpenSSL-Win32\include\;$(IncludePath)</IncludePath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <IncludePath>$(ProjectDir)\src\thrift\;$(ProjectDir)\src\windows\;$(ProjectDir)\src\transport\;$(THIRD_PARTY)\boost\boost_1_47_0\include;$(THIRD_PARTY)\boost\boost_1_47_0\;$(THIRD_PARTY)\openssl\OpenSSL-Win32\include\;..\..\..\..\boost;..\..\..\..\boost\boost;$(IncludePath)</IncludePath>
+ <IncludePath>$(ProjectDir)\src\;$(THIRD_PARTY)\boost\boost_1_47_0\include;$(THIRD_PARTY)\boost\boost_1_47_0\;$(THIRD_PARTY)\openssl\OpenSSL-Win32\include\;$(IncludePath)</IncludePath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <IncludePath>$(ProjectDir)\src\thrift\;$(ProjectDir)\src\windows\;$(ProjectDir)\src\transport\;$(THIRD_PARTY)\boost\boost_1_47_0\include;$(THIRD_PARTY)\boost\boost_1_47_0\;$(THIRD_PARTY)\openssl\OpenSSL-Win32\include\;$(IncludePath)</IncludePath>
+ <IncludePath>$(ProjectDir)\src\$(THIRD_PARTY)\boost\boost_1_47_0\include;$(THIRD_PARTY)\boost\boost_1_47_0\;$(THIRD_PARTY)\openssl\OpenSSL-Win32\include\;$(IncludePath)</IncludePath>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
@@ -269,7 +269,7 @@
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <ForcedIncludeFiles>force_inc.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
+ <ForcedIncludeFiles>thrift\windows\force_inc.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
<ProgramDataBaseFileName>$(IntDir)libthrift.pdb</ProgramDataBaseFileName>
</ClCompile>
<Link>
@@ -283,7 +283,7 @@
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <ForcedIncludeFiles>force_inc.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
+ <ForcedIncludeFiles>thrift\windows\force_inc.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
@@ -298,7 +298,7 @@
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <ForcedIncludeFiles>force_inc.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
+ <ForcedIncludeFiles>thrift\windows\force_inc.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
<ProgramDataBaseFileName>$(IntDir)libthrift.pdb</ProgramDataBaseFileName>
</ClCompile>
<Link>
@@ -316,7 +316,7 @@
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <ForcedIncludeFiles>force_inc.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
+ <ForcedIncludeFiles>thrift\windows\force_inc.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
@@ -328,4 +328,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
+</Project>
\ No newline at end of file