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

[Clint Byrum]

Fix compiler errors related to dropping const qualifiers

[Brian Aker (brianaker)]

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

=== modified file 'config/config.sub'
--- config/config.sub	2012-06-17 20:20:55 +0000
+++ config/config.sub	2012-09-17 17:18:21 +0000
@@ -4,7 +4,7 @@
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
 #   2011, 2012 Free Software Foundation, Inc.
 
-timestamp='2012-02-10'
+timestamp='2012-04-18'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -225,6 +225,12 @@
 	-isc*)
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 		;;
+	-lynx*178)
+		os=-lynxos178
+		;;
+	-lynx*5)
+		os=-lynxos5
+		;;
 	-lynx*)
 		os=-lynxos
 		;;
@@ -1537,6 +1543,9 @@
 	c4x-* | tic4x-*)
 		os=-coff
 		;;
+	hexagon-*)
+		os=-elf
+		;;
 	tic54x-*)
 		os=-coff
 		;;
 
=== modified file 'libtest/memcached.hpp'
--- libtest/memcached.hpp	2012-06-30 16:47:34 +0000
+++ libtest/memcached.hpp	2012-09-17 17:18:21 +0000
@@ -39,7 +39,7 @@
 #if defined(HAVE_LIBMEMCACHED) && HAVE_LIBMEMCACHED
 inline bool operator== (const memcached_st& memc, const memcached_return_t rc)
 {
-  if (memcached_last_error(&memc) == rc)
+  if (memcached_last_error(const_cast<memcached_st *>(&memc)) == rc)
   {
     return true;
   }
@@ -49,7 +49,7 @@
 
 inline bool operator!= (const memcached_st& memc, const memcached_return_t rc)
 {
-  if (memcached_last_error(&memc) != rc)
+  if (memcached_last_error(const_cast<memcached_st *>(&memc)) != rc)
   {
     return true;
   }
@@ -59,7 +59,7 @@
 
 inline bool operator!= (const memcached_return_t rc, const memcached_st& memc)
 {
-  if (memcached_last_error(&memc) != rc)
+  if (memcached_last_error(const_cast<memcached_st *>(&memc)) != rc)
   {
     return true;
   }