You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@thrift.apache.org by ns...@apache.org on 2016/01/18 19:40:53 UTC
[8/8] thrift git commit: THRIFT-3563: C++/Qt: removed usage of macro
QT_PREPEND_NAMESPACE() Client: C++ Patch: Sebastian Zenker
THRIFT-3563: C++/Qt: removed usage of macro QT_PREPEND_NAMESPACE()
Client: C++
Patch: Sebastian Zenker
This closes #801
Project: http://git-wip-us.apache.org/repos/asf/thrift/repo
Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/643f1eee
Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/643f1eee
Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/643f1eee
Branch: refs/heads/master
Commit: 643f1eeee41c975c77739ea6ad70e326b9065612
Parents: 9be7569
Author: Sebastian Zenker <se...@gmx.de>
Authored: Mon Jan 18 08:34:57 2016 +0100
Committer: Nobuaki Sukegawa <ns...@apache.org>
Committed: Tue Jan 19 02:48:07 2016 +0900
----------------------------------------------------------------------
lib/cpp/src/thrift/qt/TQTcpServer.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/thrift/blob/643f1eee/lib/cpp/src/thrift/qt/TQTcpServer.h
----------------------------------------------------------------------
diff --git a/lib/cpp/src/thrift/qt/TQTcpServer.h b/lib/cpp/src/thrift/qt/TQTcpServer.h
index 8bbb3df..ebe6432 100644
--- a/lib/cpp/src/thrift/qt/TQTcpServer.h
+++ b/lib/cpp/src/thrift/qt/TQTcpServer.h
@@ -50,7 +50,7 @@ public:
TQTcpServer(boost::shared_ptr<QTcpServer> server,
boost::shared_ptr<TAsyncProcessor> processor,
boost::shared_ptr<apache::thrift::protocol::TProtocolFactory> protocolFactory,
- QT_PREPEND_NAMESPACE(QObject)* parent = NULL);
+ QObject* parent = NULL);
virtual ~TQTcpServer();
private Q_SLOTS:
@@ -69,7 +69,7 @@ private:
boost::shared_ptr<TAsyncProcessor> processor_;
boost::shared_ptr<apache::thrift::protocol::TProtocolFactory> pfact_;
- std::map<QT_PREPEND_NAMESPACE(QTcpSocket)*, boost::shared_ptr<ConnectionContext> > ctxMap_;
+ std::map<QTcpSocket*, boost::shared_ptr<ConnectionContext> > ctxMap_;
};
}
}