# HG changeset patch # User Chris Cannam # Date 1704305555 0 # Node ID df381a2e6fa14d66813ee4c31c7d8a348dbcabb8 # Parent ae7397deffaa153f2871480e6a5b81f986d263d1 Fix compiler warning re mismatching enum types diff -r ae7397deffaa -r df381a2e6fa1 vamp-server/convert.cpp --- a/vamp-server/convert.cpp Wed Jan 05 14:02:19 2022 +0000 +++ b/vamp-server/convert.cpp Wed Jan 03 18:12:35 2024 +0000 @@ -150,20 +150,20 @@ } } -template +template static RequestOrResponse::RpcId readCapnpId(const Reader &r) { int number; string tag; switch (r.getId().which()) { - case piper::RpcRequest::Id::Which::NUMBER: + case Id::Which::NUMBER: number = r.getId().getNumber(); return { RequestOrResponse::RpcId::Number, number, "" }; - case piper::RpcRequest::Id::Which::TAG: + case Id::Which::TAG: tag = r.getId().getTag(); return { RequestOrResponse::RpcId::Tag, 0, tag }; - case piper::RpcRequest::Id::Which::NONE: + case Id::Which::NONE: return { RequestOrResponse::RpcId::Absent, 0, "" }; } return { RequestOrResponse::RpcId::Absent, 0, "" }; @@ -381,7 +381,8 @@ piper::RpcRequest::Reader reader = message.getRoot(); rr.type = VampnProto::getRequestResponseType(reader); - rr.id = readCapnpId(reader); + rr.id = readCapnpId + (reader); switch (rr.type) { @@ -453,7 +454,8 @@ rr.type = VampnProto::getRequestResponseType(reader); rr.success = true; rr.errorText = ""; - rr.id = readCapnpId(reader); + rr.id = readCapnpId + (reader); int errorCode = 0; switch (rr.type) {