X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fcallback.cc;h=84f99359d78d138e697ca80f8b84f1107fc82c4d;hb=77e79fb2056c9a177a670da48178fd1ac051d33d;hp=473978634ce820bdafe3937f54d1ebc3caa0e33f;hpb=04b8554c3724eae57fbd75dc6b3e69dca8b58187;p=m6w6%2Flibmemcached diff --git a/libmemcached/callback.cc b/libmemcached/callback.cc index 47397863..84f99359 100644 --- a/libmemcached/callback.cc +++ b/libmemcached/callback.cc @@ -12,7 +12,9 @@ #include #include +#ifndef __INTEL_COMPILER #pragma GCC diagnostic ignored "-Wstrict-aliasing" +#endif /* These functions provide data and function callback support @@ -90,8 +92,10 @@ void *memcached_callback_get(memcached_st *ptr, { memcached_return_t local_error; - if (!error) + if (error == NULL) + { error = &local_error; + } switch (flag) { @@ -152,7 +156,7 @@ void *memcached_callback_get(memcached_st *ptr, } case MEMCACHED_CALLBACK_MAX: default: - WATCHPOINT_ASSERT(0); + assert_msg(0, "Invalid behavior passed to memcached_behavior_set()"); *error= MEMCACHED_FAILURE; return NULL; }