No. I would much prefer that there be separate legislation to apply to state vessels, because warships are exempt under international maritime law, no matter which UN convention you look at, which means that the state has to have its own legislation respecting the behaviour of persons on the warship and the behaviour of the warship itself.
It's important to understand that when we send one of Her Majesty's Canadian ships to sea, that ship is not acting for the Minister of National Defence or for the Government of Canada, but as a crown vessel, and the crown, 92-year-old Queen Elizabeth, has other things to do, so she delegates her authority to the Governor General. Under section 15, I think it is, of the Canadian Constitution, the Governor General is the command-in-chief of the Canadian Forces. Any time a warship goes to sea, that ship is acting on behalf of Her Majesty, as her power is delegated to the operating level.