[NOT TO COMMIT!] Merge Chromium-specific changes in tcmalloc thru. the original gperftools r136.

third_party/tcmalloc/chromium/src/base/stl_allocator.h

 /* Copyright (c) 2006, Google Inc.
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  * 
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 19 matching lines @@
  * ---
  * Author: Maxim Lifantsev
  */
 
 
 #ifndef BASE_STL_ALLOCATOR_H_
 #define BASE_STL_ALLOCATOR_H_
 
 #include <config.h>
 
-#include <stddef.h>   // for ptrdiff_t
+#include <stddef.h>   // for std::ptrdiff_t
 #include <limits>
 
 #include "base/logging.h"
 
 // Generic allocator class for STL objects
 // that uses a given type-less allocator Alloc, which must provide:
 //   static void* Alloc::Allocate(size_t size);
 //   static void Alloc::Free(void* ptr, size_t size);
 //
 // STL_Allocator<T, MyAlloc> provides the same thread-safety
 // guarantees as MyAlloc.
 //
 // Usage example:
 //   set<T, less<T>, STL_Allocator<T, MyAlloc> > my_set;
 // CAVEAT: Parts of the code below are probably specific
 //         to the STL version(s) we are using.
 //         The code is simply lifted from what std::allocator<> provides.
 template <typename T, class Alloc>
 class STL_Allocator {
  public:
   typedef size_t     size_type;
-  typedef ptrdiff_t  difference_type;
+  typedef std::ptrdiff_t  difference_type;
   typedef T*         pointer;
   typedef const T*   const_pointer;
   typedef T&         reference;
   typedef const T&   const_reference;
   typedef T          value_type;
 
   template <class T1> struct rebind {
     typedef STL_Allocator<T1, Alloc> other;
   };
 
@@ skipping 15 matching lines @@
 
   void construct(pointer p, const T& val) { ::new(p) T(val); }
   void construct(pointer p) { ::new(p) T(); }
   void destroy(pointer p) { p->~T(); }
 
   // There's no state, so these allocators are always equal
   bool operator==(const STL_Allocator&) const { return true; }
 };
 
 #endif  // BASE_STL_ALLOCATOR_H_