Merge lp:~clint-fewbar/gearmand/fix-const-libmemcached-gcc47 into lp:gearmand/1.0

Proposed by Clint Byrum on 2012-09-17
Status: Merged
Merged at revision: 644
Proposed branch: lp:~clint-fewbar/gearmand/fix-const-libmemcached-gcc47
Merge into: lp:gearmand/1.0
Diff against target: 66 lines (+13/-4)
2 files modified
config/config.sub (+10/-1)
libtest/memcached.hpp (+3/-3)
To merge this branch: bzr merge lp:~clint-fewbar/gearmand/fix-const-libmemcached-gcc47
Reviewer Review Type Date Requested Status
Tangent Trunk 2012-09-17 Pending
Review via email: mp+124744@code.launchpad.net

Description of the change

Fix compiler errors related to dropping const qualifiers

To post a comment you must log in.
Brian Aker (brianaker) wrote :

I've pushe this into the build queue, so lets see what it does :)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'config/config.sub'
2--- config/config.sub 2012-06-17 20:20:55 +0000
3+++ config/config.sub 2012-09-17 17:18:21 +0000
4@@ -4,7 +4,7 @@
5 # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
6 # 2011, 2012 Free Software Foundation, Inc.
7
8-timestamp='2012-02-10'
9+timestamp='2012-04-18'
10
11 # This file is (in principle) common to ALL GNU software.
12 # The presence of a machine in this file suggests that SOME GNU software
13@@ -225,6 +225,12 @@
14 -isc*)
15 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
16 ;;
17+ -lynx*178)
18+ os=-lynxos178
19+ ;;
20+ -lynx*5)
21+ os=-lynxos5
22+ ;;
23 -lynx*)
24 os=-lynxos
25 ;;
26@@ -1537,6 +1543,9 @@
27 c4x-* | tic4x-*)
28 os=-coff
29 ;;
30+ hexagon-*)
31+ os=-elf
32+ ;;
33 tic54x-*)
34 os=-coff
35 ;;
36
37=== modified file 'libtest/memcached.hpp'
38--- libtest/memcached.hpp 2012-06-30 16:47:34 +0000
39+++ libtest/memcached.hpp 2012-09-17 17:18:21 +0000
40@@ -39,7 +39,7 @@
41 #if defined(HAVE_LIBMEMCACHED) && HAVE_LIBMEMCACHED
42 inline bool operator== (const memcached_st& memc, const memcached_return_t rc)
43 {
44- if (memcached_last_error(&memc) == rc)
45+ if (memcached_last_error(const_cast<memcached_st *>(&memc)) == rc)
46 {
47 return true;
48 }
49@@ -49,7 +49,7 @@
50
51 inline bool operator!= (const memcached_st& memc, const memcached_return_t rc)
52 {
53- if (memcached_last_error(&memc) != rc)
54+ if (memcached_last_error(const_cast<memcached_st *>(&memc)) != rc)
55 {
56 return true;
57 }
58@@ -59,7 +59,7 @@
59
60 inline bool operator!= (const memcached_return_t rc, const memcached_st& memc)
61 {
62- if (memcached_last_error(&memc) != rc)
63+ if (memcached_last_error(const_cast<memcached_st *>(&memc)) != rc)
64 {
65 return true;
66 }

Subscribers

People subscribed via source and target branches