Merge up current work from trunk

[awesomized/libmemcached] / libmemcached / string.cc

diff --git a/libmemcached/string.cc b/libmemcached/string.cc
index 0e17484055c5e6356073b4458a07d1ce426f4cf1..d482d4cd4d21630feac0412b5d927ffcb8645a01 100644 (file)
--- a/libmemcached/string.cc
+++ b/libmemcached/string.cc
@@ -37,7 +37,6 @@
 
 
 #include <libmemcached/common.h>
-#include <cassert>
 
 inline static memcached_return_t _string_check(memcached_string_st *string, size_t need)
 {
@@ -192,7 +191,9 @@ memcached_return_t memcached_string_reset(memcached_string_st *string)
 void memcached_string_free(memcached_string_st *ptr)
 {
   if (not ptr)
+  {
     return;
+  }
 
   if (ptr->string)
   {
@@ -216,7 +217,7 @@ memcached_return_t memcached_string_check(memcached_string_st *string, size_t ne
 
 size_t memcached_string_length(const memcached_string_st *self)
 {
-  return (size_t)(self->end - self->string);
+  return size_t(self->end -self->string);
 }
 
 size_t memcached_string_size(const memcached_string_st *self)
@@ -231,7 +232,7 @@ const char *memcached_string_value(const memcached_string_st *self)
 
 char *memcached_string_take_value(memcached_string_st *self)
 {
-  assert(self);
+  assert_msg(self, "Invalid memcached_string_st");
   // If we fail at adding the null, we copy and move on
   if (memcached_success(memcached_string_append_null(self)))
   {