diff options
| author | Thorvald Natvig <slicer@users.sourceforge.net> | 2009-03-27 19:50:54 +0300 |
|---|---|---|
| committer | Thorvald Natvig <slicer@users.sourceforge.net> | 2009-03-27 19:50:54 +0300 |
| commit | 561b7f282a7fd15142f2be6dbe860db91f051ebb (patch) | |
| tree | 1796a92b8a04a253561280c6b32260d45eb563b8 | |
| parent | ef1ea0c4984817e09a258cc894f4e0ea5a7c4be7 (diff) | |
Make preprocessing tokens gcc compatible
| -rw-r--r-- | src/Message.h | 2 | ||||
| -rw-r--r-- | src/mumble/MainWindow.cpp | 4 | ||||
| -rw-r--r-- | src/mumble/ServerHandler.h | 2 | ||||
| -rw-r--r-- | src/murmur/Server.cpp | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/src/Message.h b/src/Message.h index 28fee884d..4303aa6b0 100644 --- a/src/Message.h +++ b/src/Message.h @@ -66,7 +66,7 @@ class MessageHandler { static void messageToNetwork(const ::google::protobuf::Message &msg, unsigned int msgType, QByteArray &cache); protected: -#define MUMBLE_MH_MSG(x) virtual void msg##x(Connection *, MumbleProto::##x *) = 0; +#define MUMBLE_MH_MSG(x) virtual void msg##x(Connection *, MumbleProto:: x *) = 0; MUMBLE_MH_ALL #undef MUMBLE_MH_MSG void dispatch(Connection *, const QByteArray &); diff --git a/src/mumble/MainWindow.cpp b/src/mumble/MainWindow.cpp index 4c207ac12..727a0a9d9 100644 --- a/src/mumble/MainWindow.cpp +++ b/src/mumble/MainWindow.cpp @@ -1453,8 +1453,8 @@ void MainWindow::customEvent(QEvent *evt) { ServerHandlerMessageEvent *shme=static_cast<ServerHandlerMessageEvent *>(evt); -#define MUMBLE_MH_MSG(x) case MessageHandler::##x : { \ - MumbleProto::##x msg; \ +#define MUMBLE_MH_MSG(x) case MessageHandler:: x : { \ + MumbleProto:: x msg; \ if (msg.ParseFromArray(shme->qbaMsg.constData(), shme->qbaMsg.size())) { \ printf("%s:\n", #x); \ msg.PrintDebugString(); \ diff --git a/src/mumble/ServerHandler.h b/src/mumble/ServerHandler.h index 658c430a0..50c4ca235 100644 --- a/src/mumble/ServerHandler.h +++ b/src/mumble/ServerHandler.h @@ -86,7 +86,7 @@ class ServerHandler : public QThread { void sendMessage(const ::google::protobuf::Message &msg, unsigned int msgType); void sendMessage(const char *data, int len); -#define MUMBLE_MH_MSG(x) void sendMessage(const MumbleProto::##x &msg) { sendMessage(msg, MessageHandler::##x); } +#define MUMBLE_MH_MSG(x) void sendMessage(const MumbleProto:: x &msg) { sendMessage(msg, MessageHandler:: x); } MUMBLE_MH_ALL #undef MUMBLE_MH_MSG diff --git a/src/murmur/Server.cpp b/src/murmur/Server.cpp index d066091ce..2edc07341 100644 --- a/src/murmur/Server.cpp +++ b/src/murmur/Server.cpp @@ -657,8 +657,8 @@ void Server::message(unsigned int uiType, const QByteArray &qbaMsg, Connection * cCon = static_cast<Connection *>(sender()); } -#define MUMBLE_MH_MSG(x) case MessageHandler::##x : { \ - MumbleProto::##x msg; \ +#define MUMBLE_MH_MSG(x) case MessageHandler:: x : { \ + MumbleProto:: x msg; \ if (msg.ParseFromArray(qbaMsg.constData(), qbaMsg.size())) { \ printf("%s:\n", #x); \ msg.PrintDebugString(); \ |