Merge lp:~tangent-org/libmemcached/1.0-build Build: jenkins-Libmemcached-1.0-53

[awesomized/libmemcached] / libmemcached / backtrace.cc

diff --git a/libmemcached/backtrace.cc b/libmemcached/backtrace.cc
index 8fb8acc7ec3938e694108e52a5fa43e23cae4261..871f27afb762d3151e192cc9f5367e3909262e06 100644 (file)
--- a/libmemcached/backtrace.cc
+++ b/libmemcached/backtrace.cc
@@ -59,7 +59,7 @@ void custom_backtrace(void)
 #ifdef HAVE_EXECINFO_H
   void *array[50];
 
-  size_t size= backtrace(array, 50);
+  int size= backtrace(array, 50);
   char **strings= backtrace_symbols(array, size);
 
   if (strings == NULL)
@@ -67,22 +67,22 @@ void custom_backtrace(void)
     return;
   }
 
-  fprintf(stderr, "Number of stack frames obtained: %lu\n", (unsigned long)size);
+  fprintf(stderr, "Number of stack frames obtained: %d\n", size);
 
-  char *named_function= (char *)::realloc(NULL, 1024);
+  char *named_function= (char *)std::realloc(NULL, 1024);
   
   if (named_function == NULL)
   {
-    ::free(strings);
+    std::free(strings);
     return;
   }
 
-  for (size_t x= 1; x < size; x++) 
+  for (int x= 1; x < size; x++) 
   {
     if (USE_DEMANGLE)
     {
       size_t sz= 200;
-      char *named_function_ptr= (char *)::realloc(named_function, sz);
+      char *named_function_ptr= (char *)std::realloc(named_function, sz);
       if (named_function_ptr == NULL)
       {
         continue;
@@ -139,7 +139,7 @@ void custom_backtrace(void)
     }
   }
 
-  ::free(named_function);
-  ::free(strings);
+  std::free(named_function);
+  std::free(strings);
 #endif // HAVE_EXECINFO_H
 }