diff options
| author | Tim Cooper <tim.cooper@layeh.com> | 2015-11-19 21:12:45 +0300 |
|---|---|---|
| committer | Mikkel Krautz <mikkel@krautz.dk> | 2016-05-08 17:45:52 +0300 |
| commit | 77e0bc2e559959603ae8d37cf9f66c3cb938054f (patch) | |
| tree | 25738526a359c63af6fb247ccac71f8bd3078f02 | |
| parent | 49a6d35f2b97f2f79bf37351129cfd06b088e155 (diff) | |
grpc: fix compilation errors
| -rw-r--r-- | src/murmur/MurmurGRPCImpl.cpp | 4 | ||||
| -rw-r--r-- | src/murmur/MurmurGRPCImpl.h | 7 |
2 files changed, 4 insertions, 7 deletions
diff --git a/src/murmur/MurmurGRPCImpl.cpp b/src/murmur/MurmurGRPCImpl.cpp index 24d423fa6..b2e9d5704 100644 --- a/src/murmur/MurmurGRPCImpl.cpp +++ b/src/murmur/MurmurGRPCImpl.cpp @@ -1013,6 +1013,8 @@ void MurmurRPCImpl::textMessageFilter(int &res, const User *user, MumbleProto::T message.set_message(response.message().text()); } break; + default: + break; } } @@ -2113,7 +2115,7 @@ void V1_DatabaseUserUpdate::impl(bool) { if (info.contains(ServerDB::User_Name) || info.contains(ServerDB::User_Comment)) { foreach(::ServerUser *u, server->qhUsers) { - if (u->iId == request.id()) { + if (static_cast<unsigned int>(u->iId) == request.id()) { QString name = u->qsName; QString comment = u->qsComment; if (info.contains(ServerDB::User_Name)) { diff --git a/src/murmur/MurmurGRPCImpl.h b/src/murmur/MurmurGRPCImpl.h index 6dd6dcb17..5cbbd3387 100644 --- a/src/murmur/MurmurGRPCImpl.h +++ b/src/murmur/MurmurGRPCImpl.h @@ -41,12 +41,7 @@ #include <QMultiHash> -#include <grpc/grpc.h> -#include <grpc++/server.h> -#include <grpc++/server_builder.h> -#include <grpc++/server_context.h> -#include <grpc++/server_credentials.h> -#include <grpc++/status.h> +#include <grpc++/grpc++.h> class RPCCall; |