C++: double underscores are reserved

[awesomized/libmemcached] / src / libmemcached / purge.cc

diff --git a/src/libmemcached/purge.cc b/src/libmemcached/purge.cc
index ae3961b2c445679f7dda3b13684a3ce7e6450bc0..d69437014879fc708a544fa90cbf5ec99c6f5815 100644 (file)
--- a/src/libmemcached/purge.cc
+++ b/src/libmemcached/purge.cc
@@ -15,7 +15,7 @@
 
 #include "libmemcached/common.h"
 
-#define memcached_set_purging(__object, __value) ((__object)->state.is_purging = (__value))
+#define memcached_set_purging(object_, value_) ((object_)->state.is_purging = (value_))
 
 class Purge {
 public:
@@ -112,7 +112,7 @@ bool memcached_purge(memcached_instance_st *ptr) {
         break;
       }
 
-      if (ptr->root->callbacks != NULL) {
+      if (ptr->root->callbacks) {
         memcached_callback_st cb = *ptr->root->callbacks;
         if (memcached_success(rc)) {
           for (uint32_t y = 0; y < cb.number_of_callback; y++) {