summaryrefslogtreecommitdiffstats
path: root/net/disk_cache
diff options
context:
space:
mode:
authormaruel@google.com <maruel@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-08-15 12:27:03 +0000
committermaruel@google.com <maruel@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-08-15 12:27:03 +0000
commit1eb89e8fbf2d31247f5ceb271d8887a63d4a2bcf (patch)
treeb78be07dbada3ac0f6d2435558e4a6aaba198ffc /net/disk_cache
parentea15e98a9353494df754a11fb49f0e4b8c0d4789 (diff)
downloadchromium_src-1eb89e8fbf2d31247f5ceb271d8887a63d4a2bcf.zip
chromium_src-1eb89e8fbf2d31247f5ceb271d8887a63d4a2bcf.tar.gz
chromium_src-1eb89e8fbf2d31247f5ceb271d8887a63d4a2bcf.tar.bz2
Large patch set (159 files total) to cleanup the includes.
- Slightly reduce the size of the generated .lib files ~3%. - Reduce the number of implicit and explicit atl and windows includes. hooray! - Help incremental build by reducing the number of unnecessary included files. - Split some template class in two, one base class for the common code and the specialization that inherits from the base class. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@937 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/disk_cache')
-rw-r--r--net/disk_cache/file.h8
-rw-r--r--net/disk_cache/mapped_file.h10
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_