| Index: third_party/tcmalloc/chromium/src/memory_region_map.h
|
| ===================================================================
|
| --- third_party/tcmalloc/chromium/src/memory_region_map.h (revision 41942)
|
| +++ third_party/tcmalloc/chromium/src/memory_region_map.h (working copy)
|
| @@ -118,7 +118,7 @@
|
| LockHolder() { Lock(); }
|
| ~LockHolder() { Unlock(); }
|
| private:
|
| - DISALLOW_EVIL_CONSTRUCTORS(LockHolder);
|
| + DISALLOW_COPY_AND_ASSIGN(LockHolder);
|
| };
|
|
|
| // A memory region that we know about through malloc_hook-s.
|
| @@ -329,7 +329,7 @@
|
| // Assumes Lock() is held
|
| static void LogAllLocked();
|
|
|
| - DISALLOW_EVIL_CONSTRUCTORS(MemoryRegionMap);
|
| + DISALLOW_COPY_AND_ASSIGN(MemoryRegionMap);
|
| };
|
|
|
| #endif // BASE_MEMORY_REGION_MAP_H_
|
|
|