diff options
| author | Mikkel Krautz <mikkel@krautz.dk> | 2016-02-20 18:01:01 +0300 |
|---|---|---|
| committer | Mikkel Krautz <mikkel@krautz.dk> | 2016-05-08 17:45:52 +0300 |
| commit | a02ef1b1020ad8c9872d444ff2621f3a3875f302 (patch) | |
| tree | 57b66192ee9b28f5888a4145a5f9f3be001828ac /src/murmur/RPC.cpp | |
| parent | 9fafa9ae15fb4e6a56495876c36fd1c4c0f5565d (diff) | |
grpc: fix Server::sendTextMessageGRPC and Server::setChannelState to build in non-C++11 mode.
Before C++11, <:: is expanded as a trigraph in this context.
Diffstat (limited to 'src/murmur/RPC.cpp')
| -rw-r--r-- | src/murmur/RPC.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/murmur/RPC.cpp b/src/murmur/RPC.cpp index 89966922f..1031ede14 100644 --- a/src/murmur/RPC.cpp +++ b/src/murmur/RPC.cpp @@ -123,7 +123,7 @@ bool Server::setChannelState(const MumbleProto::ChannelState &cs, QString &err) // Links and parent channel are processed first, because they can return // errors. Without doing this, the server state can be changed without // notifying users. - QSet<::Channel *> newLinksSet; + QSet< ::Channel *> newLinksSet; for (int i = 0; i < cs.links_size(); i++) { Channel *link = qhChannels.value(cs.links(i)); if (!link) { @@ -370,7 +370,7 @@ void Server::sendTextMessageGRPC(const ::MumbleProto::TextMessage &tm) { foreach(Channel *c, chans) { foreach(::User *p, c->qlUsers) { - sendMessage(static_cast<::ServerUser *>(p), mptm); + sendMessage(static_cast< ::ServerUser *>(p), mptm); } } } |