Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

THRIFT-1552 Thrift (cpp) include files shouldn't require adding "thri…

…ft" to the compilers include path.

roger: some additional fixes

git-svn-id: https://svn.apache.org/repos/asf/thrift/trunk@1325677 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information...
commit 33eaa0f10038d427d6f62d72235af314bc27b930 1 parent 49ff8b1
@bufferoverflow bufferoverflow authored
View
2  lib/cpp/Makefile.am
@@ -101,7 +101,7 @@ libthriftnb_la_SOURCES = src/thrift/server/TNonblockingServer.cpp \
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
View
2  lib/cpp/src/thrift/async/TAsyncProcessor.h
@@ -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 {
View
4 lib/cpp/src/thrift/qt/TQIODeviceTransport.cpp 100644 → 100755
@@ -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>
View
2  lib/cpp/src/thrift/transport/TShortReadTransport.h 100644 → 100755
@@ -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>
View
2  lib/cpp/test/AllProtocolTests.tcc 100644 → 100755
@@ -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>
View
2  test/cpp/src/StressTest.cpp
@@ -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"
View
2  test/cpp/src/StressTestNonBlocking.cpp
@@ -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"
Please sign in to comment.
Something went wrong with that request. Please try again.