diff options
| author | Steve Kondik <shade@chemlab.org> | 2017-07-08 02:04:41 -0700 |
|---|---|---|
| committer | Steve Kondik <shade@chemlab.org> | 2017-07-08 02:28:12 -0700 |
| commit | ff69074635de8690b17f9ed90b8a6188ebb6176f (patch) | |
| tree | 29829374d1c16649e6caba2562bec878820d363a /common | |
| parent | 1f5d4b1310e7e94dbf24d49959856edfb3707668 (diff) | |
| download | tigervnc-ff69074635de8690b17f9ed90b8a6188ebb6176f.tar.gz tigervnc-ff69074635de8690b17f9ed90b8a6188ebb6176f.zip | |
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) {}
^
Diffstat (limited to 'common')
| -rw-r--r-- | common/rfb/CMsgWriter.cxx | 2 | ||||
| -rw-r--r-- | 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); |