projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Update for OSX Lion build.
[awesomized/libmemcached]
/
libmemcached
/
callback.cc
diff --git
a/libmemcached/callback.cc
b/libmemcached/callback.cc
index 473978634ce820bdafe3937f54d1ebc3caa0e33f..84f99359d78d138e697ca80f8b84f1107fc82c4d 100644
(file)
--- a/
libmemcached/callback.cc
+++ b/
libmemcached/callback.cc
@@
-12,7
+12,9
@@
#include <libmemcached/common.h>
#include <sys/types.h>
#include <libmemcached/common.h>
#include <sys/types.h>
+#ifndef __INTEL_COMPILER
#pragma GCC diagnostic ignored "-Wstrict-aliasing"
#pragma GCC diagnostic ignored "-Wstrict-aliasing"
+#endif
/*
These functions provide data and function callback support
/*
These functions provide data and function callback support
@@
-90,8
+92,10
@@
void *memcached_callback_get(memcached_st *ptr,
{
memcached_return_t local_error;
{
memcached_return_t local_error;
- if (!error)
+ if (error == NULL)
+ {
error = &local_error;
error = &local_error;
+ }
switch (flag)
{
switch (flag)
{
@@
-152,7
+156,7
@@
void *memcached_callback_get(memcached_st *ptr,
}
case MEMCACHED_CALLBACK_MAX:
default:
}
case MEMCACHED_CALLBACK_MAX:
default:
-
WATCHPOINT_ASSERT(0
);
+
assert_msg(0, "Invalid behavior passed to memcached_behavior_set()"
);
*error= MEMCACHED_FAILURE;
return NULL;
}
*error= MEMCACHED_FAILURE;
return NULL;
}