You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@thrift.apache.org by ro...@apache.org on 2012/04/14 13:03:44 UTC
svn commit: r1326087 - in /thrift/trunk/lib/cpp: ./ src/thrift/async/
src/thrift/concurrency/ src/thrift/protocol/ src/thrift/transport/
Author: roger
Date: Sat Apr 14 11:03:43 2012
New Revision: 1326087
URL: http://svn.apache.org/viewvc?rev=1326087&view=rev
Log:
THRIFT-1552 Thrift (cpp) include files shouldn't require adding "thrift" to the compilers include path
Some additional fixes to build it on windows as well
Patch: Benoit Dion and Roger Meier
Modified:
thrift/trunk/lib/cpp/libthrift.vcxproj
thrift/trunk/lib/cpp/libthriftnb.vcxproj (contents, props changed)
thrift/trunk/lib/cpp/src/thrift/async/TAsyncChannel.cpp
thrift/trunk/lib/cpp/src/thrift/async/TAsyncChannel.h
thrift/trunk/lib/cpp/src/thrift/concurrency/ThreadManager.h
thrift/trunk/lib/cpp/src/thrift/protocol/TDenseProtocol.cpp
thrift/trunk/lib/cpp/src/thrift/transport/TTransportException.cpp
Modified: thrift/trunk/lib/cpp/libthrift.vcxproj
URL: http://svn.apache.org/viewvc/thrift/trunk/lib/cpp/libthrift.vcxproj?rev=1326087&r1=1326086&r2=1326087&view=diff
==============================================================================
--- thrift/trunk/lib/cpp/libthrift.vcxproj (original)
+++ thrift/trunk/lib/cpp/libthrift.vcxproj Sat Apr 14 11:03:43 2012
@@ -252,16 +252,16 @@
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <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>
+ <IncludePath>$(ProjectDir)\src\;$(ProjectDir)\src\thrift\windows\;$(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\;$(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\;$(ProjectDir)\src\thrift\windows\;$(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\;$(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\;$(ProjectDir)\src\thrift\windows\;$(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\$(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\;$(ProjectDir)\src\thrift\windows\;$(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>
@@ -328,4 +328,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
Modified: thrift/trunk/lib/cpp/libthriftnb.vcxproj
URL: http://svn.apache.org/viewvc/thrift/trunk/lib/cpp/libthriftnb.vcxproj?rev=1326087&r1=1326086&r2=1326087&view=diff
==============================================================================
--- thrift/trunk/lib/cpp/libthriftnb.vcxproj (original)
+++ thrift/trunk/lib/cpp/libthriftnb.vcxproj Sat Apr 14 11:03:43 2012
@@ -100,16 +100,16 @@
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <IncludePath>$(ProjectDir)\src\;$(THIRD_PARTY)\boost\boost_1_47_0\include;$(THIRD_PARTY)\boost\boost_1_47_0\;$(THIRD_PARTY)\libevent\libevent-2.0.13-stable\WIN32-Code\;$(THIRD_PARTY)\libevent\libevent-2.0.13-stable\include;$(THIRD_PARTY)\libevent\libevent-2.0.13-stable\;$(IncludePath)</IncludePath>
+ <IncludePath>$(ProjectDir)\src\;$(ProjectDir)\src\thrift\windows\;$(THIRD_PARTY)\boost\boost_1_47_0\include;$(THIRD_PARTY)\boost\boost_1_47_0\;$(THIRD_PARTY)\libevent\libevent-2.0.13-stable\WIN32-Code\;$(THIRD_PARTY)\libevent\libevent-2.0.13-stable\include;$(THIRD_PARTY)\libevent\libevent-2.0.13-stable\;$(IncludePath)</IncludePath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <IncludePath>$(ProjectDir)\src\;$(THIRD_PARTY)\boost\boost_1_47_0\include;$(THIRD_PARTY)\boost\boost_1_47_0\;$(THIRD_PARTY)\libevent\libevent-2.0.13-stable\WIN32-Code\;$(THIRD_PARTY)\libevent\libevent-2.0.13-stable\include;$(THIRD_PARTY)\libevent\libevent-2.0.13-stable\;$(IncludePath)</IncludePath>
+ <IncludePath>$(ProjectDir)\src\;$(ProjectDir)\src\thrift\windows\;$(THIRD_PARTY)\boost\boost_1_47_0\include;$(THIRD_PARTY)\boost\boost_1_47_0\;$(THIRD_PARTY)\libevent\libevent-2.0.13-stable\WIN32-Code\;$(THIRD_PARTY)\libevent\libevent-2.0.13-stable\include;$(THIRD_PARTY)\libevent\libevent-2.0.13-stable\;$(IncludePath)</IncludePath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <IncludePath>$(ProjectDir)\src\;$(THIRD_PARTY)\boost\boost_1_47_0\include;$(THIRD_PARTY)\boost\boost_1_47_0\;$(THIRD_PARTY)\libevent\libevent-2.0.13-stable\WIN32-Code\;$(THIRD_PARTY)\libevent\libevent-2.0.13-stable\include;$(THIRD_PARTY)\libevent\libevent-2.0.13-stable\;$(IncludePath)</IncludePath>
+ <IncludePath>$(ProjectDir)\src\;$(ProjectDir)\src\thrift\windows\;$(THIRD_PARTY)\boost\boost_1_47_0\include;$(THIRD_PARTY)\boost\boost_1_47_0\;$(THIRD_PARTY)\libevent\libevent-2.0.13-stable\WIN32-Code\;$(THIRD_PARTY)\libevent\libevent-2.0.13-stable\include;$(THIRD_PARTY)\libevent\libevent-2.0.13-stable\;$(IncludePath)</IncludePath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <IncludePath>$(ProjectDir)\src\;$(THIRD_PARTY)\boost\boost_1_47_0\include;$(THIRD_PARTY)\boost\boost_1_47_0\;$(THIRD_PARTY)\libevent\libevent-2.0.13-stable\WIN32-Code\;$(THIRD_PARTY)\libevent\libevent-2.0.13-stable\include;$(THIRD_PARTY)\libevent\libevent-2.0.13-stable\;$(IncludePath)</IncludePath>
+ <IncludePath>$(ProjectDir)\src\;$(ProjectDir)\src\thrift\windows\;$(THIRD_PARTY)\boost\boost_1_47_0\include;$(THIRD_PARTY)\boost\boost_1_47_0\;$(THIRD_PARTY)\libevent\libevent-2.0.13-stable\WIN32-Code\;$(THIRD_PARTY)\libevent\libevent-2.0.13-stable\include;$(THIRD_PARTY)\libevent\libevent-2.0.13-stable\;$(IncludePath)</IncludePath>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
@@ -117,7 +117,7 @@
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
- <PreprocessorDefinitions>WIN32;HAVE_CONFIG_H;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ForcedIncludeFiles>thrift\windows\force_inc.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
<ProgramDataBaseFileName>$(IntDir)libthriftnb.pdb</ProgramDataBaseFileName>
</ClCompile>
@@ -132,7 +132,7 @@
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
- <PreprocessorDefinitions>WIN32;HAVE_CONFIG_H;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ForcedIncludeFiles>thrift\windows\force_inc.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
</ClCompile>
<Link>
@@ -148,7 +148,7 @@
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
- <PreprocessorDefinitions>WIN32;HAVE_CONFIG_H;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ForcedIncludeFiles>thrift\windows\force_inc.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
<ProgramDataBaseFileName>$(IntDir)libthriftnb.pdb</ProgramDataBaseFileName>
</ClCompile>
@@ -167,7 +167,7 @@
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
- <PreprocessorDefinitions>WIN32;HAVE_CONFIG_H;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ForcedIncludeFiles>thrift\windows\force_inc.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
</ClCompile>
<Link>
Propchange: thrift/trunk/lib/cpp/libthriftnb.vcxproj
------------------------------------------------------------------------------
svn:executable = *
Modified: thrift/trunk/lib/cpp/src/thrift/async/TAsyncChannel.cpp
URL: http://svn.apache.org/viewvc/thrift/trunk/lib/cpp/src/thrift/async/TAsyncChannel.cpp?rev=1326087&r1=1326086&r2=1326087&view=diff
==============================================================================
--- thrift/trunk/lib/cpp/src/thrift/async/TAsyncChannel.cpp (original)
+++ thrift/trunk/lib/cpp/src/thrift/async/TAsyncChannel.cpp Sat Apr 14 11:03:43 2012
@@ -18,7 +18,7 @@
*/
#include <thrift/async/TAsyncChannel.h>
-#include <thrift/windows/tr1/functional>
+#include <tr1/functional>
namespace apache { namespace thrift { namespace async {
Modified: thrift/trunk/lib/cpp/src/thrift/async/TAsyncChannel.h
URL: http://svn.apache.org/viewvc/thrift/trunk/lib/cpp/src/thrift/async/TAsyncChannel.h?rev=1326087&r1=1326086&r2=1326087&view=diff
==============================================================================
--- thrift/trunk/lib/cpp/src/thrift/async/TAsyncChannel.h (original)
+++ thrift/trunk/lib/cpp/src/thrift/async/TAsyncChannel.h Sat Apr 14 11:03:43 2012
@@ -20,7 +20,7 @@
#ifndef _THRIFT_ASYNC_TASYNCCHANNEL_H_
#define _THRIFT_ASYNC_TASYNCCHANNEL_H_ 1
-#include <thrift/windows/tr1/functional>
+#include <tr1/functional>
#include <thrift/Thrift.h>
namespace apache { namespace thrift { namespace transport {
Modified: thrift/trunk/lib/cpp/src/thrift/concurrency/ThreadManager.h
URL: http://svn.apache.org/viewvc/thrift/trunk/lib/cpp/src/thrift/concurrency/ThreadManager.h?rev=1326087&r1=1326086&r2=1326087&view=diff
==============================================================================
--- thrift/trunk/lib/cpp/src/thrift/concurrency/ThreadManager.h (original)
+++ thrift/trunk/lib/cpp/src/thrift/concurrency/ThreadManager.h Sat Apr 14 11:03:43 2012
@@ -21,7 +21,7 @@
#define _THRIFT_CONCURRENCY_THREADMANAGER_H_ 1
#include <boost/shared_ptr.hpp>
-#include <thrift/windows/tr1/functional>
+#include <tr1/functional>
#include <sys/types.h>
#include "Thread.h"
Modified: thrift/trunk/lib/cpp/src/thrift/protocol/TDenseProtocol.cpp
URL: http://svn.apache.org/viewvc/thrift/trunk/lib/cpp/src/thrift/protocol/TDenseProtocol.cpp?rev=1326087&r1=1326086&r2=1326087&view=diff
==============================================================================
--- thrift/trunk/lib/cpp/src/thrift/protocol/TDenseProtocol.cpp (original)
+++ thrift/trunk/lib/cpp/src/thrift/protocol/TDenseProtocol.cpp Sat Apr 14 11:03:43 2012
@@ -89,8 +89,8 @@ absent and prefix them with an 0x01 byte
#define __STDC_LIMIT_MACROS
#include <stdint.h>
-#include "TDenseProtocol.h"
-#include "thrift/TReflectionLocal.h"
+#include <thrift/protocol/TDenseProtocol.h>
+#include <thrift/TReflectionLocal.h>
// Leaving this on for now. Disabling it will turn off asserts, which should
// give a performance boost. When we have *really* thorough test cases,
Modified: thrift/trunk/lib/cpp/src/thrift/transport/TTransportException.cpp
URL: http://svn.apache.org/viewvc/thrift/trunk/lib/cpp/src/thrift/transport/TTransportException.cpp?rev=1326087&r1=1326086&r2=1326087&view=diff
==============================================================================
--- thrift/trunk/lib/cpp/src/thrift/transport/TTransportException.cpp (original)
+++ thrift/trunk/lib/cpp/src/thrift/transport/TTransportException.cpp Sat Apr 14 11:03:43 2012
@@ -20,7 +20,7 @@
#include <thrift/transport/TTransportException.h>
#include <boost/lexical_cast.hpp>
#include <cstring>
-#include <thrift/windows/config.h>
+#include <config.h>
using std::string;
using boost::lexical_cast;