From ff69074635de8690b17f9ed90b8a6188ebb6176f Mon Sep 17 00:00:00 2001 From: Steve Kondik Date: Sat, 8 Jul 2017 02:04:41 -0700 Subject: [PATCH] rfb: Fix inheritance in CMsgWriter InputHandler declares the second parameter of clientCutText as an int. Fixes: /home/shade/dev/tigervnc/common/rfb/CMsgWriter.h:60:18: error: 'rfb::CMsgWriter::clientCutText' hides overloaded virtual function [-Werror,-Woverloaded-virtual] virtual void clientCutText(const char* str, rdr::U32 len); ^ /home/shade/dev/tigervnc/common/rfb/InputHandler.h:36:18: note: hidden overloaded virtual function 'rfb::InputHandler::clientCutText' declared here: type mismatch at 2nd parameter ('int' vs 'rdr::U32' (aka 'unsigned int')) virtual void clientCutText(const char* str, int len) {} ^ --- common/rfb/CMsgWriter.cxx | 2 +- common/rfb/CMsgWriter.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/common/rfb/CMsgWriter.cxx b/common/rfb/CMsgWriter.cxx index 8576d8f1..2142d514 100644 --- a/common/rfb/CMsgWriter.cxx +++ b/common/rfb/CMsgWriter.cxx @@ -239,7 +239,7 @@ void CMsgWriter::pointerEvent(const Point& pos, int buttonMask) } -void CMsgWriter::clientCutText(const char* str, rdr::U32 len) +void CMsgWriter::clientCutText(const char* str, int len) { startMsg(msgTypeClientCutText); os->pad(3); diff --git a/common/rfb/CMsgWriter.h b/common/rfb/CMsgWriter.h index f9de72f3..858bc15d 100644 --- a/common/rfb/CMsgWriter.h +++ b/common/rfb/CMsgWriter.h @@ -57,7 +57,7 @@ namespace rfb { virtual void keyEvent(rdr::U32 key, bool down); virtual void pointerEvent(const Point& pos, int buttonMask); - virtual void clientCutText(const char* str, rdr::U32 len); + virtual void clientCutText(const char* str, int len); protected: void startMsg(int type); -- 2.39.5