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/13 11:13:14 UTC
svn commit: r1325677 - in /thrift/trunk: lib/cpp/ lib/cpp/src/thrift/async/
lib/cpp/src/thrift/qt/ lib/cpp/src/thrift/transport/ lib/cpp/test/
test/cpp/src/
Author: roger
Date: Fri Apr 13 09:13:13 2012
New Revision: 1325677
URL: http://svn.apache.org/viewvc?rev=1325677&view=rev
Log:
THRIFT-1552 Thrift (cpp) include files shouldn't require adding "thrift" to the compilers include path.
roger: some additional fixes
Modified:
thrift/trunk/lib/cpp/Makefile.am
thrift/trunk/lib/cpp/src/thrift/async/TAsyncProcessor.h
thrift/trunk/lib/cpp/src/thrift/qt/TQIODeviceTransport.cpp (contents, props changed)
thrift/trunk/lib/cpp/src/thrift/transport/TShortReadTransport.h (contents, props changed)
thrift/trunk/lib/cpp/test/AllProtocolTests.tcc (contents, props changed)
thrift/trunk/test/cpp/src/StressTest.cpp
thrift/trunk/test/cpp/src/StressTestNonBlocking.cpp
Modified: thrift/trunk/lib/cpp/Makefile.am
URL: http://svn.apache.org/viewvc/thrift/trunk/lib/cpp/Makefile.am?rev=1325677&r1=1325676&r2=1325677&view=diff
==============================================================================
--- thrift/trunk/lib/cpp/Makefile.am (original)
+++ thrift/trunk/lib/cpp/Makefile.am Fri Apr 13 09:13:13 2012
@@ -101,7 +101,7 @@ libthriftnb_la_SOURCES = src/thrift/serv
libthriftz_la_SOURCES = src/thrift/transport/TZlibTransport.cpp
-libthriftqt_la_MOC = src/qt/moc_TQTcpServer.cpp
+libthriftqt_la_MOC = src/thrift/qt/moc_TQTcpServer.cpp
libthriftqt_la_SOURCES = $(libthriftqt_la_MOC) \
src/thrift/qt/TQIODeviceTransport.cpp \
src/thrift/qt/TQTcpServer.cpp
Modified: thrift/trunk/lib/cpp/src/thrift/async/TAsyncProcessor.h
URL: http://svn.apache.org/viewvc/thrift/trunk/lib/cpp/src/thrift/async/TAsyncProcessor.h?rev=1325677&r1=1325676&r2=1325677&view=diff
==============================================================================
--- thrift/trunk/lib/cpp/src/thrift/async/TAsyncProcessor.h (original)
+++ thrift/trunk/lib/cpp/src/thrift/async/TAsyncProcessor.h Fri Apr 13 09:13:13 2012
@@ -23,7 +23,7 @@
#include <tr1/functional>
#include <boost/shared_ptr.hpp>
#include <thrift/protocol/TProtocol.h>
-#include <TProcessor.h>
+#include <thrift/TProcessor.h>
namespace apache { namespace thrift { namespace async {
Modified: thrift/trunk/lib/cpp/src/thrift/qt/TQIODeviceTransport.cpp
URL: http://svn.apache.org/viewvc/thrift/trunk/lib/cpp/src/thrift/qt/TQIODeviceTransport.cpp?rev=1325677&r1=1325676&r2=1325677&view=diff
==============================================================================
--- thrift/trunk/lib/cpp/src/thrift/qt/TQIODeviceTransport.cpp (original)
+++ thrift/trunk/lib/cpp/src/thrift/qt/TQIODeviceTransport.cpp Fri Apr 13 09:13:13 2012
@@ -17,9 +17,9 @@
* under the License.
*/
-#include "TQIODeviceTransport.h"
+#include <thrift/qt/TQIODeviceTransport.h>
-#include <thrift/QAbstractSocket>
+#include <QAbstractSocket>
#include <QIODevice>
#include <thrift/transport/TBufferTransports.h>
Propchange: thrift/trunk/lib/cpp/src/thrift/qt/TQIODeviceTransport.cpp
------------------------------------------------------------------------------
svn:executable = *
Modified: thrift/trunk/lib/cpp/src/thrift/transport/TShortReadTransport.h
URL: http://svn.apache.org/viewvc/thrift/trunk/lib/cpp/src/thrift/transport/TShortReadTransport.h?rev=1325677&r1=1325676&r2=1325677&view=diff
==============================================================================
--- thrift/trunk/lib/cpp/src/thrift/transport/TShortReadTransport.h (original)
+++ thrift/trunk/lib/cpp/src/thrift/transport/TShortReadTransport.h Fri Apr 13 09:13:13 2012
@@ -20,7 +20,7 @@
#ifndef _THRIFT_TRANSPORT_TSHORTREADTRANSPORT_H_
#define _THRIFT_TRANSPORT_TSHORTREADTRANSPORT_H_ 1
-#include <thrift/cstdlib>
+#include <cstdlib>
#include <thrift/transport/TTransport.h>
#include <thrift/transport/TVirtualTransport.h>
Propchange: thrift/trunk/lib/cpp/src/thrift/transport/TShortReadTransport.h
------------------------------------------------------------------------------
svn:executable = *
Modified: thrift/trunk/lib/cpp/test/AllProtocolTests.tcc
URL: http://svn.apache.org/viewvc/thrift/trunk/lib/cpp/test/AllProtocolTests.tcc?rev=1325677&r1=1325676&r2=1325677&view=diff
==============================================================================
--- thrift/trunk/lib/cpp/test/AllProtocolTests.tcc (original)
+++ thrift/trunk/lib/cpp/test/AllProtocolTests.tcc Fri Apr 13 09:13:13 2012
@@ -20,7 +20,7 @@
#ifndef _THRIFT_TEST_GENERICPROTOCOLTEST_TCC_
#define _THRIFT_TEST_GENERICPROTOCOLTEST_TCC_ 1
-#include <thrift/limits>
+#include <limits>
#include <thrift/protocol/TBinaryProtocol.h>
#include <thrift/transport/TBufferTransports.h>
Propchange: thrift/trunk/lib/cpp/test/AllProtocolTests.tcc
------------------------------------------------------------------------------
svn:executable = *
Modified: thrift/trunk/test/cpp/src/StressTest.cpp
URL: http://svn.apache.org/viewvc/thrift/trunk/test/cpp/src/StressTest.cpp?rev=1325677&r1=1325676&r2=1325677&view=diff
==============================================================================
--- thrift/trunk/test/cpp/src/StressTest.cpp (original)
+++ thrift/trunk/test/cpp/src/StressTest.cpp Fri Apr 13 09:13:13 2012
@@ -30,7 +30,7 @@
#include <thrift/transport/TSocket.h>
#include <thrift/transport/TTransportUtils.h>
#include <thrift/transport/TFileTransport.h>
-#include <TLogging.h>
+#include <thrift/TLogging.h>
#include "Service.h"
Modified: thrift/trunk/test/cpp/src/StressTestNonBlocking.cpp
URL: http://svn.apache.org/viewvc/thrift/trunk/test/cpp/src/StressTestNonBlocking.cpp?rev=1325677&r1=1325676&r2=1325677&view=diff
==============================================================================
--- thrift/trunk/test/cpp/src/StressTestNonBlocking.cpp (original)
+++ thrift/trunk/test/cpp/src/StressTestNonBlocking.cpp Fri Apr 13 09:13:13 2012
@@ -31,7 +31,7 @@
#include <thrift/transport/TSocket.h>
#include <thrift/transport/TTransportUtils.h>
#include <thrift/transport/TFileTransport.h>
-#include <TLogging.h>
+#include <thrift/TLogging.h>
#include "Service.h"