diff options
Diffstat (limited to 'net/disk_cache')
| -rw-r--r-- | net/disk_cache/file.h | 8 | ||||
| -rw-r--r-- | net/disk_cache/mapped_file.h | 10 |
2 files changed, 11 insertions, 7 deletions
diff --git a/net/disk_cache/file.h b/net/disk_cache/file.h index f692b01..93b9a0b 100644 --- a/net/disk_cache/file.h +++ b/net/disk_cache/file.h @@ -29,8 +29,10 @@ // See net/disk_cache/disk_cache.h for the public interface of the cache. -#ifndef NET_DISK_CACHE_FILE_H__ -#define NET_DISK_CACHE_FILE_H__ +#ifndef NET_DISK_CACHE_FILE_H_ +#define NET_DISK_CACHE_FILE_H_ + +#include <string> #include "base/ref_counted.h" #include "net/disk_cache/os_file.h" @@ -107,4 +109,4 @@ class File : public base::RefCounted<File> { } // namespace disk_cache -#endif // NET_DISK_CACHE_FILE_H__ +#endif // NET_DISK_CACHE_FILE_H_ diff --git a/net/disk_cache/mapped_file.h b/net/disk_cache/mapped_file.h index 693ea90..ece272a 100644 --- a/net/disk_cache/mapped_file.h +++ b/net/disk_cache/mapped_file.h @@ -29,8 +29,10 @@ // See net/disk_cache/disk_cache.h for the public interface of the cache. -#ifndef NET_DISK_CACHE_MAPPED_FILE_H__ -#define NET_DISK_CACHE_MAPPED_FILE_H__ +#ifndef NET_DISK_CACHE_MAPPED_FILE_H_ +#define NET_DISK_CACHE_MAPPED_FILE_H_ + +#include <string> #include "base/ref_counted.h" #include "net/disk_cache/disk_format.h" @@ -71,9 +73,9 @@ class MappedFile : public File { void* buffer_; // Address of the memory mapped buffer. size_t view_size_; // Size of the memory pointed by buffer_. - DISALLOW_EVIL_CONSTRUCTORS(MappedFile); + DISALLOW_COPY_AND_ASSIGN(MappedFile); }; } // namespace disk_cache -#endif // NET_DISK_CACHE_MAPPED_FILE_H__ +#endif // NET_DISK_CACHE_MAPPED_FILE_H_ |