commit 063df03295d8b1477a292b4415e7d90a68c477d0
author Pierre Ossman <ossman@cendio.se> Tue Sep 29 15:43:28 2015 +0200
committer Pierre Ossman <ossman@cendio.se> Tue Sep 29 15:43:28 2015 +0200
tree 399338f72c6d1dd8f2b755557abc696bd6367ec0
parent 023df7effb247900c2c0748ce494f06dad00f0c3

Avoid dropping const qualifier needlessly

common/rdr/MemInStream.h

diff --git a/common/rdr/MemInStream.h b/common/rdr/MemInStream.h
index 77ca3f3..1a6a798 100644
--- a/common/rdr/MemInStream.h
+++ b/common/rdr/MemInStream.h
@@ -45,7 +45,7 @@
 
     virtual ~MemInStream() {
       if (deleteWhenDone)
-        delete [] (U8*)start;
+        delete [] start;
     }
 
     int pos() { return ptr - start; }

unix/xserver/hw/vnc/vncExtInit.cc

diff --git a/unix/xserver/hw/vnc/vncExtInit.cc b/unix/xserver/hw/vnc/vncExtInit.cc
index 0ae55b6..2d918b0 100644
--- a/unix/xserver/hw/vnc/vncExtInit.cc
+++ b/unix/xserver/hw/vnc/vncExtInit.cc
@@ -329,8 +329,8 @@
 {
   Region reg;
 
-  reg.setExtentsAndOrderedRects((ShortRect*)extents,
-                                nRects, (ShortRect*)rects);
+  reg.setExtentsAndOrderedRects((const ShortRect*)extents,
+                                nRects, (const ShortRect*)rects);
   desktop[scrIdx]->add_changed(reg);
 }
 
@@ -340,8 +340,8 @@
 {
   Region reg;
 
-  reg.setExtentsAndOrderedRects((ShortRect*)extents,
-                                nRects, (ShortRect*)rects);
+  reg.setExtentsAndOrderedRects((const ShortRect*)extents,
+                                nRects, (const ShortRect*)rects);
   desktop[scrIdx]->add_copied(reg, rfb::Point(dx, dy));
 }