Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

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
Roger Meier bufferoverflow authored
2  lib/cpp/Makefile.am
@@ -101,7 +101,7 @@ libthriftnb_la_SOURCES = src/thrift/server/TNonblockingServer.cpp \
101 101
102 102 libthriftz_la_SOURCES = src/thrift/transport/TZlibTransport.cpp
103 103
104   -libthriftqt_la_MOC = src/qt/moc_TQTcpServer.cpp
  104 +libthriftqt_la_MOC = src/thrift/qt/moc_TQTcpServer.cpp
105 105 libthriftqt_la_SOURCES = $(libthriftqt_la_MOC) \
106 106 src/thrift/qt/TQIODeviceTransport.cpp \
107 107 src/thrift/qt/TQTcpServer.cpp
2  lib/cpp/src/thrift/async/TAsyncProcessor.h
@@ -23,7 +23,7 @@
23 23 #include <tr1/functional>
24 24 #include <boost/shared_ptr.hpp>
25 25 #include <thrift/protocol/TProtocol.h>
26   -#include <TProcessor.h>
  26 +#include <thrift/TProcessor.h>
27 27
28 28 namespace apache { namespace thrift { namespace async {
29 29
4 lib/cpp/src/thrift/qt/TQIODeviceTransport.cpp 100644 → 100755
@@ -17,9 +17,9 @@
17 17 * under the License.
18 18 */
19 19
20   -#include "TQIODeviceTransport.h"
  20 +#include <thrift/qt/TQIODeviceTransport.h>
21 21
22   -#include <thrift/QAbstractSocket>
  22 +#include <QAbstractSocket>
23 23 #include <QIODevice>
24 24
25 25 #include <thrift/transport/TBufferTransports.h>
2  lib/cpp/src/thrift/transport/TShortReadTransport.h 100644 → 100755
@@ -20,7 +20,7 @@
20 20 #ifndef _THRIFT_TRANSPORT_TSHORTREADTRANSPORT_H_
21 21 #define _THRIFT_TRANSPORT_TSHORTREADTRANSPORT_H_ 1
22 22
23   -#include <thrift/cstdlib>
  23 +#include <cstdlib>
24 24
25 25 #include <thrift/transport/TTransport.h>
26 26 #include <thrift/transport/TVirtualTransport.h>
2  lib/cpp/test/AllProtocolTests.tcc 100644 → 100755
@@ -20,7 +20,7 @@
20 20 #ifndef _THRIFT_TEST_GENERICPROTOCOLTEST_TCC_
21 21 #define _THRIFT_TEST_GENERICPROTOCOLTEST_TCC_ 1
22 22
23   -#include <thrift/limits>
  23 +#include <limits>
24 24
25 25 #include <thrift/protocol/TBinaryProtocol.h>
26 26 #include <thrift/transport/TBufferTransports.h>
2  test/cpp/src/StressTest.cpp
@@ -30,7 +30,7 @@
30 30 #include <thrift/transport/TSocket.h>
31 31 #include <thrift/transport/TTransportUtils.h>
32 32 #include <thrift/transport/TFileTransport.h>
33   -#include <TLogging.h>
  33 +#include <thrift/TLogging.h>
34 34
35 35 #include "Service.h"
36 36
2  test/cpp/src/StressTestNonBlocking.cpp
@@ -31,7 +31,7 @@
31 31 #include <thrift/transport/TSocket.h>
32 32 #include <thrift/transport/TTransportUtils.h>
33 33 #include <thrift/transport/TFileTransport.h>
34   -#include <TLogging.h>
  34 +#include <thrift/TLogging.h>
35 35
36 36 #include "Service.h"
37 37

0 comments on commit 33eaa0f

Please sign in to comment.
Something went wrong with that request. Please try again.