[Spice-commits] 2 commits - server/char-device.h server/inputs-channel-client.cpp server/red-channel-client.h

[GitLab Mirror]

 server/char-device.h             |    2 --
 server/inputs-channel-client.cpp |    4 ++--
 server/red-channel-client.h      |    3 ---
 3 files changed, 2 insertions(+), 7 deletions(-)

New commits:
commit 6c900f0442939321cd986e35e26e6cb6c640eed2
Author: Frediano Ziglio <freddy77 at gmail.com>
Date:   Fri May 29 16:21:20 2020 +0100

    inputs-channel-client: Avoid attribute shadowing
    
    This regression was caused by commit
    "2ffa7d00c60808e2f640df9bc9b5d62598455588"
    (cfr "Improve encapsulation for InputsChannelClient")
    
    Signed-off-by: Frediano Ziglio <freddy77 at gmail.com>
    Acked-by: Julien Rope <jrope at redhat.com>

diff --git a/server/inputs-channel-client.cpp b/server/inputs-channel-client.cpp
index 31f22b9e..0c8ff0cf 100644
--- a/server/inputs-channel-client.cpp
+++ b/server/inputs-channel-client.cpp
@@ -69,9 +69,9 @@ void InputsChannelClient::send_migrate_data(SpiceMarshaller *m, RedPipeItem *ite
     spice_marshaller_add_uint16(m, motion_count);
 }
 
-void InputsChannelClient::handle_migrate_data(uint16_t motion_count)
+void InputsChannelClient::handle_migrate_data(uint16_t new_motion_count)
 {
-    motion_count = motion_count;
+    motion_count = new_motion_count;
 
     for (; motion_count >= SPICE_INPUT_MOTION_ACK_BUNCH;
            motion_count -= SPICE_INPUT_MOTION_ACK_BUNCH) {
commit 853a6df22442fcd4044ba6ad948055d14a8c1a5e
Author: Frediano Ziglio <freddy77 at gmail.com>
Date:   Thu Jun 4 08:35:19 2020 +0100

    Avoid useless SPICE_CXX_GLIB_ALLOCATOR usage
    
    Behaviour was already inherited.
    
    Signed-off-by: Frediano Ziglio <freddy77 at gmail.com>
    Acked-by: Julien Rope <jrope at redhat.com>

diff --git a/server/char-device.h b/server/char-device.h
index 4aa8cd7f..0f910bc0 100644
--- a/server/char-device.h
+++ b/server/char-device.h
@@ -107,8 +107,6 @@ struct RedCharDeviceWriteBuffer {
 class RedCharDevice: public red::shared_ptr_counted_weak
 {
 public:
-    SPICE_CXX_GLIB_ALLOCATOR
-
     RedCharDevice(RedsState *reds, SpiceCharDeviceInstance *sin,
                   uint64_t client_tokens_interval, uint64_t num_self_tokens);
     ~RedCharDevice();
diff --git a/server/red-channel-client.h b/server/red-channel-client.h
index f5f01d1b..5092f2f0 100644
--- a/server/red-channel-client.h
+++ b/server/red-channel-client.h
@@ -31,9 +31,6 @@ struct RedChannelClientPrivate;
 
 class RedChannelClient: public red::shared_ptr_counted
 {
-public:
-    SPICE_CXX_GLIB_ALLOCATOR
-
     // This is made protected to avoid allocation on stack conflicting with
     // reference counting
 protected: