fixed compilation errors due to last merge operation

This commit is contained in:
csoler 2016-06-02 21:21:18 -04:00
parent e2b5785eec
commit 53eb4dfb12
2 changed files with 3 additions and 3 deletions

View file

@ -125,7 +125,7 @@ public:
return ok;
}
static RsServicePermissionItem *deserialise(uint8_t *data, uint32_t /*size*/)
static RsServicePermissionItem *deserialise(uint8_t *data, uint32_t size)
{
RsServicePermissionItem *item = new RsServicePermissionItem ;