summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorericroman@google.com <ericroman@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-12-10 05:53:18 +0000
committerericroman@google.com <ericroman@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-12-10 05:53:18 +0000
commit3e2a2ba243723b4e8b76489ecfc3b1f8e1beea9f (patch)
tree21a28aa2929ec9be7e9a4de410a8208cd155dbb3
parent63de95b265c665320b776c821f4cc44872c65c87 (diff)
downloadchromium_src-3e2a2ba243723b4e8b76489ecfc3b1f8e1beea9f.zip
chromium_src-3e2a2ba243723b4e8b76489ecfc3b1f8e1beea9f.tar.gz
chromium_src-3e2a2ba243723b4e8b76489ecfc3b1f8e1beea9f.tar.bz2
no-op style change.
TBR=wtc@chromium.org Review URL: http://codereview.chromium.org/13335 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6694 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--net/base/bzip2_filter.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/net/base/bzip2_filter.h b/net/base/bzip2_filter.h
index 64cd244..867f1fa 100644
--- a/net/base/bzip2_filter.h
+++ b/net/base/bzip2_filter.h
@@ -17,8 +17,8 @@
// BZip2Filter is also a subclass of Filter. See the latter's header file filter.h
// for sample usage.
-#ifndef NET_BASE_BZIP2_FILTER_H__
-#define NET_BASE_BZIP2_FILTER_H__
+#ifndef NET_BASE_BZIP2_FILTER_H_
+#define NET_BASE_BZIP2_FILTER_H_
#include "base/scoped_ptr.h"
#include "net/base/filter.h"
@@ -77,8 +77,8 @@ class BZip2Filter : public Filter {
// ReadFilteredData.
scoped_ptr<bz_stream> bzip2_data_stream_;
- DISALLOW_EVIL_CONSTRUCTORS(BZip2Filter);
+ DISALLOW_COPY_AND_ASSIGN(BZip2Filter);
};
-#endif // NET_BASE_BZIP2_FILTER_H__
+#endif // NET_BASE_BZIP2_FILTER_H_