X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fresult.cc;h=6fa507b28e60bf541105cee7ec34c82c7040e3aa;hb=770d4f6b4cc99bff87d27f4cbe52b2c6a2f2fbd2;hp=c3e0b452cb39d0c6291ed0292985d7676d58b176;hpb=1adc67d1609fd71308b822e153dcb08ad7fbf9c2;p=awesomized%2Flibmemcached

diff --git a/libmemcached/result.cc b/libmemcached/result.cc
index c3e0b452..6fa507b2 100644
--- a/libmemcached/result.cc
+++ b/libmemcached/result.cc
@@ -2,7 +2,7 @@
  * 
  *  Libmemcached library
  *
- *  Copyright (C) 2011 Data Differential, http://datadifferential.com/
+ *  Copyright (C) 2011-2013 Data Differential, http://datadifferential.com/
  *  Copyright (C) 2006-2009 Brian Aker All rights reserved.
  *
  *  Redistribution and use in source and binary forms, with or without
@@ -45,7 +45,7 @@
 #include <libmemcached/common.h>
 
 static inline void _result_init(memcached_result_st *self,
-                                memcached_st *memc)
+                                Memcached *memc)
 {
   self->item_flags= 0;
   self->item_expiration= 0;
@@ -57,10 +57,10 @@ static inline void _result_init(memcached_result_st *self,
   self->item_key[0]= 0;
 }
 
-memcached_result_st *memcached_result_create(const memcached_st *memc,
+memcached_result_st *memcached_result_create(const memcached_st *shell,
                                              memcached_result_st *ptr)
 {
-  WATCHPOINT_ASSERT(memc);
+  const Memcached* memc= memcached2Memcached(shell);
 
   /* Saving malloc calls :) */
   if (ptr)