From 33eaa0f10038d427d6f62d72235af314bc27b930 Mon Sep 17 00:00:00 2001
From: Roger Meier <roger@apache.org>
Date: Fri, 13 Apr 2012 09:13:13 +0000
Subject: [PATCH] THRIFT-1552 Thrift (cpp) include files shouldn't require
 adding "thrift" 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
---
 lib/cpp/Makefile.am                                | 2 +-
 lib/cpp/src/thrift/async/TAsyncProcessor.h         | 2 +-
 lib/cpp/src/thrift/qt/TQIODeviceTransport.cpp      | 4 ++--
 lib/cpp/src/thrift/transport/TShortReadTransport.h | 2 +-
 lib/cpp/test/AllProtocolTests.tcc                  | 2 +-
 test/cpp/src/StressTest.cpp                        | 2 +-
 test/cpp/src/StressTestNonBlocking.cpp             | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)
 mode change 100644 => 100755 lib/cpp/src/thrift/qt/TQIODeviceTransport.cpp
 mode change 100644 => 100755 lib/cpp/src/thrift/transport/TShortReadTransport.h
 mode change 100644 => 100755 lib/cpp/test/AllProtocolTests.tcc

diff --git a/lib/cpp/Makefile.am b/lib/cpp/Makefile.am
index 1eec8ab7..21480aba 100644
--- a/lib/cpp/Makefile.am
+++ b/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
diff --git a/lib/cpp/src/thrift/async/TAsyncProcessor.h b/lib/cpp/src/thrift/async/TAsyncProcessor.h
index 593ea69c..e68c550c 100644
--- a/lib/cpp/src/thrift/async/TAsyncProcessor.h
+++ b/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 {
 
diff --git a/lib/cpp/src/thrift/qt/TQIODeviceTransport.cpp b/lib/cpp/src/thrift/qt/TQIODeviceTransport.cpp
old mode 100644
new mode 100755
index 9344e40a..3a3e2224
--- a/lib/cpp/src/thrift/qt/TQIODeviceTransport.cpp
+++ b/lib/cpp/src/thrift/qt/TQIODeviceTransport.cpp
@@ -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>
diff --git a/lib/cpp/src/thrift/transport/TShortReadTransport.h b/lib/cpp/src/thrift/transport/TShortReadTransport.h
old mode 100644
new mode 100755
index b5cdc7dc..8def3543
--- a/lib/cpp/src/thrift/transport/TShortReadTransport.h
+++ b/lib/cpp/src/thrift/transport/TShortReadTransport.h
@@ -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>
diff --git a/lib/cpp/test/AllProtocolTests.tcc b/lib/cpp/test/AllProtocolTests.tcc
old mode 100644
new mode 100755
index 82f87381..9155da88
--- a/lib/cpp/test/AllProtocolTests.tcc
+++ b/lib/cpp/test/AllProtocolTests.tcc
@@ -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>
diff --git a/test/cpp/src/StressTest.cpp b/test/cpp/src/StressTest.cpp
index 5b0b3596..7da3db06 100755
--- a/test/cpp/src/StressTest.cpp
+++ b/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"
 
diff --git a/test/cpp/src/StressTestNonBlocking.cpp b/test/cpp/src/StressTestNonBlocking.cpp
index 4b9e29ed..c230c842 100755
--- a/test/cpp/src/StressTestNonBlocking.cpp
+++ b/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"
 
-- 
2.17.1