Prevent unused-parameter warning under Windows

Provides a more complete override of the two offending methods, instead
of relying on -Wno-unused-parameter to hide the differences.
Merge remote-tracking branch 'dda/pr/7393' into dda-master

* dda/pr/7393:
  Prevent unused-parameter warning under Windows