Reset trunk to 3.24.35.4

src/zone-allocator.h

Index: src/zone-allocator.h
diff --git a/src/zone-allocator.h b/src/zone-allocator.h
index 7ed17139041f44614a28275409480baf541a503c..5245c6b1bfd45d3d23e5e5efb82a5b4fa4707fba 100644
--- a/src/zone-allocator.h
+++ b/src/zone-allocator.h
@@ -50,9 +50,7 @@ class zone_allocator {
   explicit zone_allocator(Zone* zone) throw() : zone_(zone) {}
   explicit zone_allocator(const zone_allocator& other) throw()
       : zone_(other.zone_) {}
-  template<typename U> zone_allocator(const zone_allocator<U>& other) throw()
-      : zone_(other.zone_) {}
-  template<typename U> friend class zone_allocator;
+  template<typename U> zone_allocator(const zone_allocator<U>&) throw() {}
 
   pointer address(reference x) const {return &x;}
   const_pointer address(const_reference x) const {return &x;}
@@ -71,17 +69,9 @@ class zone_allocator {
   void construct(pointer p, const T& val) {
     new(static_cast<void*>(p)) T(val);
   }
-  void destroy(pointer p) { p->~T(); }
-
-  bool operator==(zone_allocator const& other) {
-    return zone_ == other.zone_;
-  }
-  bool operator!=(zone_allocator const& other) {
-    return zone_ != other.zone_;
-  }
+  void destroy(pointer p) { (static_cast<T*>(p))->~T(); }
 
  private:
-  zone_allocator();
   Zone* zone_;
 };